aboutsummaryrefslogtreecommitdiff
path: root/embassy-usb-logger
diff options
context:
space:
mode:
authorkalkyl <[email protected]>2023-11-07 09:05:10 +0100
committerkalkyl <[email protected]>2023-11-07 09:05:10 +0100
commitdb4cd73894f13cf63114c42db6b82f0904070ffb (patch)
tree85ce5839283f7fa4d6326beab2b79c8a6f6af5a9 /embassy-usb-logger
parent74f70dc7b4db7ea9e10800384602bed48efe96b2 (diff)
rp: Add USB raw example + msos descriptor to examples and usb-logger
Diffstat (limited to 'embassy-usb-logger')
-rw-r--r--embassy-usb-logger/Cargo.toml3
-rw-r--r--embassy-usb-logger/src/lib.rs6
2 files changed, 9 insertions, 0 deletions
diff --git a/embassy-usb-logger/Cargo.toml b/embassy-usb-logger/Cargo.toml
index 48b8bbcc6..02d0ed8e5 100644
--- a/embassy-usb-logger/Cargo.toml
+++ b/embassy-usb-logger/Cargo.toml
@@ -8,6 +8,9 @@ src_base = "https://github.com/embassy-rs/embassy/blob/embassy-usb-logger-v$VERS
8src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-usb-logger/src/" 8src_base_git = "https://github.com/embassy-rs/embassy/blob/$COMMIT/embassy-usb-logger/src/"
9target = "thumbv7em-none-eabi" 9target = "thumbv7em-none-eabi"
10 10
11[features]
12msos-descriptor = ["embassy-usb/msos-descriptor"]
13
11[dependencies] 14[dependencies]
12embassy-usb = { version = "0.1.0", path = "../embassy-usb" } 15embassy-usb = { version = "0.1.0", path = "../embassy-usb" }
13embassy-sync = { version = "0.4.0", path = "../embassy-sync" } 16embassy-sync = { version = "0.4.0", path = "../embassy-sync" }
diff --git a/embassy-usb-logger/src/lib.rs b/embassy-usb-logger/src/lib.rs
index 9178dd6dd..95fc0a7ed 100644
--- a/embassy-usb-logger/src/lib.rs
+++ b/embassy-usb-logger/src/lib.rs
@@ -19,6 +19,8 @@ pub struct LoggerState<'d> {
19 device_descriptor: [u8; 32], 19 device_descriptor: [u8; 32],
20 config_descriptor: [u8; 128], 20 config_descriptor: [u8; 128],
21 bos_descriptor: [u8; 16], 21 bos_descriptor: [u8; 16],
22 #[cfg(feature = "msos-descriptor")]
23 msos_descriptor: [u8; 256],
22 control_buf: [u8; 64], 24 control_buf: [u8; 64],
23} 25}
24 26
@@ -30,6 +32,8 @@ impl<'d> LoggerState<'d> {
30 device_descriptor: [0; 32], 32 device_descriptor: [0; 32],
31 config_descriptor: [0; 128], 33 config_descriptor: [0; 128],
32 bos_descriptor: [0; 16], 34 bos_descriptor: [0; 16],
35 #[cfg(feature = "msos-descriptor")]
36 msos_descriptor: [0; 256],
33 control_buf: [0; 64], 37 control_buf: [0; 64],
34 } 38 }
35 } 39 }
@@ -73,6 +77,8 @@ impl<const N: usize> UsbLogger<N> {
73 &mut state.device_descriptor, 77 &mut state.device_descriptor,
74 &mut state.config_descriptor, 78 &mut state.config_descriptor,
75 &mut state.bos_descriptor, 79 &mut state.bos_descriptor,
80 #[cfg(feature = "msos-descriptor")]
81 &mut state.msos_descriptor,
76 &mut state.control_buf, 82 &mut state.control_buf,
77 ); 83 );
78 84