mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
apply deferred-init idiom to usb-test
This commit is contained in:
parent
501f7a4d5f
commit
3508dc44d9
2 changed files with 10 additions and 10 deletions
|
|
@ -140,7 +140,7 @@ impl SpinalUsbDevice {
|
|||
)
|
||||
.expect("couldn't map USB CSR range");
|
||||
|
||||
let mut usbdev = SpinalUsbDevice {
|
||||
SpinalUsbDevice {
|
||||
conn: xous::connect(sid).unwrap(),
|
||||
csr_addr: csr.as_ptr() as u32,
|
||||
csr: AtomicCsr::new(csr.as_mut_ptr() as *mut u32),
|
||||
|
|
@ -157,23 +157,22 @@ impl SpinalUsbDevice {
|
|||
allocs: Arc::new(Mutex::new(BTreeMap::new())),
|
||||
tt: ticktimer_server::Ticktimer::new().unwrap(),
|
||||
address: AtomicUsize::new(0),
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
pub fn init(&self) {
|
||||
xous::claim_interrupt(
|
||||
utra::usbdev::USBDEV_IRQ,
|
||||
handle_usb,
|
||||
(&mut usbdev) as *mut SpinalUsbDevice as *mut usize,
|
||||
self as *const SpinalUsbDevice as *mut usize,
|
||||
)
|
||||
.expect("couldn't claim irq");
|
||||
let p = usbdev.csr.r(utra::usbdev::EV_PENDING);
|
||||
usbdev.csr.wo(utra::usbdev::EV_PENDING, p); // clear in case it's pending for some reason
|
||||
usbdev.csr.wfo(utra::usbdev::EV_ENABLE_USB, 1);
|
||||
let p = self.csr.r(utra::usbdev::EV_PENDING);
|
||||
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);
|
||||
|
||||
let mut cfg = UdcConfig(0);
|
||||
cfg.set_pullup_on(true); // required for proper operation
|
||||
usbdev.regs.set_config(cfg);
|
||||
|
||||
usbdev
|
||||
self.regs.set_config(cfg);
|
||||
}
|
||||
pub fn get_iface(&self) -> SpinalUsbMgmt {
|
||||
SpinalUsbMgmt {
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ fn main() -> ! {
|
|||
log::trace!("registered with NS -- {:?}", usbdev_sid);
|
||||
|
||||
let usbdev = SpinalUsbDevice::new(usbdev_sid);
|
||||
usbdev.init();
|
||||
let mut usbmgmt = usbdev.get_iface();
|
||||
let mut kbd = kbd::Keyboard::new(usbdev_sid);
|
||||
let tt = ticktimer_server::Ticktimer::new().unwrap();
|
||||
|
|
|
|||
Loading…
Reference in a new issue