mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
rename usb-cramium to usb-bao1x
This commit is contained in:
parent
8e6c4161d6
commit
6cf4757323
8 changed files with 6 additions and 5 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
[package]
|
[package]
|
||||||
name = "usb-cramium"
|
name = "usb-bao1x"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
|
|
@ -19,6 +19,7 @@ cramium-hal = { path = "../../libs/cramium-hal", features = [
|
||||||
# "verbose-debug",
|
# "verbose-debug",
|
||||||
"axp2101",
|
"axp2101",
|
||||||
], optional = true }
|
], optional = true }
|
||||||
|
cramium-api = { path = "../../libs/cramium-api" }
|
||||||
cram-hal-service = { path = "../cram-hal-service", optional = true }
|
cram-hal-service = { path = "../cram-hal-service", optional = true }
|
||||||
cramium-emu = { path = "../cramium-emu", optional = true }
|
cramium-emu = { path = "../cramium-emu", optional = true }
|
||||||
xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branch = "main" }
|
xous-usb-hid = { git = "https://github.com/betrusted-io/xous-usb-hid.git", branch = "main" }
|
||||||
|
|
@ -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::driver::{CRG_UDC_ERDPLO_EHB, CorigineWrapper, EventTrbS};
|
||||||
use cramium_hal::usb::utra::*;
|
use cramium_hal::usb::utra::*;
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
use usb_cramium::HIDReport;
|
use usb_bao1x::HIDReport;
|
||||||
use usb_device::class_prelude::*;
|
use usb_device::class_prelude::*;
|
||||||
use usb_device::device::UsbDevice;
|
use usb_device::device::UsbDevice;
|
||||||
use usb_device::prelude::*;
|
use usb_device::prelude::*;
|
||||||
|
|
@ -15,7 +15,7 @@ use std::panic;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use api::{HIDReport, LogLevel, Opcode, U2fCode, U2fMsgIpc, UsbListenerRegistration};
|
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::axp2101::VbusIrq;
|
||||||
use cramium_hal::usb::driver::{CorigineUsb, CorigineWrapper};
|
use cramium_hal::usb::driver::{CorigineUsb, CorigineWrapper};
|
||||||
use hw::CramiumUsb;
|
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 serial_number = format!("TODO!!"); // implement in cramium-hal once we have a serial number API
|
||||||
|
|
||||||
let native_kbd =
|
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(
|
let usb_mapping = xous::syscall::map_memory(
|
||||||
xous::MemoryAddress::new(cramium_hal::usb::utra::CORIGINE_USB_BASE),
|
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");
|
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(
|
cramium_hal::board::setup_pmic_irq(
|
||||||
&iox,
|
&iox,
|
||||||
api::SERVER_NAME_USB_DEVICE,
|
api::SERVER_NAME_USB_DEVICE,
|
||||||
Loading…
Reference in a new issue