mirrors/embedded-trainings-2020
1
0
Fork 0
mirror of https://github.com/ferrous-systems/embedded-trainings-2020.git synced 2024-06-15 19:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Reduce diff of usb-5-solution.rs to usb-4-solution.rs

Browse source
This commit is contained in:
Rafael Bachmann 2020-10-18 19:50:36 +02:00 committed by GitHub
parent b48824231f
commit ab7cfb8a48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
advanced/firmware/src/bin/usb-5-solution.rs
View file

@ -13,9 +13,9 @@ use usb2::{GetDescriptor as Descriptor, StandardRequest as Request, State};
#[rtic::app(device = dk)] #[rtic::app(device = dk)]
const APP: () = { const APP: () = {
struct Resources { struct Resources {
usbd: USBD,
ep0in: Ep0In, ep0in: Ep0In,
state: State, state: State,
usbd: USBD,
} }
#[init] #[init]
@ -31,19 +31,19 @@ const APP: () = {
} }
} }
#[task(binds = USBD, resources = [state, usbd, ep0in])] #[task(binds = USBD, resources = [usbd, ep0in, state])]
fn main(cx: main::Context) { fn main(cx: main::Context) {
let usbd = cx.resources.usbd; let usbd = cx.resources.usbd;
let state = cx.resources.state;
let ep0in = cx.resources.ep0in; let ep0in = cx.resources.ep0in;
let state = cx.resources.state;
while let Some(event) = usbd::next_event(usbd) { while let Some(event) = usbd::next_event(usbd) {
on_event(usbd, state, ep0in, event) on_event(usbd, ep0in, state, event)
} }
} }
}; };
fn on_event(usbd: &USBD, state: &mut State, ep0in: &mut Ep0In, event: Event) { fn on_event(usbd: &USBD, ep0in: &mut Ep0In, state: &mut State, event: Event) {
log::info!("USB: {:?} @ {:?}", event, dk::uptime()); log::info!("USB: {:?} @ {:?}", event, dk::uptime());
match event { match event {
@ -54,12 +54,12 @@ fn on_event(usbd: &USBD, state: &mut State, ep0in: &mut Ep0In, event: Event) {
Event::UsbEp0DataDone => { Event::UsbEp0DataDone => {
log::info!("EP0IN: transfer complete"); log::info!("EP0IN: transfer complete");
ep0in.end(usbd) ep0in.end(usbd);
} }
Event::UsbEp0Setup => { Event::UsbEp0Setup => {
if ep0setup(usbd, state, ep0in).is_err() { if ep0setup(usbd, ep0in, state).is_err() {
log::warn!("EP0IN: stalled"); log::warn!("EP0IN: unexpected request; stalling the endpoint");
usbd::ep0stall(usbd); usbd::ep0stall(usbd);
} }
} }
@ -69,14 +69,24 @@ fn on_event(usbd: &USBD, state: &mut State, ep0in: &mut Ep0In, event: Event) {
/// The `bConfigurationValue` of the only supported configuration /// The `bConfigurationValue` of the only supported configuration
const CONFIG_VAL: u8 = 42; const CONFIG_VAL: u8 = 42;
fn ep0setup(usbd: &USBD, state: &mut State, ep0in: &mut Ep0In) -> Result<(), ()> { fn ep0setup(usbd: &USBD, ep0in: &mut Ep0In, state: &mut State) -> Result<(), ()> {
let bmrequesttype = usbd.bmrequesttype.read().bits() as u8; let bmrequesttype = usbd.bmrequesttype.read().bits() as u8;
let brequest = usbd.brequest.read().brequest().bits(); let brequest = usbd.brequest.read().brequest().bits();
let wlength = usbd::wlength(usbd); let wlength = usbd::wlength(usbd);
let windex = usbd::windex(usbd); let windex = usbd::windex(usbd);
let wvalue = usbd::wvalue(usbd); let wvalue = usbd::wvalue(usbd);
let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength)?; log::info!(
"bmrequesttype: {}, brequest: {}, wlength: {}, windex: {}, wvalue: {}",
bmrequesttype,
brequest,
wlength,
windex,
wvalue
);
let request = Request::parse(bmrequesttype, brequest, wvalue, windex, wlength)
.expect("Error parsing request");
log::info!("EP0: {:?}", request); log::info!("EP0: {:?}", request);
match request { match request {
@ -90,7 +100,7 @@ fn ep0setup(usbd: &USBD, state: &mut State, ep0in: &mut Ep0In) -> Result<(), ()>
bDeviceSubClass: 0, bDeviceSubClass: 0,
bMaxPacketSize0: usb2::device::bMaxPacketSize0::B64, bMaxPacketSize0: usb2::device::bMaxPacketSize0::B64,
bNumConfigurations: core::num::NonZeroU8::new(1).unwrap(), bNumConfigurations: core::num::NonZeroU8::new(1).unwrap(),
bcdDevice: 0x0100, // 1.00 bcdDevice: 0x01_00, // 1.00
iManufacturer: None, iManufacturer: None,
iProduct: None, iProduct: None,
iSerialNumber: None, iSerialNumber: None,
@ -98,7 +108,7 @@ fn ep0setup(usbd: &USBD, state: &mut State, ep0in: &mut Ep0In) -> Result<(), ()>
idVendor: consts::VID, idVendor: consts::VID,
}; };
let bytes = desc.bytes(); let bytes = desc.bytes();
ep0in.start(&bytes[..core::cmp::min(bytes.len(), length.into())], usbd); let _ = ep0in.start(&bytes[..core::cmp::min(bytes.len(), length.into())], usbd);
} }
Descriptor::Configuration { index } => { Descriptor::Configuration { index } => {