From 6cf475732305059152201ff4fb0b197b74c7d149 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 8 Sep 2025 17:21:32 +0800 Subject: [PATCH] rename usb-cramium to usb-bao1x --- services/{usb-cramium => usb-bao1x}/Cargo.toml | 3 ++- services/{usb-cramium => usb-bao1x}/src/api.rs | 0 services/{usb-cramium => usb-bao1x}/src/debug.rs | 0 services/{usb-cramium => usb-bao1x}/src/hw.rs | 2 +- services/{usb-cramium => usb-bao1x}/src/lib.rs | 0 services/{usb-cramium => usb-bao1x}/src/main.rs | 6 +++--- services/{usb-cramium => usb-bao1x}/src/main_hosted.rs | 0 services/{usb-cramium => usb-bao1x}/src/mappings.rs | 0 8 files changed, 6 insertions(+), 5 deletions(-) rename services/{usb-cramium => usb-bao1x}/Cargo.toml (96%) rename services/{usb-cramium => usb-bao1x}/src/api.rs (100%) rename services/{usb-cramium => usb-bao1x}/src/debug.rs (100%) rename services/{usb-cramium => usb-bao1x}/src/hw.rs (99%) rename services/{usb-cramium => usb-bao1x}/src/lib.rs (100%) rename services/{usb-cramium => usb-bao1x}/src/main.rs (99%) rename services/{usb-cramium => usb-bao1x}/src/main_hosted.rs (100%) rename services/{usb-cramium => usb-bao1x}/src/mappings.rs (100%) diff --git a/services/usb-cramium/Cargo.toml b/services/usb-bao1x/Cargo.toml similarity index 96% rename from services/usb-cramium/Cargo.toml rename to services/usb-bao1x/Cargo.toml index 20a82cd2f..b04ad702a 100644 --- a/services/usb-cramium/Cargo.toml +++ b/services/usb-bao1x/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "usb-cramium" +name = "usb-bao1x" version = "0.1.0" edition = "2021" @@ -19,6 +19,7 @@ cramium-hal = { path = "../../libs/cramium-hal", features = [ # "verbose-debug", "axp2101", ], optional = true } +cramium-api = { path = "../../libs/cramium-api" } cram-hal-service = { path = "../cram-hal-service", optional = true } cramium-emu = { path = "../cramium-emu", optional = true } xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branch = "main" } diff --git a/services/usb-cramium/src/api.rs b/services/usb-bao1x/src/api.rs similarity index 100% rename from services/usb-cramium/src/api.rs rename to services/usb-bao1x/src/api.rs diff --git a/services/usb-cramium/src/debug.rs b/services/usb-bao1x/src/debug.rs similarity index 100% rename from services/usb-cramium/src/debug.rs rename to services/usb-bao1x/src/debug.rs diff --git a/services/usb-cramium/src/hw.rs b/services/usb-bao1x/src/hw.rs similarity index 99% rename from services/usb-cramium/src/hw.rs rename to services/usb-bao1x/src/hw.rs index 2bfed77d1..d86e37a71 100644 --- a/services/usb-cramium/src/hw.rs +++ b/services/usb-bao1x/src/hw.rs @@ -7,7 +7,7 @@ use std::sync::atomic::{AtomicPtr, Ordering}; use cramium_hal::usb::driver::{CRG_UDC_ERDPLO_EHB, CorigineWrapper, EventTrbS}; use cramium_hal::usb::utra::*; use num_traits::*; -use usb_cramium::HIDReport; +use usb_bao1x::HIDReport; use usb_device::class_prelude::*; use usb_device::device::UsbDevice; use usb_device::prelude::*; diff --git a/services/usb-cramium/src/lib.rs b/services/usb-bao1x/src/lib.rs similarity index 100% rename from services/usb-cramium/src/lib.rs rename to services/usb-bao1x/src/lib.rs diff --git a/services/usb-cramium/src/main.rs b/services/usb-bao1x/src/main.rs similarity index 99% rename from services/usb-cramium/src/main.rs rename to services/usb-bao1x/src/main.rs index 015b1923c..b2cc4d69d 100644 --- a/services/usb-cramium/src/main.rs +++ b/services/usb-bao1x/src/main.rs @@ -15,7 +15,7 @@ use std::panic; use std::sync::Arc; use api::{HIDReport, LogLevel, Opcode, U2fCode, U2fMsgIpc, UsbListenerRegistration}; -use cram_hal_service::api::KeyMap; +use cramium_api::keyboard::KeyMap; use cramium_hal::axp2101::VbusIrq; use cramium_hal::usb::driver::{CorigineUsb, CorigineWrapper}; use hw::CramiumUsb; @@ -71,7 +71,7 @@ pub(crate) fn main_hw() -> ! { let serial_number = format!("TODO!!"); // implement in cramium-hal once we have a serial number API let native_kbd = - cram_hal_service::keyboard::Keyboard::new(&xns).expect("couldn't connect to keyboard service"); + cramium_api::keyboard::Keyboard::new(&xns).expect("couldn't connect to keyboard service"); let usb_mapping = xous::syscall::map_memory( xous::MemoryAddress::new(cramium_hal::usb::utra::CORIGINE_USB_BASE), @@ -237,7 +237,7 @@ pub(crate) fn main_hw() -> ! { }); log::info!("Registering PMIC handler to detect USB plug/unplug events"); - let iox = cram_hal_service::iox_lib::IoxHal::new(); + let iox = cramium_api::IoxHal::new(); cramium_hal::board::setup_pmic_irq( &iox, api::SERVER_NAME_USB_DEVICE, diff --git a/services/usb-cramium/src/main_hosted.rs b/services/usb-bao1x/src/main_hosted.rs similarity index 100% rename from services/usb-cramium/src/main_hosted.rs rename to services/usb-bao1x/src/main_hosted.rs diff --git a/services/usb-cramium/src/mappings.rs b/services/usb-bao1x/src/mappings.rs similarity index 100% rename from services/usb-cramium/src/mappings.rs rename to services/usb-bao1x/src/mappings.rs