From 2b547f311efc7feaa3afbb9f1bf4100c5502839e Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Mon, 28 Mar 2022 03:27:21 +0200
Subject: usb: move all control-related stuff to `mod control`.

---
 examples/nrf/src/bin/usb/cdc_acm.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'examples/nrf/src/bin')

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};
 use core::sync::atomic::{AtomicBool, Ordering};
 use defmt::info;
 use embassy::blocking_mutex::CriticalSectionMutex;
-use embassy_usb::class::{ControlHandler, ControlInRequestStatus, RequestStatus};
-use embassy_usb::control::{self, Request};
+use embassy_usb::control::{
+    self, ControlHandler, ControlIn, ControlInRequestStatus, Request, RequestStatus,
+};
 use embassy_usb::driver::{Endpoint, EndpointIn, EndpointOut, ReadError, WriteError};
 use embassy_usb::{driver::Driver, types::*, UsbDeviceBuilder};
 
@@ -124,7 +125,7 @@ impl ControlHandler for Control {
     fn control_in<'a>(
         &mut self,
         req: Request,
-        control: embassy_usb::class::ControlIn<'a>,
+        control: ControlIn<'a>,
     ) -> ControlInRequestStatus<'a> {
         match req.request {
             // REQ_GET_ENCAPSULATED_COMMAND is not really supported - it will be rejected below.
-- 
cgit