Update to use critical_section crate.

Cargo.toml

@@ -10,14 +10,13 @@ readme = "README.md"
 keywords = ["no-std", "embedded", "usb"]
 
 [dependencies]
-riscv = { version = "0.6.0", optional = true }
-cortex-m = { version = "0.7.0", optional = true }
+critical-section = "1.0"
 embedded-hal = "0.2.4"
 vcell = "0.1.0"
 usb-device = "0.2.3"
 
 [package.metadata.docs.rs]
-features = ['cortex-m', 'fs']
+features = ['fs']
 
 [features]
 hs = []

src/bus.rs

@@ -1,13 +1,13 @@
 use core::marker::PhantomData;
+use critical_section::{Mutex, CriticalSection};
 use embedded_hal::blocking::delay::DelayMs;
 use usb_device::{Result, UsbDirection, UsbError};
 use usb_device::bus::{UsbBusAllocator, PollResult};
 use usb_device::endpoint::{EndpointType, EndpointAddress};
+
 use crate::transition::{EndpointConfig, EndpointDescriptor};
 use crate::ral::{read_reg, write_reg, modify_reg, otg_global, otg_device, otg_pwrclk, otg_global_dieptxfx};
-
 use crate::target::UsbRegisters;
-use crate::target::interrupt::{self, Mutex, CriticalSection};
 use crate::endpoint::{EndpointIn, EndpointOut};
 use crate::endpoint_memory::{EndpointMemoryAllocator, EndpointBufferState};
 use crate::{UsbPeripheral, PhyType};
@@ -35,7 +35,7 @@ impl<USB: UsbPeripheral> UsbBus<USB> {
         self.peripheral
     }
 
-    fn configure_all(&self, cs: &CriticalSection) {
+    fn configure_all(&self, cs: CriticalSection<'_>) {
         let regs = self.regs.borrow(cs);
 
         // Rx FIFO
@@ -108,7 +108,7 @@ impl<USB: UsbPeripheral> UsbBus<USB> {
         }
     }
 
-    fn deconfigure_all(&self, cs: &CriticalSection) {
+    fn deconfigure_all(&self, cs: CriticalSection<'_>) {
         let regs = self.regs.borrow(cs);
 
         // disable interrupts
@@ -128,7 +128,7 @@ impl<USB: UsbPeripheral> UsbBus<USB> {
     }
 
     pub fn force_reset(&self, delay: &mut impl DelayMs<u32>) -> Result<()> {
-        interrupt::free(|cs| {
+        critical_section::with(|cs| {
             let regs = self.regs.borrow(cs);
             write_reg!(otg_device, regs.device(), DCTL, SDIS: 1); // Soft disconnect
             delay.delay_ms(3);
@@ -162,7 +162,7 @@ impl<USB: UsbPeripheral> UsbBus<USB> {
             panic!("ulpi_read is only supported with external ULPI PHYs");
         }
 
-        interrupt::free(|cs| {
+        critical_section::with(|cs| {
             let regs = self.regs.borrow(cs);
 
             // Begin ULPI register read transaction
@@ -197,7 +197,7 @@ impl<USB: UsbPeripheral> UsbBus<USB> {
             panic!("ulpi_write is only supported with external ULPI PHYs");
         }
 
-        interrupt::free(|cs| {
+        critical_section::with(|cs| {
             let regs = self.regs.borrow(cs);
 
             // Begin ULPI register write transaction
@@ -356,7 +356,7 @@ impl<USB: UsbPeripheral> usb_device::bus::UsbBus for UsbBus<USB> {
         // Enable USB_OTG in RCC
         USB::enable();
 
-        interrupt::free(|cs| {
+        critical_section::with(|cs| {
             let regs = self.regs.borrow(cs);
 
             let core_id = read_reg!(otg_global, regs.global(), CID);
@@ -506,7 +506,7 @@ impl<USB: UsbPeripheral> usb_device::bus::UsbBus for UsbBus<USB> {
     }
 
     fn reset(&self) {
-        interrupt::free(|cs| {
+        critical_section::with(|cs| {
             let regs = self.regs.borrow(cs);
 
             self.configure_all(cs);
@@ -516,7 +516,7 @@ impl<USB: UsbPeripheral> usb_device::bus::UsbBus for UsbBus<USB> {
     }
 
     fn set_device_address(&self, addr: u8) {
-        interrupt::free(|cs| {
+        critical_section::with(|cs| {
             let regs = self.regs.borrow(cs);
 
             modify_reg!(otg_device, regs.device(), DCFG, DAD: addr as u32);
@@ -573,7 +573,7 @@ impl<USB: UsbPeripheral> usb_device::bus::UsbBus for UsbBus<USB> {
     }
 
     fn poll(&self) -> PollResult {
-        interrupt::free(|cs| {
+        critical_section::with(|cs| {
             let regs = self.regs.borrow(cs);
 
             let core_id = read_reg!(otg_global, regs.global(), CID);

src/endpoint.rs

@@ -1,16 +1,17 @@
+use critical_section::{CriticalSection, Mutex};
 use usb_device::{Result, UsbError, UsbDirection};
 use usb_device::endpoint::EndpointAddress;
+
 use crate::endpoint_memory::{EndpointBuffer, EndpointBufferState};
 use crate::ral::{read_reg, write_reg, modify_reg, endpoint_in, endpoint_out, endpoint0_out};
 use crate::target::{fifo_write, UsbRegisters};
-use crate::target::interrupt::{self, CriticalSection, Mutex};
 use core::ops::{Deref, DerefMut};
 use core::cell::RefCell;
 use crate::transition::EndpointDescriptor;
 use crate::UsbPeripheral;
 
 pub fn set_stalled(usb: UsbRegisters, address: EndpointAddress, stalled: bool) {
-    interrupt::free(|_| {
+    critical_section::with(|_| {
         match address.direction() {
             UsbDirection::Out => {
                 let ep = usb.endpoint_out(address.index() as usize);
@@ -74,7 +75,7 @@ impl EndpointIn {
         }
     }
 
-    pub fn configure(&self, _cs: &CriticalSection) {
+    pub fn configure(&self, _cs: CriticalSection<'_>) {
         if self.index() == 0 {
             let mpsiz = match self.descriptor.max_packet_size {
                 8 => 0b11,
@@ -100,7 +101,7 @@ impl EndpointIn {
         }
     }
 
-    pub fn deconfigure(&self, _cs: &CriticalSection) {
+    pub fn deconfigure(&self, _cs: CriticalSection<'_>) {
         let regs = self.usb.endpoint_in(self.index() as usize);
 
         // deactivating endpoint
@@ -163,7 +164,7 @@ impl EndpointOut {
         }
     }
 
-    pub fn configure(&self, _cs: &CriticalSection) {
+    pub fn configure(&self, _cs: CriticalSection<'_>) {
         if self.index() == 0 {
             let mpsiz = match self.descriptor.max_packet_size {
                 8 => 0b11,
@@ -189,7 +190,7 @@ impl EndpointOut {
         }
     }
 
-    pub fn deconfigure(&self, _cs: &CriticalSection) {
+    pub fn deconfigure(&self, _cs: CriticalSection<'_>) {
         let regs = self.usb.endpoint_out(self.index() as usize);
 
         // deactivating endpoint
@@ -205,13 +206,13 @@ impl EndpointOut {
     }
 
     pub fn read(&self, buf: &mut [u8]) -> Result<usize> {
-        interrupt::free(|cs| {
+        critical_section::with(|cs| {
             self.buffer.borrow(cs).borrow_mut().read_packet(buf)
         })
     }
 
     pub fn buffer_state(&self) -> EndpointBufferState {
-        interrupt::free(|cs| {
+        critical_section::with(|cs| {
             self.buffer.borrow(cs).borrow().state()
         })
     }

src/target.rs

@@ -2,11 +2,6 @@
 
 use vcell::VolatileCell;
 
-#[cfg(feature = "cortex-m")]
-pub use cortex_m::interrupt;
-#[cfg(feature = "riscv")]
-pub use riscv::interrupt;
-
 use crate::ral::{otg_global, otg_device, otg_pwrclk, otg_global_dieptxfx, endpoint_in, endpoint0_out, endpoint_out};
 use crate::UsbPeripheral;
 use crate::ral::register::RWRegister;