diff --git a/Cargo.lock b/Cargo.lock index 3439147..a1c3fd2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1089,9 +1089,9 @@ dependencies = [ "critical-section", "embassy-executor", "embedded-alloc", + "libsyscall-caliptra", "libtock", "libtock_alarm", - "libtock_caliptra", "libtock_console", "libtock_debug_panic", "libtock_platform", @@ -1483,15 +1483,6 @@ dependencies = [ "libtock_unittest", ] -[[package]] -name = "libtock_caliptra" -version = "0.1.0" -dependencies = [ - "libtock_console", - "libtock_platform", - "libtockasync", -] - [[package]] name = "libtock_console" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 0498351..bedb6b9 100644 --- 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 deleted file mode 100644 index 8e65398..0000000 --- a/runtime/apps/apis/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -# Licensed under the Apache-2.0 license - -[package] -name = "libtock_caliptra" -version.workspace = true -authors.workspace = true -edition.workspace = true - -[dependencies] -libtock_console.workspace = true -libtock_platform.workspace = true -libtockasync.workspace = true diff --git a/runtime/apps/apis/src/lib.rs b/runtime/apps/apis/src/lib.rs deleted file mode 100644 index 03a892a..0000000 --- a/runtime/apps/apis/src/lib.rs +++ /dev/null @@ -1,5 +0,0 @@ -// Licensed under the Apache-2.0 license - -#![no_std] - -pub mod mctp; diff --git a/runtime/apps/example/Cargo.toml b/runtime/apps/example/Cargo.toml index 753aeb8..ec9530c 100644 --- 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 index 57d7fbc..8c3d40a 100644 --- 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 index 1a82009..3fd7d0d 100644 --- 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 b/runtime/apps/syscall/src/mctp.rs similarity index 100% rename from runtime/apps/apis/src/mctp.rs rename to runtime/apps/syscall/src/mctp.rs