mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
PoC USB serial on top of the HID modes.
this now works with windows, after much testing and patching.
This commit is contained in:
parent
ff499f7c09
commit
c47334704a
3 changed files with 38 additions and 16 deletions
|
|
@ -37,14 +37,18 @@ usb-device = { git = "https://github.com/betrusted-io/usb-device.git", branch =
|
||||||
"log",
|
"log",
|
||||||
"control-buffer-256",
|
"control-buffer-256",
|
||||||
] }
|
] }
|
||||||
|
# usb-device = { path = "../../../usb-device", features = [
|
||||||
|
# "log",
|
||||||
|
# "control-buffer-256",
|
||||||
|
# ] }
|
||||||
|
|
||||||
# Serial support
|
# Serial support
|
||||||
usbd-serial = { git = "https://github.com/betrusted-io/usbd-serial.git", branch = "v0.1.1-betrusted", features = [
|
usbd-serial = { git = "https://github.com/betrusted-io/usbd-serial.git", branch = "v0.1.1-betrusted", features = [
|
||||||
"max-packet-size-512",
|
"max-packet-size-512",
|
||||||
] }
|
] }
|
||||||
#usbd-serial = { path = "../../../usbd-serial", features = [
|
# usbd-serial = { path = "../../../usbd-serial", features = [
|
||||||
# "max-packet-size-512",
|
# "max-packet-size-512",
|
||||||
#] }
|
# ] }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
cramium-soc = []
|
cramium-soc = []
|
||||||
|
|
|
||||||
|
|
@ -128,13 +128,17 @@ pub(crate) fn composite_handler(_irq_no: usize, arg: *mut usize) {
|
||||||
if device.poll(&mut [class, serial as &mut dyn UsbClass<_>]) {
|
if device.poll(&mut [class, serial as &mut dyn UsbClass<_>]) {
|
||||||
let mut buf = [0u8; 512];
|
let mut buf = [0u8; 512];
|
||||||
if let Ok(count) = serial.read(&mut buf) {
|
if let Ok(count) = serial.read(&mut buf) {
|
||||||
crate::println!("serial read: {:x?}", &buf[..count]);
|
for &d in buf[..count].iter() {
|
||||||
if buf[0] == 'a' as u32 as u8 {
|
usb.serial_rx.push_back(d);
|
||||||
// echo back
|
|
||||||
// let wr_res = serial.write(b"boo!");
|
|
||||||
let wr_res = serial.write(&buf[..count]);
|
|
||||||
crate::println!("serial write: {:?}", wr_res);
|
|
||||||
}
|
}
|
||||||
|
// crate::println!("serial read: {:x?}", &buf[..count]);
|
||||||
|
|
||||||
|
// TODO: implement the actual Xous serial API instead of this stand-in routine
|
||||||
|
xous::try_send_message(
|
||||||
|
usb.conn,
|
||||||
|
Message::new_scalar(Opcode::SerialFlush.to_usize().unwrap(), 0, 0, 0, 0),
|
||||||
|
)
|
||||||
|
.ok();
|
||||||
}
|
}
|
||||||
match class.device::<NKROBootKeyboard<_>, _>().read_report() {
|
match class.device::<NKROBootKeyboard<_>, _>().read_report() {
|
||||||
Ok(l) => {
|
Ok(l) => {
|
||||||
|
|
@ -173,10 +177,6 @@ pub(crate) fn composite_handler(_irq_no: usize, arg: *mut usize) {
|
||||||
if hw_lock.udc_event.evt_dq_pt.load(Ordering::SeqCst)
|
if hw_lock.udc_event.evt_dq_pt.load(Ordering::SeqCst)
|
||||||
== hw_lock.udc_event.evt_seg0_last_trb.load(Ordering::SeqCst)
|
== hw_lock.udc_event.evt_seg0_last_trb.load(Ordering::SeqCst)
|
||||||
{
|
{
|
||||||
crate::println!(
|
|
||||||
" evt_last_trb {:x}",
|
|
||||||
hw_lock.udc_event.evt_seg0_last_trb.load(Ordering::SeqCst) as usize
|
|
||||||
);
|
|
||||||
hw_lock.udc_event.ccs = !hw_lock.udc_event.ccs;
|
hw_lock.udc_event.ccs = !hw_lock.udc_event.ccs;
|
||||||
// does this...go to null to end the transfer??
|
// does this...go to null to end the transfer??
|
||||||
hw_lock.udc_event.evt_dq_pt = AtomicPtr::new(
|
hw_lock.udc_event.evt_dq_pt = AtomicPtr::new(
|
||||||
|
|
@ -249,6 +249,7 @@ pub struct CramiumUsb<'a> {
|
||||||
// storage for hid_packets to expatriate from the interrupt handler
|
// storage for hid_packets to expatriate from the interrupt handler
|
||||||
pub hid_packet: Option<[u8; 64]>,
|
pub hid_packet: Option<[u8; 64]>,
|
||||||
pub serial_port: SerialPort<'a, CorigineWrapper, [u8; 1024], [u8; 1024]>,
|
pub serial_port: SerialPort<'a, CorigineWrapper, [u8; 1024], [u8; 1024]>,
|
||||||
|
pub serial_rx: VecDeque<u8>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> CramiumUsb<'a> {
|
impl<'a> CramiumUsb<'a> {
|
||||||
|
|
@ -270,14 +271,24 @@ impl<'a> CramiumUsb<'a> {
|
||||||
let rx_buf = [0u8; 1024];
|
let rx_buf = [0u8; 1024];
|
||||||
let tx_buf = [0u8; 1024];
|
let tx_buf = [0u8; 1024];
|
||||||
let serial_port = SerialPort::new_with_store(&usb_alloc, rx_buf, tx_buf);
|
let serial_port = SerialPort::new_with_store(&usb_alloc, rx_buf, tx_buf);
|
||||||
|
// HACK ALERT: due to a shortcoming in the usb-device implementation, inside the interrupt handler we
|
||||||
|
// have to catch and parse SETUP-OUT sequences. Basically the driver assumes that the OUT endpoint is
|
||||||
|
// always configured to trigger, but in our stack every time we have an OUT on EP0, we have to
|
||||||
|
// set it up with the correct length. See the "TrbType::SetupPkt" arm of handle_event_inner()
|
||||||
|
// for more details.
|
||||||
|
//
|
||||||
|
// In particular, Mass Storage has to handle a similar situation, so if adding a mass storage
|
||||||
|
// interface, this hack has to be dealt with (and btw, there are not enough endpoints availbale
|
||||||
|
// to concurrently add that in - you have to kick out one of the interfaces above to add mass
|
||||||
|
// storage!)
|
||||||
|
|
||||||
let device = UsbDeviceBuilder::new(&usb_alloc, UsbVidPid(0x1209, 0x3613))
|
let device = UsbDeviceBuilder::new(&usb_alloc, UsbVidPid(0x1209, 0x3613))
|
||||||
.manufacturer("Kosagi")
|
.manufacturer("Baochip")
|
||||||
.product("Precursor")
|
.product("Baosec")
|
||||||
.serial_number(&serial_number)
|
.serial_number(&serial_number)
|
||||||
// this is *required* by the corigine stack
|
// this is *required* by the corigine stack
|
||||||
.max_packet_size_0(64)
|
.max_packet_size_0(64)
|
||||||
.device_class(0)
|
.composite_with_iads()
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
CramiumUsb {
|
CramiumUsb {
|
||||||
|
|
@ -293,6 +304,7 @@ impl<'a> CramiumUsb<'a> {
|
||||||
irq_req: None,
|
irq_req: None,
|
||||||
hid_packet: None,
|
hid_packet: None,
|
||||||
serial_port,
|
serial_port,
|
||||||
|
serial_rx: VecDeque::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -525,6 +525,12 @@ pub(crate) fn main_hw() -> ! {
|
||||||
LogLevel::Err => log::set_max_level(log::LevelFilter::Error),
|
LogLevel::Err => log::set_max_level(log::LevelFilter::Error),
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
Opcode::SerialFlush => {
|
||||||
|
// temporary code
|
||||||
|
let all_items: Vec<u8> = cu.serial_rx.drain(..).collect();
|
||||||
|
log::info!("received: {:x?}", all_items); // echo back
|
||||||
|
let _ = cu.serial_port.write(&all_items);
|
||||||
|
}
|
||||||
Opcode::InvalidCall => {
|
Opcode::InvalidCall => {
|
||||||
log::warn!("Illegal opcode received {:?}", msg);
|
log::warn!("Illegal opcode received {:?}", msg);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue