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

usb: simplify buffer handling for Control IN transfers.

Browse Source
This commit is contained in:
Dario Nieuwenhuis
2022-03-28 03:34:24 +02:00
parent bfce731982
commit e99a3a1da4
3 changed files with 21 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/nrf/src/bin/usb/cdc_acm.rs
View File

@ -3,7 +3,7 @@ use core::mem::{self, MaybeUninit};
use core::sync::atomic::{AtomicBool, Ordering};
use defmt::info;
use embassy::blocking_mutex::CriticalSectionMutex;
use embassy_usb::control::{self, ControlHandler, ControlIn, InResponse, OutResponse, Request};
use embassy_usb::control::{self, ControlHandler, InResponse, OutResponse, Request};
use embassy_usb::driver::{Endpoint, EndpointIn, EndpointOut, ReadError, WriteError};
use embassy_usb::{driver::Driver, types::*, UsbDeviceBuilder};
@ -120,20 +120,19 @@ impl ControlHandler for Control {
}
}
fn control_in<'a>(&mut self, req: Request, control: ControlIn<'a>) -> InResponse<'a> {
fn control_in(&mut self, req: Request, resp: &mut [u8]) -> InResponse {
match req.request {
// REQ_GET_ENCAPSULATED_COMMAND is not really supported - it will be rejected below.
REQ_GET_LINE_CODING if req.length == 7 => {
info!("Sending line coding");
let coding = self.shared().line_coding.lock(|x| x.get());
let mut data = [0; 7];
data[0..4].copy_from_slice(&coding.data_rate.to_le_bytes());
data[4] = coding.stop_bits as u8;
data[5] = coding.parity_type as u8;
data[6] = coding.data_bits;
control.accept(&data)
resp[0..4].copy_from_slice(&coding.data_rate.to_le_bytes());
resp[4] = coding.stop_bits as u8;
resp[5] = coding.parity_type as u8;
resp[6] = coding.data_bits;
InResponse::Accepted(7)
}
_ => control.reject(),
_ => InResponse::Rejected,
}
}
}