Move apis to syscall directory

chipsalliance · Jan 10, 2025 · 3afd08a · 3afd08a
1 parent 9077cb2
commit 3afd08a
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,6 @@ members = [
     "romtime",
     "runtime",
     "runtime/apps/example",
-    "runtime/apps/apis",
     "runtime/apps/libtock/apis/interface/buttons",
     "runtime/apps/libtock/apis/interface/buzzer",
     "runtime/apps/libtock/apis/interface/console",
@@ -131,7 +130,6 @@ libtock_debug_panic = { path = "runtime/apps/libtock/panic_handlers/debug_panic"
 libtock_platform = { path = "runtime/apps/libtock/platform" }
 libtock_runtime = { path = "runtime/apps/libtock/runtime" }
 libtock_unittest = { path = "runtime/apps/libtock/unittest" }
-libtock_caliptra = { path = "runtime/apps/apis" }
 libsyscall-caliptra = { path = "runtime/apps/syscall" }
 
 # caliptra dependencies; keep git revs in sync

diff --git a/runtime/apps/apis/Cargo.toml b/runtime/apps/apis/Cargo.toml
diff --git a/runtime/apps/apis/src/lib.rs b/runtime/apps/apis/src/lib.rs
diff --git a/runtime/apps/example/Cargo.toml b/runtime/apps/example/Cargo.toml
@@ -9,8 +9,8 @@ edition.workspace = true
 [dependencies]
 critical-section.workspace = true
 embassy-executor.workspace = true
+libsyscall-caliptra.workspace = true
 libtock_alarm.workspace = true
-libtock_caliptra.workspace = true
 libtock_console.workspace = true
 libtock_debug_panic.workspace = true
 libtock_platform.workspace = true

diff --git a/runtime/apps/example/src/main.rs b/runtime/apps/example/src/main.rs
@@ -6,8 +6,8 @@
 #![allow(static_mut_refs)]
 
 use core::fmt::Write;
+use libsyscall_caliptra::mctp::{driver_num, Mctp};
 use libtock::alarm::*;
-use libtock_caliptra::mctp::{driver_num, Mctp};
 use libtock_console::Console;
 use libtock_platform::{self as platform};
 use libtock_platform::{DefaultConfig, ErrorCode, Syscalls};

diff --git a/runtime/apps/syscall/src/lib.rs b/runtime/apps/syscall/src/lib.rs
@@ -4,3 +4,4 @@
 
 pub mod dma;
 pub mod mailbox;
+pub mod mctp;
diff --git a/runtime/apps/apis/src/mctp.rs → runtime/apps/syscall/src/mctp.rs b/runtime/apps/apis/src/mctp.rs → runtime/apps/syscall/src/mctp.rs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@

		pub mod dma;
		pub mod mailbox;
		pub mod mctp;