apply deferred-init idiom to usb-test

This commit is contained in:
bunnie 2023-07-16 17:36:12 +08:00
parent 501f7a4d5f
commit 3508dc44d9
2 changed files with 10 additions and 10 deletions

View file

@ -140,7 +140,7 @@ impl SpinalUsbDevice {
) )
.expect("couldn't map USB CSR range"); .expect("couldn't map USB CSR range");
let mut usbdev = SpinalUsbDevice { SpinalUsbDevice {
conn: xous::connect(sid).unwrap(), conn: xous::connect(sid).unwrap(),
csr_addr: csr.as_ptr() as u32, 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),
@ -157,23 +157,22 @@ impl SpinalUsbDevice {
allocs: Arc::new(Mutex::new(BTreeMap::new())), allocs: Arc::new(Mutex::new(BTreeMap::new())),
tt: ticktimer_server::Ticktimer::new().unwrap(), tt: ticktimer_server::Ticktimer::new().unwrap(),
address: AtomicUsize::new(0), address: AtomicUsize::new(0),
}; }
}
pub fn init(&self) {
xous::claim_interrupt( xous::claim_interrupt(
utra::usbdev::USBDEV_IRQ, utra::usbdev::USBDEV_IRQ,
handle_usb, handle_usb,
(&mut usbdev) as *mut SpinalUsbDevice as *mut usize, self as *const SpinalUsbDevice as *mut usize,
) )
.expect("couldn't claim irq"); .expect("couldn't claim irq");
let p = usbdev.csr.r(utra::usbdev::EV_PENDING); let p = self.csr.r(utra::usbdev::EV_PENDING);
usbdev.csr.wo(utra::usbdev::EV_PENDING, p); // clear in case it's pending for some reason self.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); self.csr.wfo(utra::usbdev::EV_ENABLE_USB, 1);
let mut cfg = UdcConfig(0); let mut cfg = UdcConfig(0);
cfg.set_pullup_on(true); // required for proper operation cfg.set_pullup_on(true); // required for proper operation
usbdev.regs.set_config(cfg); self.regs.set_config(cfg);
usbdev
} }
pub fn get_iface(&self) -> SpinalUsbMgmt { pub fn get_iface(&self) -> SpinalUsbMgmt {
SpinalUsbMgmt { SpinalUsbMgmt {

View file

@ -62,6 +62,7 @@ fn main() -> ! {
log::trace!("registered with NS -- {:?}", usbdev_sid); log::trace!("registered with NS -- {:?}", usbdev_sid);
let usbdev = SpinalUsbDevice::new(usbdev_sid); let usbdev = SpinalUsbDevice::new(usbdev_sid);
usbdev.init();
let mut usbmgmt = usbdev.get_iface(); let mut usbmgmt = usbdev.get_iface();
let mut kbd = kbd::Keyboard::new(usbdev_sid); let mut kbd = kbd::Keyboard::new(usbdev_sid);
let tt = ticktimer_server::Ticktimer::new().unwrap(); let tt = ticktimer_server::Ticktimer::new().unwrap();