diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-03-28 03:27:21 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-04-06 05:38:11 +0200 |
| commit | 2b547f311efc7feaa3afbb9f1bf4100c5502839e (patch) | |
| tree | 40b9ef749e486d6f902a9d9dd95a68ff672c151e /examples | |
| parent | 15cc97d794d8b4baa6c1a8f1ed6c64468701c9e7 (diff) | |
usb: move all control-related stuff to `mod control`.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/nrf/src/bin/usb/cdc_acm.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/examples/nrf/src/bin/usb/cdc_acm.rs b/examples/nrf/src/bin/usb/cdc_acm.rs index f4d429792..25c3108a9 100644 --- a/examples/nrf/src/bin/usb/cdc_acm.rs +++ b/examples/nrf/src/bin/usb/cdc_acm.rs | |||
| @@ -3,8 +3,9 @@ use core::mem::{self, MaybeUninit}; | |||
| 3 | use core::sync::atomic::{AtomicBool, Ordering}; | 3 | use core::sync::atomic::{AtomicBool, Ordering}; |
| 4 | use defmt::info; | 4 | use defmt::info; |
| 5 | use embassy::blocking_mutex::CriticalSectionMutex; | 5 | use embassy::blocking_mutex::CriticalSectionMutex; |
| 6 | use embassy_usb::class::{ControlHandler, ControlInRequestStatus, RequestStatus}; | 6 | use embassy_usb::control::{ |
| 7 | use embassy_usb::control::{self, Request}; | 7 | self, ControlHandler, ControlIn, ControlInRequestStatus, Request, RequestStatus, |
| 8 | }; | ||
| 8 | use embassy_usb::driver::{Endpoint, EndpointIn, EndpointOut, ReadError, WriteError}; | 9 | use embassy_usb::driver::{Endpoint, EndpointIn, EndpointOut, ReadError, WriteError}; |
| 9 | use embassy_usb::{driver::Driver, types::*, UsbDeviceBuilder}; | 10 | use embassy_usb::{driver::Driver, types::*, UsbDeviceBuilder}; |
| 10 | 11 | ||
| @@ -124,7 +125,7 @@ impl ControlHandler for Control { | |||
| 124 | fn control_in<'a>( | 125 | fn control_in<'a>( |
| 125 | &mut self, | 126 | &mut self, |
| 126 | req: Request, | 127 | req: Request, |
| 127 | control: embassy_usb::class::ControlIn<'a>, | 128 | control: ControlIn<'a>, |
| 128 | ) -> ControlInRequestStatus<'a> { | 129 | ) -> ControlInRequestStatus<'a> { |
| 129 | match req.request { | 130 | match req.request { |
| 130 | // REQ_GET_ENCAPSULATED_COMMAND is not really supported - it will be rejected below. | 131 | // REQ_GET_ENCAPSULATED_COMMAND is not really supported - it will be rejected below. |
