From 3508dc44d9910b9d657dda9cb3fdf30f15e2a6f7 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 16 Jul 2023 17:36:12 +0800 Subject: [PATCH] apply deferred-init idiom to usb-test --- services/usb-test/src/hw.rs | 19 +++++++++---------- services/usb-test/src/main.rs | 1 + 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/services/usb-test/src/hw.rs b/services/usb-test/src/hw.rs index cd40dfa8f..0ee28189d 100644 --- a/services/usb-test/src/hw.rs +++ b/services/usb-test/src/hw.rs @@ -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 { diff --git a/services/usb-test/src/main.rs b/services/usb-test/src/main.rs index ffad4e5ad..e6a3c456c 100644 --- a/services/usb-test/src/main.rs +++ b/services/usb-test/src/main.rs @@ -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();