diff --git a/Cargo.lock b/Cargo.lock index 21df7c7..19a99f7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,7 +20,6 @@ dependencies = [ "embedded-graphics", "embedded-sdmmc", "rand_core 0.9.3", - "shared", "spin", "talc", ] @@ -1469,7 +1468,6 @@ dependencies = [ "panic-probe", "portable-atomic", "rand", - "shared", "spin", "st7365p-lcd", "static_cell", @@ -2208,15 +2206,6 @@ dependencies = [ "keccak", ] -[[package]] -name = "shared" -version = "0.1.0" -dependencies = [ - "abi_sys", - "bitflags 2.9.4", - "defmt 0.3.100", -] - [[package]] name = "siphasher" version = "1.0.1" diff --git a/Cargo.toml b/Cargo.toml index 3080f3d..5f3e4be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,6 @@ resolver = "3" members = [ "kernel", "abi", - "shared", "user-apps/calculator", "user-apps/snake", "user-apps/gallery", diff --git a/README.md b/README.md index 657623e..9bffec0 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,8 @@ Current focus is on **expanding the ABI syscalls** and **fixing the MSC/USB-SCSI ## Project Structure - **`kernel/`** – The core OS kernel (task scheduling, drivers, memory, etc.) -- **`abi_sys/`** – Shared application binary interface definitions for kernel ↔ userspace interaction -- **`abi/`** – ABI helpers and abstractions for easier development -- **`shared/`** – Shared utilities and common code across kernel and user applications +- **`abi_sys/`** – Shared application binary interface definitions for kernel ↔ userspace (Repr "C") +- **`abi/`** – Rust focused ABI helpers and abstractions for easier development - **`user-apps/`** – Collection of userspace programs (calculator, snake, etc.) ## Features diff --git a/abi/Cargo.toml b/abi/Cargo.toml index bb7337f..935faa5 100644 --- a/abi/Cargo.toml +++ b/abi/Cargo.toml @@ -6,7 +6,6 @@ edition = "2024" [dependencies] embedded-sdmmc = { version = "0.9.0", default-features = false } embedded-graphics = "0.8.1" -shared = { path = "../shared" } abi_sys = { path = "../abi_sys" } talc = "4.4.3" spin = "0.10.0" diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 13d4eef..2db6363 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -17,7 +17,6 @@ rp235x = ["embassy-rp/rp235xb"] trouble = ["dep:bt-hci", "dep:cyw43", "dep:cyw43-pio", "dep:trouble-host"] defmt = [ "dep:defmt", - "shared/defmt", "panic-probe/print-defmt", "embassy-executor/defmt", "embassy-time/defmt", @@ -91,5 +90,4 @@ goblin = { version = "0.10.1", default-features = false, features = ["elf32"] } talc = "4.4.3" bumpalo = "3.19.0" -shared = { path = "../shared" } abi_sys = { path = "../abi_sys" } diff --git a/shared/Cargo.toml b/shared/Cargo.toml deleted file mode 100644 index 8796b8a..0000000 --- a/shared/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "shared" -version = "0.1.0" -edition = "2024" - -[features] -default = [] -defmt = ["dep:defmt"] - -[dependencies] -abi_sys = { path = "../abi_sys" } -bitflags = "2.9.4" -defmt = { version = "0.3", optional = true } diff --git a/shared/src/lib.rs b/shared/src/lib.rs deleted file mode 100644 index 0c9ac1a..0000000 --- a/shared/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -#![no_std]