mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
layer in the HID keyboard drivers
This commit is contained in:
parent
aede037e09
commit
8310d64de9
4 changed files with 211 additions and 93 deletions
|
|
@ -20,7 +20,8 @@ bitfield = "0.13.2"
|
||||||
vcell = "0.1.3"
|
vcell = "0.1.3"
|
||||||
|
|
||||||
usb-device = "0.2.8"
|
usb-device = "0.2.8"
|
||||||
usbd-hid-device = "0.1.1"
|
usbd-human-interface-device = "0.1.1"
|
||||||
|
embedded-time = "0.12.1" # required by the keyboard interface
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
rand = "0.7.3"
|
rand = "0.7.3"
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,6 @@ pub(crate) const SERVER_NAME_USBTEST: &'static str = "_USB test and development
|
||||||
pub(crate) enum Opcode {
|
pub(crate) enum Opcode {
|
||||||
/// Handle the USB interrupt
|
/// Handle the USB interrupt
|
||||||
UsbIrqHandler,
|
UsbIrqHandler,
|
||||||
/// Handle a USB reset - needed because the API doesn't allow mutability in the trait :-/
|
|
||||||
UsbReset,
|
|
||||||
/// Parse a commandlne
|
/// Parse a commandlne
|
||||||
DoCmd,
|
DoCmd,
|
||||||
/// Keyboard input
|
/// Keyboard input
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,9 @@ use crate::*;
|
||||||
use bitfield::bitfield;
|
use bitfield::bitfield;
|
||||||
use core::ops::{Deref, DerefMut};
|
use core::ops::{Deref, DerefMut};
|
||||||
use core::mem::size_of;
|
use core::mem::size_of;
|
||||||
|
use core::slice;
|
||||||
use core::sync::atomic::{AtomicPtr, Ordering, AtomicBool};
|
use core::sync::atomic::{AtomicPtr, Ordering, AtomicBool};
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
use usb_device::{class_prelude::*, Result, UsbDirection};
|
use usb_device::{class_prelude::*, Result, UsbDirection};
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
|
|
@ -211,7 +213,7 @@ fn handle_usb(_irq_no: usize, arg: *mut usize) {
|
||||||
let ep_code = regs.interrupts.endpoint() as u16;
|
let ep_code = regs.interrupts.endpoint() as u16;
|
||||||
regs.interrupts.clear_endpoint(ep_code as u32); // clear the interrupt bitmask
|
regs.interrupts.clear_endpoint(ep_code as u32); // clear the interrupt bitmask
|
||||||
let mut bit = 1;
|
let mut bit = 1;
|
||||||
for maybe_ep in usb.eps.iter() {
|
for maybe_ep in usb.eps.lock().unwrap().iter() {
|
||||||
if bit & ep_code != 0 {
|
if bit & ep_code != 0 {
|
||||||
if let Some(ep) = maybe_ep {
|
if let Some(ep) = maybe_ep {
|
||||||
// form a descriptor from the memory range assigned to the EP
|
// form a descriptor from the memory range assigned to the EP
|
||||||
|
|
@ -242,20 +244,54 @@ fn handle_usb(_irq_no: usize, arg: *mut usize) {
|
||||||
xous::Message::new_scalar(Opcode::UsbIrqHandler.to_usize().unwrap(), 0, 0, 0, 0)).ok();
|
xous::Message::new_scalar(Opcode::UsbIrqHandler.to_usize().unwrap(), 0, 0, 0, 0)).ok();
|
||||||
usb.csr.wo(utra::usbdev::EV_PENDING, pending);
|
usb.csr.wo(utra::usbdev::EV_PENDING, pending);
|
||||||
}
|
}
|
||||||
pub struct SpinalUsbDevice {
|
|
||||||
pub(crate) conn: CID,
|
pub struct SpinalUsbMgmt {
|
||||||
usb: xous::MemoryRange,
|
|
||||||
csr: AtomicCsr<u32>, // consider using VolatileCell and/or refactory AtomicCsr so it is non-mutable
|
csr: AtomicCsr<u32>, // consider using VolatileCell and/or refactory AtomicCsr so it is non-mutable
|
||||||
srmem: ManagedMem<{ utralib::generated::HW_USBDEV_MEM_LEN / core::mem::size_of::<u32>() }>,
|
srmem: ManagedMem<{ utralib::generated::HW_USBDEV_MEM_LEN / core::mem::size_of::<u32>() }>,
|
||||||
regs: AtomicPtr<SpinalUdcRegs>,
|
regs: AtomicPtr<SpinalUdcRegs>,
|
||||||
|
int_err: Arc::<AtomicBool>,
|
||||||
|
was_checked: Arc::<AtomicBool>,
|
||||||
|
}
|
||||||
|
impl SpinalUsbMgmt {
|
||||||
|
pub fn print_regs(&self) {
|
||||||
|
log::info!("control regs: {:x?}", self.regs);
|
||||||
|
}
|
||||||
|
pub fn connect_device_core(&mut self, state: bool) {
|
||||||
|
log::info!("previous state: {}", self.csr.rf(utra::usbdev::USBSELECT_USBSELECT));
|
||||||
|
if state {
|
||||||
|
log::info!("connecting USB device core");
|
||||||
|
self.csr.wfo(utra::usbdev::USBSELECT_USBSELECT, 1);
|
||||||
|
} else {
|
||||||
|
log::info!("connecting USB debug core");
|
||||||
|
self.csr.wfo(utra::usbdev::USBSELECT_USBSELECT, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn xous_suspend(&mut self) {
|
||||||
|
self.csr.wo(utra::usbdev::EV_PENDING, 0xFFFF_FFFF);
|
||||||
|
self.csr.wo(utra::usbdev::EV_ENABLE, 0x0);
|
||||||
|
self.srmem.suspend();
|
||||||
|
}
|
||||||
|
pub fn xous_resume(&mut self) {
|
||||||
|
self.srmem.resume();
|
||||||
|
let p = self.csr.r(utra::usbdev::EV_PENDING); // this has to be expanded out because AtomicPtr is potentially mutable on read
|
||||||
|
self.csr.wo(utra::usbdev::EV_PENDING, p); // clear in case it's pending for some reason
|
||||||
|
self.csr.wfo(utra::usbdev::EV_ENABLE_USB, 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub struct SpinalUsbDevice {
|
||||||
|
pub(crate) conn: CID,
|
||||||
|
usb: xous::MemoryRange,
|
||||||
|
csr_addr: u32,
|
||||||
|
csr: AtomicCsr<u32>, // consider using VolatileCell and/or refactory AtomicCsr so it is non-mutable
|
||||||
|
regs: AtomicPtr<SpinalUdcRegs>,
|
||||||
// 1:1 mapping of endpoint structures to offsets in the memory space for the actual ep storage
|
// 1:1 mapping of endpoint structures to offsets in the memory space for the actual ep storage
|
||||||
eps: [Option<SpinalUdcEndpoint>; NUM_ENDPOINTS],
|
eps: Arc::<Mutex::<[Option<SpinalUdcEndpoint>; NUM_ENDPOINTS]>>,
|
||||||
// structure to track space allocations within the memory space
|
// structure to track space allocations within the memory space
|
||||||
allocs: BTreeMap<u32, u32>, // key is offset, value is len
|
allocs: Arc::<Mutex::<BTreeMap<u32, u32>>>, // key is offset, value is len
|
||||||
tt: ticktimer_server::Ticktimer,
|
tt: ticktimer_server::Ticktimer,
|
||||||
poll_result: PollResult,
|
poll_result: PollResult,
|
||||||
int_err: AtomicBool,
|
int_err: Arc::<AtomicBool>,
|
||||||
was_checked: AtomicBool,
|
was_checked: Arc::<AtomicBool>,
|
||||||
}
|
}
|
||||||
impl SpinalUsbDevice {
|
impl SpinalUsbDevice {
|
||||||
pub fn new(sid: xous::SID) -> SpinalUsbDevice {
|
pub fn new(sid: xous::SID) -> SpinalUsbDevice {
|
||||||
|
|
@ -277,16 +313,16 @@ impl SpinalUsbDevice {
|
||||||
|
|
||||||
let mut usbdev = SpinalUsbDevice {
|
let mut usbdev = SpinalUsbDevice {
|
||||||
conn: xous::connect(sid).unwrap(),
|
conn: xous::connect(sid).unwrap(),
|
||||||
|
csr_addr: csr.as_ptr() as u32,
|
||||||
csr: AtomicCsr::new(csr.as_mut_ptr() as *mut u32),
|
csr: AtomicCsr::new(csr.as_mut_ptr() as *mut u32),
|
||||||
usb,
|
usb,
|
||||||
srmem: ManagedMem::new(usb),
|
|
||||||
// Safety: the offset of the register bank is defined as 0xFF00 from the base of the
|
// Safety: the offset of the register bank is defined as 0xFF00 from the base of the
|
||||||
// usb memory area. Mapping SpinalUdcRegs here is safe assuming the structure has
|
// usb memory area. Mapping SpinalUdcRegs here is safe assuming the structure has
|
||||||
// been correctly defined.
|
// been correctly defined.
|
||||||
regs: AtomicPtr::new(unsafe {
|
regs: AtomicPtr::new(unsafe {
|
||||||
(usb.as_mut_ptr().add(0xFF00) as *mut SpinalUdcRegs).as_mut().unwrap()
|
(usb.as_mut_ptr().add(0xFF00) as *mut SpinalUdcRegs).as_mut().unwrap()
|
||||||
}),
|
}),
|
||||||
eps: [
|
eps: Arc::new(Mutex::new([
|
||||||
// can't derive Copy on this, and also can't make a Default.
|
// can't derive Copy on this, and also can't make a Default.
|
||||||
// But # of eps is pretty damn static even though notionally we
|
// But # of eps is pretty damn static even though notionally we
|
||||||
// use a NUM_ENDPOINTS to represent the value for readability, so, write it out long-form.
|
// use a NUM_ENDPOINTS to represent the value for readability, so, write it out long-form.
|
||||||
|
|
@ -294,12 +330,12 @@ impl SpinalUsbDevice {
|
||||||
None, None, None, None,
|
None, None, None, None,
|
||||||
None, None, None, None,
|
None, None, None, None,
|
||||||
None, None, None, None,
|
None, None, None, None,
|
||||||
],
|
])),
|
||||||
allocs: BTreeMap::new(),
|
allocs: Arc::new(Mutex::new(BTreeMap::new())),
|
||||||
tt: ticktimer_server::Ticktimer::new().unwrap(),
|
tt: ticktimer_server::Ticktimer::new().unwrap(),
|
||||||
poll_result: PollResult::None,
|
poll_result: PollResult::None,
|
||||||
int_err: AtomicBool::new(false),
|
int_err: Arc::new(AtomicBool::new(false)),
|
||||||
was_checked: AtomicBool::new(false),
|
was_checked: Arc::new(AtomicBool::new(false)),
|
||||||
};
|
};
|
||||||
|
|
||||||
xous::claim_interrupt(
|
xous::claim_interrupt(
|
||||||
|
|
@ -318,9 +354,16 @@ impl SpinalUsbDevice {
|
||||||
|
|
||||||
usbdev
|
usbdev
|
||||||
}
|
}
|
||||||
pub fn print_regs(&self) {
|
pub fn get_iface(&self) -> SpinalUsbMgmt {
|
||||||
log::info!("control regs: {:x?}", self.regs);
|
SpinalUsbMgmt {
|
||||||
self.print_poll_result();
|
csr: AtomicCsr::new(self.csr_addr as *mut u32),
|
||||||
|
srmem: ManagedMem::new(self.usb),
|
||||||
|
regs: AtomicPtr::new(unsafe {
|
||||||
|
(self.usb.as_mut_ptr().add(0xFF00) as *mut SpinalUdcRegs).as_mut().unwrap()
|
||||||
|
}),
|
||||||
|
int_err: self.int_err.clone(),
|
||||||
|
was_checked: self.was_checked.clone(),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
fn print_poll_result(&self) {
|
fn print_poll_result(&self) {
|
||||||
if self.int_err.load(Ordering::SeqCst) {
|
if self.int_err.load(Ordering::SeqCst) {
|
||||||
|
|
@ -341,58 +384,11 @@ impl SpinalUsbDevice {
|
||||||
/// 4 before being put into a SpinalHDL descriptor (it uses 16-byte alignment and thus
|
/// 4 before being put into a SpinalHDL descriptor (it uses 16-byte alignment and thus
|
||||||
/// discards the lower 4 bits).
|
/// discards the lower 4 bits).
|
||||||
pub fn alloc_region(&mut self, requested: u32) -> Option<u32> {
|
pub fn alloc_region(&mut self, requested: u32) -> Option<u32> {
|
||||||
alloc_inner(&mut self.allocs, requested)
|
alloc_inner(&mut self.allocs.lock().unwrap(), requested)
|
||||||
}
|
}
|
||||||
/// returns `true` if the region was available to be deallocated
|
/// returns `true` if the region was available to be deallocated
|
||||||
pub fn dealloc_region(&mut self, offset: u32) -> bool {
|
pub fn dealloc_region(&mut self, offset: u32) -> bool {
|
||||||
dealloc_inner(&mut self.allocs, offset)
|
dealloc_inner(&mut self.allocs.lock().unwrap(), offset)
|
||||||
}
|
|
||||||
|
|
||||||
pub fn reset_eps(&mut self) {
|
|
||||||
let regs = unsafe{self.regs.load(Ordering::SeqCst).as_mut().unwrap()};
|
|
||||||
// clear the endpoint RAM
|
|
||||||
self.eps = [
|
|
||||||
None, None, None, None,
|
|
||||||
None, None, None, None,
|
|
||||||
None, None, None, None,
|
|
||||||
None, None, None, None,
|
|
||||||
];
|
|
||||||
self.allocs.clear();
|
|
||||||
// set the RAM from 0x0-0xFF00 to all 0's
|
|
||||||
let usbmem = self.usb.as_slice_mut::<u32>();
|
|
||||||
for m in usbmem.iter_mut() {
|
|
||||||
*m = 0;
|
|
||||||
}
|
|
||||||
// clear all the interrupts in a single write
|
|
||||||
regs.interrupts.0 = 0xFFFF_FFFF;
|
|
||||||
|
|
||||||
// clear other registers
|
|
||||||
regs.address = 0;
|
|
||||||
|
|
||||||
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn connect_device_core(&mut self, state: bool) {
|
|
||||||
log::info!("previous state: {}", self.csr.rf(utra::usbdev::USBSELECT_USBSELECT));
|
|
||||||
if state {
|
|
||||||
log::info!("connecting USB device core");
|
|
||||||
self.csr.wfo(utra::usbdev::USBSELECT_USBSELECT, 1);
|
|
||||||
} else {
|
|
||||||
log::info!("connecting USB debug core");
|
|
||||||
self.csr.wfo(utra::usbdev::USBSELECT_USBSELECT, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn xous_suspend(&mut self) {
|
|
||||||
self.csr.wo(utra::usbdev::EV_PENDING, 0xFFFF_FFFF);
|
|
||||||
self.csr.wo(utra::usbdev::EV_ENABLE, 0x0);
|
|
||||||
self.srmem.suspend();
|
|
||||||
}
|
|
||||||
pub fn xous_resume(&mut self) {
|
|
||||||
self.srmem.resume();
|
|
||||||
let p = self.csr.r(utra::usbdev::EV_PENDING); // this has to be expanded out because AtomicPtr is potentially mutable on read
|
|
||||||
self.csr.wo(utra::usbdev::EV_PENDING, p); // clear in case it's pending for some reason
|
|
||||||
self.csr.wfo(utra::usbdev::EV_ENABLE_USB, 1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -429,7 +425,7 @@ impl UsbBus for SpinalUsbDevice {
|
||||||
// note that ep_addr is a packed representation of index and direction,
|
// note that ep_addr is a packed representation of index and direction,
|
||||||
// so you must use `.index()` to get just the index part
|
// so you must use `.index()` to get just the index part
|
||||||
for index in ep_addr.map(|a| a.index()..a.index() + 1).unwrap_or(1..NUM_ENDPOINTS) {
|
for index in ep_addr.map(|a| a.index()..a.index() + 1).unwrap_or(1..NUM_ENDPOINTS) {
|
||||||
if self.eps[index].is_some() {
|
if self.eps.lock().unwrap()[index].is_some() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// only if there is memory that can accommodate the max_packet_size
|
// only if there is memory that can accommodate the max_packet_size
|
||||||
|
|
@ -451,7 +447,7 @@ impl UsbBus for SpinalUsbDevice {
|
||||||
ep.ep_status.set_max_packet_size(max_packet_size as u32);
|
ep.ep_status.set_max_packet_size(max_packet_size as u32);
|
||||||
ep.ep_status.set_enable(true); // set the enable as the last op
|
ep.ep_status.set_enable(true); // set the enable as the last op
|
||||||
|
|
||||||
self.eps[index] = Some(ep);
|
self.eps.lock().unwrap()[index] = Some(ep);
|
||||||
return Ok(EndpointAddress::from_parts(index as usize, ep_dir))
|
return Ok(EndpointAddress::from_parts(index as usize, ep_dir))
|
||||||
} else {
|
} else {
|
||||||
return Err(UsbError::EndpointMemoryOverflow);
|
return Err(UsbError::EndpointMemoryOverflow);
|
||||||
|
|
@ -486,11 +482,24 @@ impl UsbBus for SpinalUsbDevice {
|
||||||
/// enumeration, as well as ensure that all endpoints previously allocated with alloc_ep are
|
/// enumeration, as well as ensure that all endpoints previously allocated with alloc_ep are
|
||||||
/// initialized as specified.
|
/// initialized as specified.
|
||||||
fn reset(&self) {
|
fn reset(&self) {
|
||||||
// we use a "cheater message" here because our implementation requires mutating
|
let regs = unsafe{self.regs.load(Ordering::SeqCst).as_mut().unwrap()};
|
||||||
// the state of Self, but the method signature on the trait does not permit it.
|
// clear the endpoint RAM
|
||||||
xous::send_message(self.conn,
|
for ep in self.eps.lock().unwrap().iter_mut() {
|
||||||
Message::new_blocking_scalar(Opcode::UsbReset.to_usize().unwrap(), 0, 0, 0, 0)
|
*ep = None;
|
||||||
).unwrap();
|
}
|
||||||
|
self.allocs.lock().unwrap().clear();
|
||||||
|
// set the RAM from 0x0-0xFF00 to all 0's
|
||||||
|
let usbmem = unsafe{slice::from_raw_parts_mut(self.usb.as_mut_ptr(), 0xFF00)};
|
||||||
|
for m in usbmem.iter_mut() {
|
||||||
|
*m = 0;
|
||||||
|
}
|
||||||
|
// clear all the interrupts in a single write
|
||||||
|
regs.interrupts.0 = 0xFFFF_FFFF;
|
||||||
|
|
||||||
|
// clear other registers
|
||||||
|
regs.address = 0;
|
||||||
|
|
||||||
|
core::sync::atomic::compiler_fence(core::sync::atomic::Ordering::SeqCst);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets the device USB address to `addr`.
|
/// Sets the device USB address to `addr`.
|
||||||
|
|
@ -518,7 +527,32 @@ impl UsbBus for SpinalUsbDevice {
|
||||||
///
|
///
|
||||||
/// Implementations may also return other errors if applicable.
|
/// Implementations may also return other errors if applicable.
|
||||||
fn write(&self, ep_addr: EndpointAddress, buf: &[u8]) -> Result<usize> {
|
fn write(&self, ep_addr: EndpointAddress, buf: &[u8]) -> Result<usize> {
|
||||||
Err(UsbError::Unsupported)
|
if let Some(ep) = &self.eps.lock().unwrap()[ep_addr.index()] {
|
||||||
|
if buf.len() > ep.ep_status.max_packet_size() as usize {
|
||||||
|
Err(UsbError::BufferOverflow)
|
||||||
|
} else {
|
||||||
|
let base = self.usb.as_mut_ptr();
|
||||||
|
let descriptor = unsafe {
|
||||||
|
(base.add(ep.ep_status.head_offset() as usize * 16) as *mut SpinalUdcDescriptorHeader).as_mut().unwrap()
|
||||||
|
};
|
||||||
|
descriptor.d0.set_offset(0);
|
||||||
|
descriptor.d1.set_next_offset(0);
|
||||||
|
descriptor.d1.set_length(buf.len() as u32);
|
||||||
|
descriptor.d2.set_direction(DESC_OUT);
|
||||||
|
descriptor.d2.set_int_on_done(true);
|
||||||
|
let data = unsafe {
|
||||||
|
slice::from_raw_parts_mut(
|
||||||
|
base.add(ep.ep_status.head_offset() as usize * 16 + size_of::<SpinalUdcDescriptorHeader>()),
|
||||||
|
ep.ep_status.max_packet_size() as usize
|
||||||
|
)};
|
||||||
|
for (&src, dst) in buf.iter().zip(data.iter_mut()) {
|
||||||
|
*dst = src;
|
||||||
|
}
|
||||||
|
Ok(buf.len())
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Err(UsbError::InvalidEndpoint)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Reads a single packet of data from the specified endpoint and returns the actual length of
|
/// Reads a single packet of data from the specified endpoint and returns the actual length of
|
||||||
|
|
@ -540,7 +574,34 @@ impl UsbBus for SpinalUsbDevice {
|
||||||
///
|
///
|
||||||
/// Implementations may also return other errors if applicable.
|
/// Implementations may also return other errors if applicable.
|
||||||
fn read(&self, ep_addr: EndpointAddress, buf: &mut [u8]) -> Result<usize> {
|
fn read(&self, ep_addr: EndpointAddress, buf: &mut [u8]) -> Result<usize> {
|
||||||
Err(UsbError::Unsupported)
|
if let Some(ep) = &self.eps.lock().unwrap()[ep_addr.index()] {
|
||||||
|
let base = self.usb.as_mut_ptr();
|
||||||
|
let descriptor = unsafe {
|
||||||
|
(base.add(ep.ep_status.head_offset() as usize * 16) as *mut SpinalUdcDescriptorHeader).as_mut().unwrap()
|
||||||
|
};
|
||||||
|
if descriptor.d0.code() == 0xF {
|
||||||
|
log::info!("read called but descriptor was in progress")
|
||||||
|
}
|
||||||
|
descriptor.d1.set_next_offset(0);
|
||||||
|
descriptor.d2.set_direction(DESC_IN);
|
||||||
|
descriptor.d2.set_int_on_done(true);
|
||||||
|
let len = descriptor.d0.offset() as usize;
|
||||||
|
if len > buf.len() {
|
||||||
|
Err(UsbError::BufferOverflow)
|
||||||
|
} else {
|
||||||
|
let data = unsafe {
|
||||||
|
slice::from_raw_parts_mut(
|
||||||
|
base.add(ep.ep_status.head_offset() as usize * 16 + size_of::<SpinalUdcDescriptorHeader>()),
|
||||||
|
ep.ep_status.max_packet_size() as usize
|
||||||
|
)};
|
||||||
|
for (&src, dst) in data[..len].iter().zip(buf.iter_mut()) {
|
||||||
|
*dst = src;
|
||||||
|
}
|
||||||
|
Ok(len)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Err(UsbError::InvalidEndpoint)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets or clears the STALL condition for an endpoint. If the endpoint is an OUT endpoint, it
|
/// Sets or clears the STALL condition for an endpoint. If the endpoint is an OUT endpoint, it
|
||||||
|
|
@ -580,11 +641,13 @@ impl UsbBus for SpinalUsbDevice {
|
||||||
/// continue be polled, and it shall return a value other than `Suspend` from `poll` when it no
|
/// continue be polled, and it shall return a value other than `Suspend` from `poll` when it no
|
||||||
/// longer detects the suspend condition.
|
/// longer detects the suspend condition.
|
||||||
fn suspend(&self) {
|
fn suspend(&self) {
|
||||||
|
unimplemented!(); // TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Resumes from suspend mode. This may only be called after the peripheral has been previously
|
/// Resumes from suspend mode. This may only be called after the peripheral has been previously
|
||||||
/// suspended.
|
/// suspended.
|
||||||
fn resume(&self) {
|
fn resume(&self) {
|
||||||
|
unimplemented!(); // TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Gets information about events and incoming data. Usually called in a loop or from an
|
/// Gets information about events and incoming data. Usually called in a loop or from an
|
||||||
|
|
@ -594,6 +657,7 @@ impl UsbBus for SpinalUsbDevice {
|
||||||
log::warn!("interrupt triggered twice before handler got to it; an event was lost");
|
log::warn!("interrupt triggered twice before handler got to it; an event was lost");
|
||||||
}
|
}
|
||||||
self.was_checked.store(true, Ordering::SeqCst);
|
self.was_checked.store(true, Ordering::SeqCst);
|
||||||
|
self.print_poll_result();
|
||||||
// because the library type does not implement Copy or Clone
|
// because the library type does not implement Copy or Clone
|
||||||
match self.poll_result {
|
match self.poll_result {
|
||||||
PollResult::None => PollResult::None,
|
PollResult::None => PollResult::None,
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,32 @@ use num_traits::*;
|
||||||
use xous::{CID, msg_scalar_unpack, Message, send_message};
|
use xous::{CID, msg_scalar_unpack, Message, send_message};
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
|
use usb_device::prelude::*;
|
||||||
|
use usb_device::class_prelude::*;
|
||||||
|
use usbd_human_interface_device::page::Keyboard;
|
||||||
|
use usbd_human_interface_device::device::keyboard::{KeyboardLedsReport, NKROBootKeyboardInterface};
|
||||||
|
use usbd_human_interface_device::prelude::*;
|
||||||
|
use embedded_time::Clock;
|
||||||
|
use std::convert::TryInto;
|
||||||
|
|
||||||
|
pub struct EmbeddedClock {
|
||||||
|
start: std::time::Instant,
|
||||||
|
}
|
||||||
|
impl EmbeddedClock {
|
||||||
|
pub fn new() -> EmbeddedClock {
|
||||||
|
EmbeddedClock { start: std::time::Instant::now() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Clock for EmbeddedClock {
|
||||||
|
type T = u64;
|
||||||
|
const SCALING_FACTOR: embedded_time::fraction::Fraction = <embedded_time::fraction::Fraction>::new(1, 1_000);
|
||||||
|
|
||||||
|
fn try_now(&self) -> Result<embedded_time::Instant<Self>, embedded_time::clock::Error> {
|
||||||
|
Ok(embedded_time::Instant::new(self.start.elapsed().as_millis().try_into().unwrap()))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[xous::xous_main]
|
#[xous::xous_main]
|
||||||
fn xmain() -> ! {
|
fn xmain() -> ! {
|
||||||
use crate::SpinalUsbDevice;
|
use crate::SpinalUsbDevice;
|
||||||
|
|
@ -34,8 +60,14 @@ fn xmain() -> ! {
|
||||||
let usbdev_sid = xns.register_name(api::SERVER_NAME_USBTEST, None).expect("can't register server");
|
let usbdev_sid = xns.register_name(api::SERVER_NAME_USBTEST, None).expect("can't register server");
|
||||||
log::trace!("registered with NS -- {:?}", usbdev_sid);
|
log::trace!("registered with NS -- {:?}", usbdev_sid);
|
||||||
|
|
||||||
let mut usbdev = SpinalUsbDevice::new(usbdev_sid);
|
let usbdev = SpinalUsbDevice::new(usbdev_sid);
|
||||||
let mut kbd = Keyboard::new(usbdev_sid);
|
let mut usbmgmt = usbdev.get_iface();
|
||||||
|
let mut kbd = crate::kbd::Keyboard::new(usbdev_sid);
|
||||||
|
let tt = ticktimer_server::Ticktimer::new().unwrap();
|
||||||
|
log::info!("connecting device core");
|
||||||
|
usbmgmt.connect_device_core(true);
|
||||||
|
tt.sleep_ms(500).unwrap();
|
||||||
|
log::info!("devcore connected");
|
||||||
|
|
||||||
log::trace!("ready to accept requests");
|
log::trace!("ready to accept requests");
|
||||||
|
|
||||||
|
|
@ -60,24 +92,44 @@ fn xmain() -> ! {
|
||||||
cid
|
cid
|
||||||
).expect("couldn't create suspend/resume object");
|
).expect("couldn't create suspend/resume object");
|
||||||
|
|
||||||
|
let usb_alloc = UsbBusAllocator::new(usbdev);
|
||||||
|
|
||||||
|
let clock = EmbeddedClock::new();
|
||||||
|
let mut keyboard = UsbHidClassBuilder::new()
|
||||||
|
.add_interface(
|
||||||
|
NKROBootKeyboardInterface::default_config(&clock),
|
||||||
|
)
|
||||||
|
.build(&usb_alloc);
|
||||||
|
|
||||||
|
let mut usb_dev = UsbDeviceBuilder::new(&usb_alloc, UsbVidPid(0x1209, 0x0001))
|
||||||
|
.manufacturer("usbd-human-interface-device")
|
||||||
|
.product("NKRO Keyboard")
|
||||||
|
.serial_number("PRECURSOR")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
|
||||||
let mut cmdline = String::new();
|
let mut cmdline = String::new();
|
||||||
loop {
|
loop {
|
||||||
let msg = xous::receive_message(usbdev_sid).unwrap();
|
let msg = xous::receive_message(usbdev_sid).unwrap();
|
||||||
match FromPrimitive::from_usize(msg.body.id()) {
|
match FromPrimitive::from_usize(msg.body.id()) {
|
||||||
Some(Opcode::SuspendResume) => xous::msg_scalar_unpack!(msg, token, _, _, _, {
|
Some(Opcode::SuspendResume) => xous::msg_scalar_unpack!(msg, token, _, _, _, {
|
||||||
kbd.suspend();
|
kbd.suspend();
|
||||||
usbdev.xous_suspend();
|
usbmgmt.xous_suspend();
|
||||||
susres.suspend_until_resume(token).expect("couldn't execute suspend/resume");
|
susres.suspend_until_resume(token).expect("couldn't execute suspend/resume");
|
||||||
kbd.resume();
|
kbd.resume();
|
||||||
usbdev.xous_resume();
|
usbmgmt.xous_resume();
|
||||||
}),
|
}),
|
||||||
Some(Opcode::UsbIrqHandler) => {
|
Some(Opcode::UsbIrqHandler) => {
|
||||||
log::info!("got USB interrupt");
|
log::info!("got USB interrupt");
|
||||||
usbdev.print_regs();
|
usbmgmt.print_regs();
|
||||||
|
if usb_dev.poll(&mut [&mut keyboard]) {
|
||||||
|
match keyboard.interface().read_report() {
|
||||||
|
Ok(l) => {
|
||||||
|
log::info!("got led state {:?}", l);
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Some(Opcode::UsbReset) => {
|
|
||||||
usbdev.reset_eps();
|
|
||||||
xous::return_scalar(msg.sender, 0).unwrap();
|
|
||||||
}
|
}
|
||||||
Some(Opcode::DoCmd) => {
|
Some(Opcode::DoCmd) => {
|
||||||
log::info!("got command line: {}", cmdline);
|
log::info!("got command line: {}", cmdline);
|
||||||
|
|
@ -90,16 +142,16 @@ fn xmain() -> ! {
|
||||||
"conn" => {
|
"conn" => {
|
||||||
match args {
|
match args {
|
||||||
"1" => {
|
"1" => {
|
||||||
usbdev.connect_device_core(true);
|
usbmgmt.connect_device_core(true);
|
||||||
log::info!("device core connected");
|
log::info!("device core connected");
|
||||||
},
|
},
|
||||||
"0" => {
|
"0" => {
|
||||||
usbdev.connect_device_core(false);
|
usbmgmt.connect_device_core(false);
|
||||||
log::info!("debug core connected");
|
log::info!("debug core connected");
|
||||||
},
|
},
|
||||||
_ => log::info!("usage: conn [1,0]; got: 'conn {}'", args),
|
_ => log::info!("usage: conn [1,0]; got: 'conn {}'", args),
|
||||||
}
|
}
|
||||||
usbdev.print_regs();
|
usbmgmt.print_regs();
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
log::info!("unrecognized command {}", cmd);
|
log::info!("unrecognized command {}", cmd);
|
||||||
|
|
@ -112,12 +164,12 @@ fn xmain() -> ! {
|
||||||
log::info!("wouldn't that be nice...");
|
log::info!("wouldn't that be nice...");
|
||||||
}
|
}
|
||||||
"conn" => {
|
"conn" => {
|
||||||
usbdev.connect_device_core(true);
|
usbmgmt.connect_device_core(true);
|
||||||
log::info!("device core connected");
|
log::info!("device core connected");
|
||||||
usbdev.print_regs();
|
usbmgmt.print_regs();
|
||||||
}
|
}
|
||||||
"regs" => {
|
"regs" => {
|
||||||
usbdev.print_regs();
|
usbmgmt.print_regs();
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
log::info!("unrecognized command");
|
log::info!("unrecognized command");
|
||||||
|
|
@ -148,6 +200,9 @@ fn xmain() -> ! {
|
||||||
}),
|
}),
|
||||||
// this is via physical keyboard
|
// this is via physical keyboard
|
||||||
Some(Opcode::HandlerTrigger) => {
|
Some(Opcode::HandlerTrigger) => {
|
||||||
|
keyboard.interface().write_report(&[Keyboard::A]).ok(); // just for testing
|
||||||
|
keyboard.interface().tick().unwrap();
|
||||||
|
|
||||||
let rawstates = kbd.update();
|
let rawstates = kbd.update();
|
||||||
// interpret scancodes
|
// interpret scancodes
|
||||||
let kc: Vec<char> = kbd.track_keys(&rawstates);
|
let kc: Vec<char> = kbd.track_keys(&rawstates);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue