diff --git a/Cargo.toml b/Cargo.toml index c8447ba7..86719329 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ name = "yggdrasil-kernel" version = "0.1.0" edition = "2021" build = "build.rs" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [profile.dev.package.tock-registers] @@ -11,8 +12,6 @@ opt-level = 3 [dependencies] yggdrasil-abi = { git = "https://git.alnyan.me/yggdrasil/yggdrasil-abi.git" } vfs = { path = "lib/vfs" } -# TODO move to drivers -memfs = { path = "lib/memfs" } device-api = { path = "lib/device-api", features = ["derive"] } kernel-util = { path = "lib/kernel-util" } memtables = { path = "lib/memtables" } @@ -22,8 +21,9 @@ device-api-macros = { path = "lib/device-api/macros" } # Drivers ygg_driver_pci = { path = "driver/bus/pci" } ygg_driver_nvme = { path = "driver/block/nvme" } -ygg_driver_block = { path = "driver/block/block" } +ygg_driver_block = { path = "driver/block/core" } kernel-fs = { path = "driver/fs/kernel-fs" } +memfs = { path = "driver/fs/memfs" } atomic_enum = "0.2.0" bitflags = "2.3.3" diff --git a/driver/block/block/Cargo.toml b/driver/block/core/Cargo.toml similarity index 88% rename from driver/block/block/Cargo.toml rename to driver/block/core/Cargo.toml index 0513182a..afded29d 100644 --- a/driver/block/block/Cargo.toml +++ b/driver/block/core/Cargo.toml @@ -2,6 +2,7 @@ name = "ygg_driver_block" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/driver/block/block/src/cache.rs b/driver/block/core/src/cache.rs similarity index 100% rename from driver/block/block/src/cache.rs rename to driver/block/core/src/cache.rs diff --git a/driver/block/block/src/lib.rs b/driver/block/core/src/lib.rs similarity index 100% rename from driver/block/block/src/lib.rs rename to driver/block/core/src/lib.rs diff --git a/driver/block/nvme/Cargo.toml b/driver/block/nvme/Cargo.toml index 725a668e..467cc2d4 100644 --- a/driver/block/nvme/Cargo.toml +++ b/driver/block/nvme/Cargo.toml @@ -2,6 +2,7 @@ name = "ygg_driver_nvme" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -12,7 +13,7 @@ device-api = { path = "../../../lib/device-api", features = ["derive"] } vfs = { path = "../../../lib/vfs" } ygg_driver_pci = { path = "../../bus/pci" } -ygg_driver_block = { path = "../../block/block" } +ygg_driver_block = { path = "../../block/core" } kernel-fs = { path = "../../fs/kernel-fs" } log = "0.4.20" diff --git a/driver/bus/pci/Cargo.toml b/driver/bus/pci/Cargo.toml index 5268dc89..8ef36ab4 100644 --- a/driver/bus/pci/Cargo.toml +++ b/driver/bus/pci/Cargo.toml @@ -2,6 +2,7 @@ name = "ygg_driver_pci" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/driver/fs/kernel-fs/Cargo.toml b/driver/fs/kernel-fs/Cargo.toml index d63a945f..7aa8d3b6 100644 --- a/driver/fs/kernel-fs/Cargo.toml +++ b/driver/fs/kernel-fs/Cargo.toml @@ -2,6 +2,7 @@ name = "kernel-fs" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -10,6 +11,6 @@ yggdrasil-abi = { git = "https://git.alnyan.me/yggdrasil/yggdrasil-abi.git" } vfs = { path = "../../../lib/vfs" } kernel-util = { path = "../../../lib/kernel-util" } -ygg_driver_block = { path = "../../block/block" } +ygg_driver_block = { path = "../../block/core" } log = "0.4.20" diff --git a/lib/memfs/Cargo.toml b/driver/fs/memfs/Cargo.toml similarity index 71% rename from lib/memfs/Cargo.toml rename to driver/fs/memfs/Cargo.toml index fae1b5db..444de5de 100644 --- a/lib/memfs/Cargo.toml +++ b/driver/fs/memfs/Cargo.toml @@ -2,13 +2,14 @@ name = "memfs" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] yggdrasil-abi = { git = "https://git.alnyan.me/yggdrasil/yggdrasil-abi.git" } -kernel-util = { path = "../kernel-util" } -vfs = { path = "../vfs" } +kernel-util = { path = "../../../lib/kernel-util" } +vfs = { path = "../../../lib/vfs" } static_assertions = "1.1.0" log = "0.4.20" diff --git a/lib/memfs/src/block.rs b/driver/fs/memfs/src/block.rs similarity index 100% rename from lib/memfs/src/block.rs rename to driver/fs/memfs/src/block.rs diff --git a/lib/memfs/src/bvec.rs b/driver/fs/memfs/src/bvec.rs similarity index 100% rename from lib/memfs/src/bvec.rs rename to driver/fs/memfs/src/bvec.rs diff --git a/lib/memfs/src/dir.rs b/driver/fs/memfs/src/dir.rs similarity index 100% rename from lib/memfs/src/dir.rs rename to driver/fs/memfs/src/dir.rs diff --git a/lib/memfs/src/file.rs b/driver/fs/memfs/src/file.rs similarity index 100% rename from lib/memfs/src/file.rs rename to driver/fs/memfs/src/file.rs diff --git a/lib/memfs/src/lib.rs b/driver/fs/memfs/src/lib.rs similarity index 100% rename from lib/memfs/src/lib.rs rename to driver/fs/memfs/src/lib.rs diff --git a/lib/memfs/src/tar.rs b/driver/fs/memfs/src/tar.rs similarity index 100% rename from lib/memfs/src/tar.rs rename to driver/fs/memfs/src/tar.rs diff --git a/lib/memfs/test/dir1/test1.txt b/driver/fs/memfs/test/dir1/test1.txt similarity index 100% rename from lib/memfs/test/dir1/test1.txt rename to driver/fs/memfs/test/dir1/test1.txt diff --git a/lib/memfs/test/test1.txt b/driver/fs/memfs/test/test1.txt similarity index 100% rename from lib/memfs/test/test1.txt rename to driver/fs/memfs/test/test1.txt diff --git a/lib/memfs/test/test_image.tar b/driver/fs/memfs/test/test_image.tar similarity index 100% rename from lib/memfs/test/test_image.tar rename to driver/fs/memfs/test/test_image.tar diff --git a/lib/device-api/Cargo.toml b/lib/device-api/Cargo.toml index ff5aca07..bab8d602 100644 --- a/lib/device-api/Cargo.toml +++ b/lib/device-api/Cargo.toml @@ -2,6 +2,7 @@ name = "device-api" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/device-api/macros/Cargo.toml b/lib/device-api/macros/Cargo.toml index 8c3983aa..6d7dd27f 100644 --- a/lib/device-api/macros/Cargo.toml +++ b/lib/device-api/macros/Cargo.toml @@ -2,6 +2,7 @@ name = "device-api-macros" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/hosted-tests/Cargo.toml b/lib/hosted-tests/Cargo.toml index 2699c8a0..2cdf5853 100644 --- a/lib/hosted-tests/Cargo.toml +++ b/lib/hosted-tests/Cargo.toml @@ -2,6 +2,7 @@ name = "hosted-tests" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/kernel-util/Cargo.toml b/lib/kernel-util/Cargo.toml index c953eeaf..217d5daa 100644 --- a/lib/kernel-util/Cargo.toml +++ b/lib/kernel-util/Cargo.toml @@ -2,6 +2,7 @@ name = "kernel-util" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/memtables/Cargo.toml b/lib/memtables/Cargo.toml index 2697e627..061db54a 100644 --- a/lib/memtables/Cargo.toml +++ b/lib/memtables/Cargo.toml @@ -2,6 +2,7 @@ name = "memtables" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/vfs/Cargo.toml b/lib/vfs/Cargo.toml index 22f37bae..bdb44b29 100644 --- a/lib/vfs/Cargo.toml +++ b/lib/vfs/Cargo.toml @@ -2,6 +2,7 @@ name = "vfs" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -9,7 +10,7 @@ edition = "2021" yggdrasil-abi = { git = "https://git.alnyan.me/yggdrasil/yggdrasil-abi.git", features = ["alloc"] } kernel-util = { path = "../kernel-util" } -ygg_driver_block = { path = "../../driver/block/block" } +ygg_driver_block = { path = "../../driver/block/core" } log = "0.4.20" diff --git a/lib/vmalloc/Cargo.toml b/lib/vmalloc/Cargo.toml index a5062b55..24ba6152 100644 --- a/lib/vmalloc/Cargo.toml +++ b/lib/vmalloc/Cargo.toml @@ -2,6 +2,7 @@ name = "vmalloc" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tools/gentables/Cargo.toml b/tools/gentables/Cargo.toml index 2e0a20e3..6598260b 100644 --- a/tools/gentables/Cargo.toml +++ b/tools/gentables/Cargo.toml @@ -2,6 +2,7 @@ name = "gentables" version = "0.1.0" edition = "2021" +authors = ["Mark Poliakov "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html