NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove UnsafeCell from cdc_acm::Control

Browse source
This commit is contained in:
alexmoon 2022-03-28 10:49:17 -04:00 committed by Dario Nieuwenhuis
parent 46bafecb2a
commit a22639ad92
1 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
examples/nrf/src/bin/usb/cdc_acm.rs
View file

@ -1,4 +1,4 @@
use core::cell::{Cell, UnsafeCell}; use core::cell::Cell;
use core::mem::{self, MaybeUninit}; use core::mem::{self, MaybeUninit};
use core::sync::atomic::{AtomicBool, Ordering}; use core::sync::atomic::{AtomicBool, Ordering};
use defmt::info; use defmt::info;
@ -27,14 +27,16 @@ const REQ_SET_LINE_CODING: u8 = 0x20;
const REQ_GET_LINE_CODING: u8 = 0x21; const REQ_GET_LINE_CODING: u8 = 0x21;
const REQ_SET_CONTROL_LINE_STATE: u8 = 0x22; const REQ_SET_CONTROL_LINE_STATE: u8 = 0x22;
pub struct State { pub struct State<'a> {
control: MaybeUninit<Control>, control: MaybeUninit<Control<'a>>,
shared: ControlShared,
} }
impl State { impl<'a> State<'a> {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
control: MaybeUninit::uninit(), control: MaybeUninit::uninit(),
shared: Default::default(),
} }
} }
} }
@ -62,8 +64,8 @@ pub struct CdcAcmClass<'d, D: Driver<'d>> {
control: &'d ControlShared, control: &'d ControlShared,
} }
struct Control { struct Control<'a> {
shared: UnsafeCell<ControlShared>, shared: &'a ControlShared,
} }
/// Shared data between Control and CdcAcmClass /// Shared data between Control and CdcAcmClass
@ -73,12 +75,28 @@ struct ControlShared {
rts: AtomicBool, rts: AtomicBool,
} }
impl Control { impl Default for ControlShared {
fn shared(&mut self) -> &ControlShared { fn default() -> Self {
unsafe { &*(self.shared.get() as *const _) } ControlShared {
dtr: AtomicBool::new(false),
rts: AtomicBool::new(false),
line_coding: CriticalSectionMutex::new(Cell::new(LineCoding {
stop_bits: StopBits::One,
data_bits: 8,
parity_type: ParityType::None,
data_rate: 8_000,
})),
}
} }
} }
impl ControlHandler for Control {
impl<'a> Control<'a> {
fn shared(&mut self) -> &'a ControlShared {
self.shared
}
}
impl<'a> ControlHandler for Control<'a> {
fn reset(&mut self) { fn reset(&mut self) {
let shared = self.shared(); let shared = self.shared();
shared.line_coding.lock(|x| x.set(LineCoding::default())); shared.line_coding.lock(|x| x.set(LineCoding::default()));
@ -142,23 +160,14 @@ impl<'d, D: Driver<'d>> CdcAcmClass<'d, D> {
/// full-speed devices, max_packet_size has to be one of 8, 16, 32 or 64. /// full-speed devices, max_packet_size has to be one of 8, 16, 32 or 64.
pub fn new( pub fn new(
builder: &mut UsbDeviceBuilder<'d, D>, builder: &mut UsbDeviceBuilder<'d, D>,
state: &'d mut State, state: &'d mut State<'d>,
max_packet_size: u16, max_packet_size: u16,
) -> Self { ) -> Self {
let control = state.control.write(Control { let control = state.control.write(Control {
shared: UnsafeCell::new(ControlShared { shared: &state.shared,
dtr: AtomicBool::new(false),
rts: AtomicBool::new(false),
line_coding: CriticalSectionMutex::new(Cell::new(LineCoding {
stop_bits: StopBits::One,
data_bits: 8,
parity_type: ParityType::None,
data_rate: 8_000,
})),
}),
}); });
let control_shared = unsafe { &*(control.shared.get() as *const _) }; let control_shared = &state.shared;
let comm_if = builder.alloc_interface_with_handler(control); let comm_if = builder.alloc_interface_with_handler(control);
let comm_ep = builder.alloc_interrupt_endpoint_in(8, 255); let comm_ep = builder.alloc_interrupt_endpoint_in(8, 255);