From f0b17675d89f87350faa8c61b491be53ef666894 Mon Sep 17 00:00:00 2001 From: Dario Nieuwenhuis Date: Thu, 29 Jun 2023 12:20:51 +0200 Subject: [PATCH] usb: add missing builder reexports. Fixes #1176 cc #1596 --- embassy-usb/src/class/cdc_ncm/mod.rs | 4 ++-- embassy-usb/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/embassy-usb/src/class/cdc_ncm/mod.rs b/embassy-usb/src/class/cdc_ncm/mod.rs index d5556dd0..fcfa0bfc 100644 --- a/embassy-usb/src/class/cdc_ncm/mod.rs +++ b/embassy-usb/src/class/cdc_ncm/mod.rs @@ -11,8 +11,8 @@ //! - On Pixel 4a, it refused to work on Android 11, worked on Android 12. //! - if the host's MAC address has the "locally-administered" bit set (bit 1 of first byte), //! it doesn't work! The "Ethernet tethering" option in settings doesn't get enabled. -//! This is due to regex spaghetti: https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-mainline-12.0.0_r84/core/res/res/values/config.xml#417 -//! and this nonsense in the linux kernel: https://github.com/torvalds/linux/blob/c00c5e1d157bec0ef0b0b59aa5482eb8dc7e8e49/drivers/net/usb/usbnet.c#L1751-L1757 +//! This is due to regex spaghetti: +//! and this nonsense in the linux kernel: use core::intrinsics::copy_nonoverlapping; use core::mem::{size_of, MaybeUninit}; diff --git a/embassy-usb/src/lib.rs b/embassy-usb/src/lib.rs index d8563d59..1180b9b6 100644 --- a/embassy-usb/src/lib.rs +++ b/embassy-usb/src/lib.rs @@ -23,7 +23,7 @@ mod config { use embassy_futures::select::{select, Either}; use heapless::Vec; -pub use crate::builder::{Builder, Config}; +pub use crate::builder::{Builder, Config, FunctionBuilder, InterfaceAltBuilder, InterfaceBuilder}; use crate::config::*; use crate::control::*; use crate::descriptor::*;