alnyan/yggdrasil
1
0
Fork 0
Code Issues 33 Pull Requests Packages Projects Releases Wiki Activity

refactor: switch to workspace dependencies

Browse Source
This commit is contained in:
Mark Poliakov 2024-11-01 20:37:30 +02:00
parent ebedd96362
commit 109f290c67
36 changed files with 284 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -2229,7 +2229,6 @@ dependencies = [
"acpi-system",
"aml",
"async-trait",
"atomic_enum",
"bitflags 2.6.0",
"bytemuck",
"crossbeam-queue",

59
Cargo.toml
View File

@ -16,3 +16,62 @@ members = [
"lib/runtime",
"lib/qemu"
]
[workspace.dependencies]
log = "0.4.22"
atomic_enum = "0.3.0"
bitflags = "2.6.0"
static_assertions = "1.1.0"
tock-registers = "0.8.1"
bytemuck = { version = "1.16.1", features = ["derive"] }
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
crossbeam-queue = { version = "0.3.11", default-features = false, features = ["alloc"] }
async-trait = "0.1.81"
cfg-if = "1.0.0"
serde_json = { version = "1.0.111", default-features = false, features = ["alloc"] }
serde = { version = "1.0.193", features = ["derive"], default-features = false }
memoffset = "0.9.0"
ahash = { version = "0.8.11", default-features = false, features = ["no-rng"] }
# acpi
acpi = { git = "https://github.com/alnyan/acpi.git", package = "acpi", branch = "acpi-system" }
aml = { git = "https://github.com/alnyan/acpi.git", branch = "acpi-system" }
acpi-system = { git = "https://github.com/alnyan/acpi-system.git" }
# yboot
yboot-proto.path = "boot/yboot-proto"
# Local libs
abi-lib.path = "lib/abi-lib"
yggdrasil-abi.path = "lib/abi"
abi-generator.path = "tool/abi-generator"
# Kernel parts
kernel-arch-interface.path = "kernel/arch/interface"
kernel-arch-aarch64.path = "kernel/arch/aarch64"
kernel-arch-x86_64.path = "kernel/arch/x86_64"
kernel-arch-i686.path = "kernel/arch/i686"
kernel-arch-x86.path = "kernel/arch/x86"
kernel-arch.path = "kernel/arch"
device-api.path = "kernel/lib/device-api"
libk.path = "kernel/libk"
libk-util.path = "kernel/libk/libk-util"
libk-mm.path = "kernel/libk/libk-mm"
libk-mm-interface.path = "kernel/libk/libk-mm/interface"
libk-device.path = "kernel/libk/libk-device"
memtables.path = "kernel/lib/memtables"
vmalloc.path = "kernel/lib/vmalloc"
device-api-macros.path = "kernel/lib/device-api/macros"
device-tree.path = "kernel/lib/device-tree"
# AArch64
fdt-rs = { version = "0.4.5", default-features = false }
aarch64-cpu = "9.4.0"
discrete_range_map = { git = "https://git.alnyan.me/yggdrasil/discrete_range_map.git" }
[workspace.dependencies.elf]
version = "0.7.2"
git = "https://git.alnyan.me/yggdrasil/yggdrasil-elf.git"
default-features = false
features = ["no_std_stream"]

89
kernel/Cargo.toml
View File

@ -5,23 +5,22 @@ edition = "2021"
build = "build.rs"
authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
abi-lib = { path = "../lib/abi-lib" }
yggdrasil-abi = { path = "../lib/abi" }
abi-lib.workspace = true
yggdrasil-abi.workspace = true
kernel-arch-interface.workspace = true
libk.workspace = true
libk-util.workspace = true
libk-mm.workspace = true
libk-device.workspace = true
elf.workspace = true
kernel-arch-interface = { path = "arch/interface" }
device-api = { path = "lib/device-api", features = ["derive"] }
libk = { path = "libk" }
libk-util = { path = "libk/libk-util" }
libk-mm = { path = "libk/libk-mm" }
libk-device = { path = "libk/libk-device" }
memtables = { path = "lib/memtables" }
vmalloc = { path = "lib/vmalloc" }
device-api-macros = { path = "lib/device-api/macros" }
device-api = { workspace = true, features = ["derive"] }
device-api-macros.workspace = true
kernel-arch = { path = "arch" }
memtables.workspace = true
vmalloc.workspace = true
kernel-arch.workspace = true
# Drivers
ygg_driver_pci = { path = "driver/bus/pci" }
@ -37,52 +36,50 @@ kernel-fs = { path = "driver/fs/kernel-fs" }
memfs = { path = "driver/fs/memfs" }
ext2 = { path = "driver/fs/ext2" }
atomic_enum = "0.3.0"
bitflags = "2.6.0"
static_assertions = "1.1.0"
tock-registers = "0.8.1"
git-version = "0.3.9"
log = "0.4.22"
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
crossbeam-queue = { version = "0.3.11", default-features = false, features = ["alloc"] }
bytemuck = { version = "1.16.1", features = ["derive"] }
async-trait = "0.1.81"
log.workspace = true
bitflags.workspace = true
tock-registers.workspace = true
static_assertions.workspace = true
bytemuck.workspace = true
futures-util.workspace = true
crossbeam-queue.workspace = true
async-trait.workspace = true
[dependencies.elf]
version = "0.7.2"
git = "https://git.alnyan.me/yggdrasil/yggdrasil-elf.git"
default-features = false
features = ["no_std_stream"]
git-version = "0.3.9"
[target.'cfg(target_arch = "aarch64")'.dependencies]
aarch64-cpu = "9.4.0"
device-tree = { path = "lib/device-tree" }
kernel-arch-aarch64 = { path = "arch/aarch64" }
aarch64-cpu.workspace = true
device-tree.workspace = true
kernel-arch-aarch64.workspace = true
[target.'cfg(target_arch = "x86_64")'.dependencies]
yboot-proto = { path = "../boot/yboot-proto" }
aml = { git = "https://github.com/alnyan/acpi.git", branch = "acpi-system" }
acpi_lib = { git = "https://github.com/alnyan/acpi.git", package = "acpi", branch = "acpi-system" }
acpi-system = { git = "https://github.com/alnyan/acpi-system.git" }
yboot-proto.workspace = true
kernel-arch-x86_64.workspace = true
kernel-arch-x86.workspace = true
ygg_driver_nvme = { path = "driver/block/nvme" }
kernel-arch-x86_64 = { path = "arch/x86_64" }
kernel-arch-x86 = { path = "arch/x86" }
acpi.workspace = true
aml.workspace = true
acpi-system.workspace = true
[target.'cfg(target_arch = "x86")'.dependencies]
kernel-arch-i686 = { path = "arch/i686" }
kernel-arch-x86 = { path = "arch/x86" }
kernel-arch-i686.workspace = true
kernel-arch-x86.workspace = true
[build-dependencies]
abi-generator.workspace = true
prettyplease = "0.2.15"
abi-generator = { path = "../tool/abi-generator" }
# To make rust-analyzer recognize those
[dev-dependencies]
aarch64-cpu = "9.4.0"
device-tree = { path = "lib/device-tree" }
kernel-arch-aarch64 = { path = "arch/aarch64" }
kernel-arch-i686 = { path = "arch/i686" }
kernel-arch-x86 = { path = "arch/x86" }
aarch64-cpu.workspace = true
device-tree.workspace = true
kernel-arch-x86_64.workspace = true
kernel-arch-i686.workspace = true
kernel-arch-x86.workspace = true
kernel-arch-aarch64.workspace = true
[features]
default = ["fb_console"]

2
kernel/arch/Cargo.toml
View File

@ -20,4 +20,4 @@ kernel-arch-hosted = { path = "hosted" }
[dependencies]
kernel-arch-interface = { path = "interface" }
cfg-if = "1.0.0"
cfg-if.workspace = true

18
kernel/arch/aarch64/Cargo.toml
View File

@ -4,16 +4,16 @@ version = "0.1.0"
edition = "2021"
[dependencies]
yggdrasil-abi = { path = "../../../lib/abi" }
kernel-arch-interface = { path = "../interface" }
libk-mm-interface = { path = "../../libk/libk-mm/interface" }
memtables = { path = "../../lib/memtables" }
device-api = { path = "../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
kernel-arch-interface.workspace = true
libk-mm-interface.workspace = true
memtables.workspace = true
device-api = { workspace = true, features = ["derive"] }
bitflags = "2.6.0"
static_assertions = "1.1.0"
aarch64-cpu = "9.4.0"
tock-registers = "0.8.1"
bitflags.workspace = true
static_assertions.workspace = true
aarch64-cpu.workspace = true
tock-registers.workspace = true
[build-dependencies]
cc = "1.0"

6
kernel/arch/hosted/Cargo.toml
View File

@ -4,6 +4,6 @@ version = "0.1.0"
edition = "2021"
[dependencies]
kernel-arch-interface = { path = "../interface" }
yggdrasil-abi = { path = "../../../lib/abi" }
libk-mm-interface = { path = "../../libk/libk-mm/interface" }
kernel-arch-interface.workspace = true
yggdrasil-abi.workspace = true
libk-mm-interface.workspace = true

20
kernel/arch/i686/Cargo.toml
View File

@ -4,15 +4,13 @@ version = "0.1.0"
edition = "2021"
[dependencies]
yggdrasil-abi = { path = "../../../lib/abi" }
kernel-arch-interface = { path = "../interface" }
libk-mm-interface = { path = "../../libk/libk-mm/interface" }
device-api = { path = "../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
kernel-arch-interface.workspace = true
libk-mm-interface.workspace = true
device-api = { workspace = true, features = ["derive"] }
kernel-arch-x86.workspace = true
kernel-arch-x86 = { path = "../x86" }
bitflags = "2.6.0"
static_assertions = "1.1.0"
tock-registers = "0.8.1"
log = "*"
bitflags.workspace = true
static_assertions.workspace = true
tock-registers.workspace = true
log.workspace = true

4
kernel/arch/interface/Cargo.toml
View File

@ -4,8 +4,8 @@ version = "0.1.0"
edition = "2021"
[dependencies]
yggdrasil-abi = { path = "../../../lib/abi" }
device-api = { path = "../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
device-api = { workspace = true, features = ["derive"] }
[lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] }

12
kernel/arch/x86/Cargo.toml
View File

@ -4,13 +4,13 @@ version = "0.1.0"
edition = "2021"
[dependencies]
kernel-arch-interface = { path = "../interface" }
kernel-arch-interface.workspace = true
bytemuck = { version = "1.16.1", features = ["derive"] }
bitflags = "2.6.0"
tock-registers = "0.8.1"
static_assertions = "1.1.0"
log = "0.4.22"
bytemuck = { workspace = true, features = ["derive"] }
bitflags.workspace = true
tock-registers.workspace = true
static_assertions.workspace = true
log.workspace = true
[lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] }

19
kernel/arch/x86_64/Cargo.toml
View File

@ -4,14 +4,13 @@ version = "0.1.0"
edition = "2021"
[dependencies]
yggdrasil-abi = { path = "../../../lib/abi" }
kernel-arch-interface = { path = "../interface" }
libk-mm-interface = { path = "../../libk/libk-mm/interface" }
memtables = { path = "../../lib/memtables" }
device-api = { path = "../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
kernel-arch-interface.workspace = true
libk-mm-interface.workspace = true
memtables.workspace = true
device-api = { workspace = true, features = ["derive"] }
kernel-arch-x86.workspace = true
kernel-arch-x86 = { path = "../x86" }
bitflags = "2.6.0"
static_assertions = "1.1.0"
tock-registers = "0.8.1"
bitflags.workspace = true
static_assertions.workspace = true
tock-registers.workspace = true

24
kernel/driver/block/ahci/Cargo.toml
View File

@ -5,19 +5,19 @@ edition = "2021"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
libk-mm = { path = "../../../libk/libk-mm" }
libk-util = { path = "../../../libk/libk-util" }
libk = { path = "../../../libk" }
device-api = { path = "../../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
libk-mm.workspace = true
libk-util.workspace = true
libk.workspace = true
device-api = { workspace = true, features = ["derive"] }
ygg_driver_pci = { path = "../../bus/pci" }
kernel-fs = { path = "../../fs/kernel-fs" }
log = "0.4.22"
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
static_assertions = "1.1.0"
tock-registers = "0.8.1"
bytemuck = { version = "1.16.1", features = ["derive"] }
memoffset = "0.9.0"
async-trait = "0.1.81"
log.workspace = true
futures-util.workspace = true
static_assertions.workspace = true
tock-registers.workspace = true
bytemuck.workspace = true
memoffset.workspace = true
async-trait.workspace = true

22
kernel/driver/block/nvme/Cargo.toml
View File

@ -5,18 +5,18 @@ edition = "2021"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
libk-util = { path = "../../../libk/libk-util" }
libk-mm = { path = "../../../libk/libk-mm" }
libk = { path = "../../../libk" }
device-api = { path = "../../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
libk-util.workspace = true
libk-mm.workspace = true
libk.workspace = true
device-api = { workspace = true, features = ["derive"] }
ygg_driver_pci = { path = "../../bus/pci" }
kernel-fs = { path = "../../fs/kernel-fs" }
log = "0.4.22"
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
static_assertions = "1.1.0"
tock-registers = "0.8.1"
bytemuck = { version = "1.16.1", features = ["derive"] }
async-trait = "0.1.81"
log.workspace = true
futures-util.workspace = true
static_assertions.workspace = true
tock-registers.workspace = true
bytemuck.workspace = true
async-trait.workspace = true

18
kernel/driver/bus/pci/Cargo.toml
View File

@ -5,18 +5,18 @@ edition = "2021"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
device-api = { path = "../../../lib/device-api", features = ["derive"] }
libk-mm = { path = "../../../libk/libk-mm" }
libk-device = { path = "../../../libk/libk-device" }
libk-util = { path = "../../../libk/libk-util" }
yggdrasil-abi.workspace = true
device-api = { workspace = true, features = ["derive"] }
libk-mm.workspace = true
libk-device.workspace = true
libk-util.workspace = true
log = "0.4.22"
bitflags = "2.6.0"
tock-registers = "0.8.1"
log.workspace = true
bitflags.workspace = true
tock-registers.workspace = true
[target.'cfg(target_arch = "x86_64")'.dependencies]
acpi = { git = "https://github.com/alnyan/acpi.git", package = "acpi", branch = "acpi-system" }
acpi.workspace = true
[lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] }

18
kernel/driver/bus/usb/Cargo.toml
View File

@ -5,14 +5,14 @@ edition = "2021"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
device-api = { path = "../../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
device-api = { workspace = true, features = ["derive"] }
libk-util.workspace = true
libk-mm.workspace = true
libk.workspace = true
ygg_driver_input = { path = "../../input" }
libk-util = { path = "../../../libk/libk-util" }
libk-mm = { path = "../../../libk/libk-mm" }
libk = { path = "../../../libk" }
log = "0.4.22"
bytemuck = { version = "1.16.1", features = ["derive"] }
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
log.workspace = true
bytemuck.workspace = true
futures-util.workspace = true

14
kernel/driver/fs/ext2/Cargo.toml
View File

@ -5,11 +5,11 @@ edition = "2021"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
libk = { path = "../../../libk" }
libk-mm = { path = "../../../libk/libk-mm" }
libk-util = { path = "../../../libk/libk-util" }
yggdrasil-abi.workspace = true
libk.workspace = true
libk-mm.workspace = true
libk-util.workspace = true
bytemuck = { version = "1.16.1", features = ["derive"] }
static_assertions = "1.1.0"
log = "0.4.22"
bytemuck.workspace = true
static_assertions.workspace = true
log.workspace = true

8
kernel/driver/fs/kernel-fs/Cargo.toml
View File

@ -5,8 +5,8 @@ edition = "2021"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
libk-util = { path = "../../../libk/libk-util" }
libk = { path = "../../../libk" }
yggdrasil-abi.workspace = true
libk-util.workspace = true
libk.workspace = true
log = "0.4.22"
log.workspace = true

10
kernel/driver/fs/memfs/Cargo.toml
View File

@ -5,12 +5,12 @@ edition = "2021"
authors = ["Mark Poliakov <mark@alnyan.me>"]
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
libk-util = { path = "../../../libk/libk-util" }
libk = { path = "../../../libk" }
yggdrasil-abi.workspace = true
libk-util.workspace = true
libk.workspace = true
static_assertions = "1.1.0"
log = "0.4.22"
static_assertions.workspace = true
log.workspace = true
[features]
default = []

10
kernel/driver/input/Cargo.toml
View File

@ -4,9 +4,9 @@ version = "0.1.0"
edition = "2021"
[dependencies]
yggdrasil-abi = { path = "../../../lib/abi" }
libk-util = { path = "../../libk/libk-util" }
libk-mm = { path = "../../libk/libk-mm" }
libk = { path = "../../libk" }
yggdrasil-abi.workspace = true
libk-util.workspace = true
libk-mm.workspace = true
libk.workspace = true
async-trait = "0.1.81"
async-trait.workspace = true

18
kernel/driver/net/core/Cargo.toml
View File

@ -4,15 +4,15 @@ version = "0.1.0"
edition = "2021"
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi", features = ["serde_kernel", "bytemuck"] }
libk-mm = { path = "../../../libk/libk-mm" }
libk-util = { path = "../../../libk/libk-util" }
libk-device = { path = "../../../libk/libk-device" }
libk = { path = "../../../libk" }
yggdrasil-abi = { workspace = true, features = ["serde_kernel", "bytemuck"] }
libk-mm.workspace = true
libk-util.workspace = true
libk-device.workspace = true
libk.workspace = true
kernel-fs = { path = "../../fs/kernel-fs" }
log = "0.4.22"
bytemuck = { version = "1.16.1", features = ["derive"] }
serde_json = { version = "1.0.111", default-features = false, features = ["alloc"] }
serde = { version = "1.0.193", features = ["derive"], default-features = false }
log.workspace = true
bytemuck.workspace = true
serde_json.workspace = true
serde.workspace = true

8
kernel/driver/net/loopback/Cargo.toml
View File

@ -4,10 +4,10 @@ version = "0.1.0"
edition = "2021"
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
libk-util = { path = "../../../libk/libk-util" }
libk-mm = { path = "../../../libk/libk-mm" }
yggdrasil-abi.workspace = true
libk-util.workspace = true
libk-mm.workspace = true
ygg_driver_net_core = { path = "../../net/core" }
bytemuck = { version = "1.16.1", features = ["derive"] }
bytemuck.workspace = true

12
kernel/driver/virtio/core/Cargo.toml
View File

@ -4,15 +4,15 @@ version = "0.1.0"
edition = "2021"
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
libk-mm = { path = "../../../libk/libk-mm" }
device-api = { path = "../../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
libk-mm.workspace = true
device-api = { workspace = true, features = ["derive"] }
ygg_driver_pci = { path = "../../bus/pci", optional = true }
log = "0.4.22"
bitflags = "2.6.0"
tock-registers = "0.8.1"
log.workspace = true
bitflags.workspace = true
tock-registers.workspace = true
[features]
default = []

16
kernel/driver/virtio/net/Cargo.toml
View File

@ -4,19 +4,19 @@ version = "0.1.0"
edition = "2021"
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
libk-util = { path = "../../../libk/libk-util" }
libk-mm = { path = "../../../libk/libk-mm" }
device-api = { path = "../../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
libk-util.workspace = true
libk-mm.workspace = true
device-api = { workspace = true, features = ["derive"] }
ygg_driver_virtio_core = { path = "../core" }
ygg_driver_net_core = { path = "../../net/core" }
ygg_driver_pci = { path = "../../bus/pci", optional = true }
log = "0.4.22"
bitflags = "2.6.0"
tock-registers = "0.8.1"
bytemuck = { version = "1.16.1", features = ["derive"] }
log.workspace = true
bitflags.workspace = true
tock-registers.workspace = true
bytemuck.workspace = true
[features]
default = []

4
kernel/lib/device-api/Cargo.toml
View File

@ -7,8 +7,8 @@ authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
yggdrasil-abi = { path = "../../../lib/abi" }
device-api-macros = { path = "macros", optional = true }
yggdrasil-abi.workspace = true
device-api-macros = { workspace = true, optional = true }
[features]
default = []

8
kernel/lib/device-tree/Cargo.toml
View File

@ -6,9 +6,9 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
yggdrasil-abi = { path = "../../../lib/abi" }
yggdrasil-abi.workspace = true
device-api = { path = "../device-api", features = ["derive"] }
libk-mm = { path = "../../libk/libk-mm" }
libk-mm.workspace = true
fdt-rs = { version = "0.4.5", default-features = false }
log = "0.4.22"
fdt-rs.workspace = true
log.workspace = true

2
kernel/lib/memtables/Cargo.toml
View File

@ -7,7 +7,7 @@ authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
bytemuck = { version = "1.16.1", features = ["derive"] }
bytemuck.workspace = true
[features]
default = []

4
kernel/lib/vmalloc/Cargo.toml
View File

@ -7,9 +7,9 @@ authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
yggdrasil-abi = { path = "../../../lib/abi" }
yggdrasil-abi.workspace = true
discrete_range_map = { git = "https://git.alnyan.me/yggdrasil/discrete_range_map.git" }
discrete_range_map.workspace = true
[dev-dependencies]
itertools = "0.11.0"

41
kernel/libk/Cargo.toml
View File

@ -10,34 +10,29 @@ authors = ["Mark Poliakov <mark@alnyan.me>"]
crate-type = ["rlib", "dylib"]
[dependencies]
libk-mm = { path = "libk-mm" }
libk-util = { path = "libk-util" }
libk-device = { path = "libk-device" }
kernel-arch = { path = "../arch" }
libk-mm.workspace = true
libk-util.workspace = true
libk-device.workspace = true
kernel-arch.workspace = true
abi-lib.workspace = true
yggdrasil-abi = { workspace = true, features = ["alloc", "serde"] }
device-api = { workspace = true, features = ["derive"] }
abi-lib = { path = "../../lib/abi-lib" }
yggdrasil-abi = { path = "../../lib/abi", features = ["alloc", "serde"] }
device-api = { path = "../lib/device-api", features = ["derive"] }
cfg-if.workspace = true
log.workspace = true
atomic_enum.workspace = true
futures-util.workspace = true
crossbeam-queue.workspace = true
cfg-if = "1.0.0"
log = "0.4.22"
atomic_enum = "0.3.0"
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
crossbeam-queue = { version = "0.3.11", default-features = false, features = ["alloc"] }
serde_json.workspace = true
serde.workspace = true
bytemuck.workspace = true
async-trait.workspace = true
static_assertions.workspace = true
elf.workspace = true
serde_json = { version = "1.0.111", default-features = false, features = ["alloc"] }
serde = { version = "1.0.193", features = ["derive"], default-features = false }
bytemuck = { version = "1.16.1", features = ["derive"] }
async-trait = "0.1.81"
static_assertions = "1.1.0"
uuid = { version = "1.10.0", features = ["bytemuck"], default-features = false }
lru = "0.12.3"
[dependencies.elf]
version = "0.7.2"
git = "https://git.alnyan.me/yggdrasil/yggdrasil-elf.git"
default-features = false
features = ["no_std_stream"]
[lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] }

8
kernel/libk/libk-device/Cargo.toml
View File

@ -4,8 +4,8 @@ version = "0.1.0"
edition = "2021"
[dependencies]
libk-util = { path = "../libk-util" }
kernel-arch = { path = "../../arch" }
libk-util.workspace = true
kernel-arch.workspace = true
yggdrasil-abi = { path = "../../../lib/abi" }
device-api = { path = "../../lib/device-api", features = ["derive"] }
yggdrasil-abi.workspace = true
device-api = { workspace = true, features = ["derive"] }

14
kernel/libk/libk-mm/Cargo.toml
View File

@ -3,18 +3,16 @@ name = "libk-mm"
version = "0.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
yggdrasil-abi = { path = "../../../lib/abi" }
kernel-arch = { path = "../../arch" }
libk-util = { path = "../libk-util" }
libk-mm-interface = { path = "interface" }
vmalloc = { path = "../../lib/vmalloc" }
yggdrasil-abi.workspace = true
kernel-arch.workspace = true
libk-util.workspace = true
libk-mm-interface.workspace = true
vmalloc.workspace = true
libyalloc = { path = "../../../lib/libyalloc", default-features = false, features = ["dep-of-kernel"] }
log = "0.4.22"
log.workspace = true
[lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] }

9
kernel/libk/libk-mm/interface/Cargo.toml
View File

@ -6,12 +6,11 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
yggdrasil-abi = { path = "../../../../lib/abi" }
yggdrasil-abi.workspace = true
kernel-arch-interface.workspace = true
kernel-arch-interface = { path = "../../../arch/interface" }
bitflags = "2.6.0"
bytemuck = { version = "1.16.1", features = ["derive"] }
bitflags.workspace = true
bytemuck.workspace = true
[lints.rust]
unexpected_cfgs = { level = "allow", check-cfg = ['cfg(rust_analyzer)'] }

8
kernel/libk/libk-util/Cargo.toml
View File

@ -9,7 +9,7 @@ edition = "2021"
yggdrasil-abi = { path = "../../../lib/abi" }
kernel-arch = { path = "../../arch" }
log = "0.4.22"
crossbeam-queue = { version = "0.3.11", default-features = false, features = ["alloc"] }
futures-util = { version = "0.3.30", default-features = false, features = ["alloc", "async-await"] }
ahash = { version = "0.8.11", default-features = false, features = ["no-rng"] }
log.workspace = true
crossbeam-queue.workspace = true
futures-util.workspace = true
ahash.workspace = true

2
kernel/src/arch/x86_64/acpi.rs
View File

@ -6,7 +6,7 @@ use core::{
time::Duration,
};
use acpi_lib::{AcpiHandler, AcpiTables, PhysicalMapping};
use ::acpi::{AcpiHandler, AcpiTables, PhysicalMapping};
use acpi_system::{
AcpiInterruptMethod, AcpiSleepState, AcpiSystem, AcpiSystemError, EventAction, FixedEvent,
};

2
kernel/src/arch/x86_64/apic/ioapic.rs
View File

@ -1,6 +1,6 @@
//! x86-64 I/O APIC driver implementation
use ::acpi::platform::interrupt::{Apic as AcpiApic, Polarity, TriggerMode};
use abi::error::Error;
use acpi_lib::platform::interrupt::{Apic as AcpiApic, Polarity, TriggerMode};
use device_api::{
interrupt::{
ExternalInterruptController, FixedInterruptTable, InterruptHandler, InterruptTable, Irq,

2
kernel/src/arch/x86_64/mod.rs
View File

@ -1,8 +1,8 @@
//! x86-64 architecture implementation
use core::{mem::size_of, ops::DerefMut, ptr::null_mut, sync::atomic::Ordering};
use ::acpi::{mcfg::Mcfg, AcpiTables, InterruptModel};
use abi::error::Error;
use acpi_lib::{mcfg::Mcfg, AcpiTables, InterruptModel};
use alloc::boxed::Box;
use device_api::{interrupt::Irq, Device};
use git_version::git_version;

2
kernel/src/arch/x86_64/smp.rs
View File

@ -1,7 +1,7 @@
//! x86-64 multiprocessing implementation
use core::sync::atomic::Ordering;
use acpi_lib::platform::{ProcessorInfo, ProcessorState};
use ::acpi::platform::{ProcessorInfo, ProcessorState};
use kernel_arch::{Architecture, ArchitectureImpl};
use kernel_arch_x86_64::{
mem::{

9
kernel/tools/gentables/Cargo.toml
View File

@ -7,10 +7,11 @@ authors = ["Mark Poliakov <mark@alnyan.me>"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
memtables = { path = "../../lib/memtables", features = ["all"] }
memtables = { workspace = true, features = ["all"] }
bytemuck.workspace = true
bitflags.workspace = true
bytemuck = "1.16.1"
elf = "0.7.2"
thiserror = "1.0.48"
clap = { version = "4.4.2", features = ["derive"] }
bitflags = "2.6.0"
elf = "0.7.2"