max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb feature gate

Browse Source
This commit is contained in:
Jacob Rosenthal 2021-12-12 21:32:51 -07:00
parent f430c0e8c2
commit e5dc63e8e9
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-hal-common/src/usb/mod.rs
View File

@ -11,7 +11,7 @@ pub mod usb_serial;
use crate::peripheral::{PeripheralMutex, PeripheralState, StateStorage}; use crate::peripheral::{PeripheralMutex, PeripheralState, StateStorage};
use embassy::interrupt::Interrupt; use embassy::interrupt::Interrupt;
use usb_serial::{ReadInterface, UsbSerial, WriteInterface}; pub use usb_serial::{ReadInterface, UsbSerial, WriteInterface};
/// Marker trait to mark an interrupt to be used with the [`Usb`] abstraction. /// Marker trait to mark an interrupt to be used with the [`Usb`] abstraction.
pub unsafe trait USBInterrupt: Interrupt + Send {} pub unsafe trait USBInterrupt: Interrupt + Send {}

8
embassy-nrf/src/lib.rs
View File

@ -73,12 +73,15 @@ pub(crate) use chip::pac;
pub use chip::{peripherals, Peripherals}; pub use chip::{peripherals, Peripherals};
#[cfg(any(feature = "nrf52820", feature = "nrf52833", feature = "nrf52840"))]
pub mod usb {
use nrf_usbd::{UsbPeripheral, Usbd}; use nrf_usbd::{UsbPeripheral, Usbd};
use usb_device::bus::UsbBusAllocator; use usb_device::bus::UsbBusAllocator;
pub struct UsbBus; pub struct UsbBus;
unsafe impl UsbPeripheral for UsbBus { unsafe impl UsbPeripheral for UsbBus {
const REGISTERS: *const () = pac::USBD::ptr() as *const (); const REGISTERS: *const () = crate::pac::USBD::ptr() as *const ();
} }
impl UsbBus { impl UsbBus {
@ -87,7 +90,8 @@ impl UsbBus {
} }
} }
unsafe impl embassy_hal_common::usb::USBInterrupt for interrupt::USBD {} unsafe impl embassy_hal_common::usb::USBInterrupt for crate::interrupt::USBD {}
}
pub mod interrupt { pub mod interrupt {
pub use crate::chip::irqs::*; pub use crate::chip::irqs::*;

2
examples/nrf/src/bin/usb_uart.rs
View File

@ -17,7 +17,7 @@ use embassy::executor::Spawner;
use embassy::io::{AsyncBufReadExt, AsyncWriteExt}; use embassy::io::{AsyncBufReadExt, AsyncWriteExt};
use embassy::time::{Duration, Timer}; use embassy::time::{Duration, Timer};
use embassy_hal_common::usb::{State, Usb, UsbSerial}; use embassy_hal_common::usb::{State, Usb, UsbSerial};
use embassy_nrf::UsbBus; use embassy_nrf::usb::UsbBus;
use embassy_nrf::{interrupt, Peripherals}; use embassy_nrf::{interrupt, Peripherals};
use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; use usb_device::device::{UsbDeviceBuilder, UsbVidPid};