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

make send, consolidate usb types

Browse Source
This commit is contained in:
Jacob Rosenthal 2021-12-13 18:13:38 -07:00
parent 83a1237ea3
commit 535d30335a
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
embassy-nrf/src/usb.rs
View File

@ -8,17 +8,8 @@ use crate::pac;
use nrf_usbd::{UsbPeripheral, Usbd}; use nrf_usbd::{UsbPeripheral, Usbd};
use usb_device::bus::UsbBusAllocator; use usb_device::bus::UsbBusAllocator;
// todo using different type than Usb because T isnt Send unsafe impl<'d, T: Instance> UsbPeripheral for Usb<'d, T> {
pub struct UsbBus; const REGISTERS: *const () = T::regs as *const ();
unsafe impl UsbPeripheral for UsbBus {
// todo hardcoding
const REGISTERS: *const () = crate::pac::USBD::ptr() as *const ();
}
impl UsbBus {
pub fn new() -> UsbBusAllocator<Usbd<UsbBus>> {
Usbd::new(UsbBus)
}
} }
unsafe impl embassy_hal_common::usb::USBInterrupt for crate::interrupt::USBD {} unsafe impl embassy_hal_common::usb::USBInterrupt for crate::interrupt::USBD {}
@ -29,12 +20,12 @@ pub struct Usb<'d, T: Instance> {
impl<'d, T: Instance> Usb<'d, T> { impl<'d, T: Instance> Usb<'d, T> {
#[allow(unused_unsafe)] #[allow(unused_unsafe)]
pub fn new(_usb: impl Unborrow<Target = T> + 'd) -> Self { pub fn new(_usb: impl Unborrow<Target = T> + 'd) -> UsbBusAllocator<Usbd<Self>> {
let r = T::regs(); let r = T::regs();
Self { Usbd::new(Self {
phantom: PhantomData, phantom: PhantomData,
} })
} }
fn on_interrupt(_: *mut ()) { fn on_interrupt(_: *mut ()) {
@ -50,7 +41,7 @@ pub(crate) mod sealed {
} }
} }
pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static { pub trait Instance: Unborrow<Target = Self> + sealed::Instance + 'static + Send {
type Interrupt: Interrupt; type Interrupt: Interrupt;
} }

6
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::usb::{Usb as UsbDevice, UsbBus}; use embassy_nrf::usb::Usb as UsbDevice;
use embassy_nrf::{interrupt, Peripherals}; use embassy_nrf::{interrupt, Peripherals};
use usb_device::device::{UsbDeviceBuilder, UsbVidPid}; use usb_device::device::{UsbDeviceBuilder, UsbVidPid};
@ -26,9 +26,7 @@ async fn main(_spawner: Spawner, p: Peripherals) {
let mut tx_buffer = [0u8; 1024]; let mut tx_buffer = [0u8; 1024];
let mut rx_buffer = [0u8; 640]; let mut rx_buffer = [0u8; 640];
let _usb_dev = UsbDevice::new(p.USBD); let usb_bus = UsbDevice::new(p.USBD);
let usb_bus = UsbBus::new();
let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer); let serial = UsbSerial::new(&usb_bus, &mut rx_buffer, &mut tx_buffer);