Skip to content

Commit a3d3521

Browse files
EekleEekle
committed
Remove manual settings of composite_with_iads=true 
1 parent 0f4b9c7 commit a3d3521

File tree

30 files changed

+0
-201
lines changed

30 files changed

+0
-201
lines changed

‎embassy-usb-logger/src/lib.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,6 @@ impl<const N: usize, T: ReceiverHandler + Send + Sync> UsbLogger<N, T> {
102102
config.max_power = 100;
103103
config.max_packet_size_0 = MAX_PACKET_SIZE;
104104

105-
// Required for windows compatiblity.
106-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
107-
config.device_class = 0xEF;
108-
config.device_sub_class = 0x02;
109-
config.device_protocol = 0x01;
110-
config.composite_with_iads = true;
111-
112105
let mut builder = Builder::new(
113106
driver,
114107
config,

‎examples/nrf52840/src/bin/usb_ethernet.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ async fn main(spawner: Spawner) {
6060
config.max_power = 100;
6161
config.max_packet_size_0 = 64;
6262

63-
// Required for Windows support.
64-
config.composite_with_iads = true;
65-
config.device_class = 0xEF;
66-
config.device_sub_class = 0x02;
67-
config.device_protocol = 0x01;
68-
6963
// Create embassy-usb DeviceBuilder using the driver and config.
7064
static CONFIG_DESC: StaticCell<[u8; 256]> = StaticCell::new();
7165
static BOS_DESC: StaticCell<[u8; 256]> = StaticCell::new();

‎examples/nrf52840/src/bin/usb_serial.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ async fn main(_spawner: Spawner) {
3636
config.max_power = 100;
3737
config.max_packet_size_0 = 64;
3838

39-
// Required for windows compatibility.
40-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
41-
config.device_class = 0xEF;
42-
config.device_sub_class = 0x02;
43-
config.device_protocol = 0x01;
44-
config.composite_with_iads = true;
45-
4639
// Create embassy-usb DeviceBuilder using the driver and config.
4740
// It needs some buffers for building the descriptors.
4841
let mut config_descriptor = [0; 256];

‎examples/nrf52840/src/bin/usb_serial_multitask.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@ async fn main(spawner: Spawner) {
5353
config.max_power = 100;
5454
config.max_packet_size_0 = 64;
5555

56-
// Required for windows compatibility.
57-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
58-
config.device_class = 0xEF;
59-
config.device_sub_class = 0x02;
60-
config.device_protocol = 0x01;
61-
config.composite_with_iads = true;
62-
6356
static STATE: StaticCell<State> = StaticCell::new();
6457
let state = STATE.init(State::new());
6558

‎examples/nrf52840/src/bin/usb_serial_winusb.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ async fn main(_spawner: Spawner) {
4141
config.max_power = 100;
4242
config.max_packet_size_0 = 64;
4343

44-
// Required for windows compatibility.
45-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
46-
config.device_class = 0xEF;
47-
config.device_sub_class = 0x02;
48-
config.device_protocol = 0x01;
49-
config.composite_with_iads = true;
50-
5144
// Create embassy-usb DeviceBuilder using the driver and config.
5245
// It needs some buffers for building the descriptors.
5346
let mut config_descriptor = [0; 256];

‎examples/rp/src/bin/pio_uart.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,6 @@ async fn main(_spawner: Spawner) {
4949
config.max_power = 100;
5050
config.max_packet_size_0 = 64;
5151

52-
// Required for windows compatibility.
53-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
54-
config.device_class = 0xEF;
55-
config.device_sub_class = 0x02;
56-
config.device_protocol = 0x01;
57-
config.composite_with_iads = true;
58-
5952
// Create embassy-usb DeviceBuilder using the driver and config.
6053
// It needs some buffers for building the descriptors.
6154
let mut config_descriptor = [0; 256];

‎examples/rp/src/bin/usb_ethernet.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ async fn main(spawner: Spawner) {
6060
config.max_power = 100;
6161
config.max_packet_size_0 = 64;
6262

63-
// Required for Windows support.
64-
config.composite_with_iads = true;
65-
config.device_class = 0xEF;
66-
config.device_sub_class = 0x02;
67-
config.device_protocol = 0x01;
68-
6963
// Create embassy-usb DeviceBuilder using the driver and config.
7064
static CONFIG_DESC: StaticCell<[u8; 256]> = StaticCell::new();
7165
static BOS_DESC: StaticCell<[u8; 256]> = StaticCell::new();

‎examples/rp/src/bin/usb_midi.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ async fn main(_spawner: Spawner) {
3737
config.max_power = 100;
3838
config.max_packet_size_0 = 64;
3939

40-
// Required for windows compatibility.
41-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
42-
config.device_class = 0xEF;
43-
config.device_sub_class = 0x02;
44-
config.device_protocol = 0x01;
45-
config.composite_with_iads = true;
46-
4740
// Create embassy-usb DeviceBuilder using the driver and config.
4841
// It needs some buffers for building the descriptors.
4942
let mut config_descriptor = [0; 256];

‎examples/rp/src/bin/usb_raw.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,6 @@ async fn main(_spawner: Spawner) {
8484
config.max_power = 100;
8585
config.max_packet_size_0 = 64;
8686

87-
// // Required for windows compatibility.
88-
// // https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
89-
config.device_class = 0xEF;
90-
config.device_sub_class = 0x02;
91-
config.device_protocol = 0x01;
92-
config.composite_with_iads = true;
93-
9487
// Create embassy-usb DeviceBuilder using the driver and config.
9588
// It needs some buffers for building the descriptors.
9689
let mut config_descriptor = [0; 256];

‎examples/rp/src/bin/usb_raw_bulk.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ async fn main(_spawner: Spawner) {
6262
config.max_power = 100;
6363
config.max_packet_size_0 = 64;
6464

65-
// // Required for windows compatibility.
66-
// // https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
67-
config.device_class = 0xEF;
68-
config.device_sub_class = 0x02;
69-
config.device_protocol = 0x01;
70-
config.composite_with_iads = true;
71-
7265
// Create embassy-usb DeviceBuilder using the driver and config.
7366
// It needs some buffers for building the descriptors.
7467
let mut config_descriptor = [0; 256];

‎examples/rp/src/bin/usb_serial.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ async fn main(spawner: Spawner) {
3737
config.serial_number = Some("12345678");
3838
config.max_power = 100;
3939
config.max_packet_size_0 = 64;
40-
41-
// Required for windows compatibility.
42-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
43-
config.device_class = 0xEF;
44-
config.device_sub_class = 0x02;
45-
config.device_protocol = 0x01;
46-
config.composite_with_iads = true;
4740
config
4841
};
4942

‎examples/rp/src/bin/usb_serial_with_logger.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,6 @@ async fn main(_spawner: Spawner) {
3737
config.max_power = 100;
3838
config.max_packet_size_0 = 64;
3939

40-
// Required for windows compatibility.
41-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
42-
config.device_class = 0xEF;
43-
config.device_sub_class = 0x02;
44-
config.device_protocol = 0x01;
45-
config.composite_with_iads = true;
46-
4740
// Create embassy-usb DeviceBuilder using the driver and config.
4841
// It needs some buffers for building the descriptors.
4942
let mut config_descriptor = [0; 256];

‎examples/rp23/src/bin/pio_uart.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@ async fn main(_spawner: Spawner) {
5252
config.max_power = 100;
5353
config.max_packet_size_0 = 64;
5454

55-
// Required for windows compatibility.
56-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
57-
config.device_class = 0xEF;
58-
config.device_sub_class = 0x02;
59-
config.device_protocol = 0x01;
60-
config.composite_with_iads = true;
61-
6255
// Create embassy-usb DeviceBuilder using the driver and config.
6356
// It needs some buffers for building the descriptors.
6457
let mut config_descriptor = [0; 256];

‎examples/stm32f4/src/bin/usb_ethernet.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,6 @@ async fn main(spawner: Spawner) {
9393
config.max_power = 100;
9494
config.max_packet_size_0 = 64;
9595

96-
// Required for Windows support.
97-
config.composite_with_iads = true;
98-
config.device_class = 0xEF;
99-
config.device_sub_class = 0x02;
100-
config.device_protocol = 0x01;
101-
10296
// Create embassy-usb DeviceBuilder using the driver and config.
10397
static CONFIG_DESC: StaticCell<[u8; 256]> = StaticCell::new();
10498
static BOS_DESC: StaticCell<[u8; 256]> = StaticCell::new();

‎examples/stm32f4/src/bin/usb_hid_keyboard.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,6 @@ async fn main(_spawner: Spawner) {
7171
config.max_power = 100;
7272
config.max_packet_size_0 = 64;
7373

74-
// Required for windows compatibility.
75-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
76-
config.device_class = 0xEF;
77-
config.device_sub_class = 0x02;
78-
config.device_protocol = 0x01;
79-
config.composite_with_iads = true;
80-
8174
// Create embassy-usb DeviceBuilder using the driver and config.
8275
// It needs some buffers for building the descriptors.
8376
let mut config_descriptor = [0; 256];

‎examples/stm32f4/src/bin/usb_hid_mouse.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,6 @@ async fn main(_spawner: Spawner) {
6666
config.product = Some("HID mouse example");
6767
config.serial_number = Some("12345678");
6868

69-
// Required for windows compatibility.
70-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
71-
config.device_class = 0xEF;
72-
config.device_sub_class = 0x02;
73-
config.device_protocol = 0x01;
74-
config.composite_with_iads = true;
75-
7669
// Create embassy-usb DeviceBuilder using the driver and config.
7770
// It needs some buffers for building the descriptors.
7871
let mut config_descriptor = [0; 256];

‎examples/stm32f4/src/bin/usb_raw.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,6 @@ async fn main(_spawner: Spawner) {
119119
config.product = Some("USB-raw example");
120120
config.serial_number = Some("12345678");
121121

122-
// Required for windows compatibility.
123-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
124-
config.device_class = 0xEF;
125-
config.device_sub_class = 0x02;
126-
config.device_protocol = 0x01;
127-
config.composite_with_iads = true;
128-
129122
// Create embassy-usb DeviceBuilder using the driver and config.
130123
// It needs some buffers for building the descriptors.
131124
let mut config_descriptor = [0; 256];

‎examples/stm32f4/src/bin/usb_serial.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,6 @@ async fn main(_spawner: Spawner) {
6666
config.product = Some("USB-serial example");
6767
config.serial_number = Some("12345678");
6868

69-
// Required for windows compatibility.
70-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
71-
config.device_class = 0xEF;
72-
config.device_sub_class = 0x02;
73-
config.device_protocol = 0x01;
74-
config.composite_with_iads = true;
75-
7669
// Create embassy-usb DeviceBuilder using the driver and config.
7770
// It needs some buffers for building the descriptors.
7871
let mut config_descriptor = [0; 256];

‎examples/stm32f4/src/bin/usb_uac_speaker.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -315,13 +315,6 @@ async fn main(spawner: Spawner) {
315315
config.product = Some("USB-audio-speaker example");
316316
config.serial_number = Some("12345678");
317317

318-
// Required for windows compatibility.
319-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
320-
config.device_class = 0xEF;
321-
config.device_sub_class = 0x02;
322-
config.device_protocol = 0x01;
323-
config.composite_with_iads = true;
324-
325318
let mut builder = embassy_usb::Builder::new(
326319
usb_driver,
327320
config,

‎examples/stm32f7/src/bin/usb_serial.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,6 @@ async fn main(_spawner: Spawner) {
6666
config.product = Some("USB-serial example");
6767
config.serial_number = Some("12345678");
6868

69-
// Required for windows compatibility.
70-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
71-
config.device_class = 0xEF;
72-
config.device_sub_class = 0x02;
73-
config.device_protocol = 0x01;
74-
config.composite_with_iads = true;
75-
7669
// Create embassy-usb DeviceBuilder using the driver and config.
7770
// It needs some buffers for building the descriptors.
7871
let mut config_descriptor = [0; 256];

‎examples/stm32g4/src/bin/usb_serial.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ async fn main(_spawner: Spawner) {
5151
config.product = Some("USB-Serial Example");
5252
config.serial_number = Some("123456");
5353

54-
config.device_class = 0xEF;
55-
config.device_sub_class = 0x02;
56-
config.device_protocol = 0x01;
57-
config.composite_with_iads = true;
58-
5954
let mut config_descriptor = [0; 256];
6055
let mut bos_descriptor = [0; 256];
6156
let mut control_buf = [0; 64];

‎examples/stm32h5/src/bin/usb_serial.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,6 @@ async fn main(_spawner: Spawner) {
5656
config.product = Some("USB-serial example");
5757
config.serial_number = Some("12345678");
5858

59-
// Required for windows compatibility.
60-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
61-
config.device_class = 0xEF;
62-
config.device_sub_class = 0x02;
63-
config.device_protocol = 0x01;
64-
config.composite_with_iads = true;
65-
6659
// Create embassy-usb DeviceBuilder using the driver and config.
6760
// It needs some buffers for building the descriptors.
6861
let mut config_descriptor = [0; 256];

‎examples/stm32h5/src/bin/usb_uac_speaker.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,6 @@ async fn main(spawner: Spawner) {
309309
config.product = Some("USB-audio-speaker example");
310310
config.serial_number = Some("12345678");
311311

312-
// Required for windows compatibility.
313-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
314-
config.device_class = 0xEF;
315-
config.device_sub_class = 0x02;
316-
config.device_protocol = 0x01;
317-
config.composite_with_iads = true;
318-
319312
let mut builder = embassy_usb::Builder::new(
320313
usb_driver,
321314
config,

‎examples/stm32h7/src/bin/usb_serial.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ async fn main(_spawner: Spawner) {
6767
config.product = Some("USB-serial example");
6868
config.serial_number = Some("12345678");
6969

70-
// Required for windows compatibility.
71-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
72-
config.device_class = 0xEF;
73-
config.device_sub_class = 0x02;
74-
config.device_protocol = 0x01;
75-
config.composite_with_iads = true;
76-
7770
// Create embassy-usb DeviceBuilder using the driver and config.
7871
// It needs some buffers for building the descriptors.
7972
let mut config_descriptor = [0; 256];

‎examples/stm32h7rs/src/bin/usb_serial.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@ async fn main(_spawner: Spawner) {
7070
config.manufacturer = Some("Embassy");
7171
config.product = Some("USB-serial example");
7272
config.serial_number = Some("12345678");
73-
// Required for windows compatibility.
74-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
75-
config.device_class = 0xEF;
76-
config.device_sub_class = 0x02;
77-
config.device_protocol = 0x01;
78-
config.composite_with_iads = true;
7973

8074
// Create embassy-usb DeviceBuilder using the driver and config.
8175
// It needs some buffers for building the descriptors.

‎examples/stm32l1/src/bin/usb_serial.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ async fn main(_spawner: Spawner) {
4141
config.product = Some("USB-Serial Example");
4242
config.serial_number = Some("123456");
4343

44-
config.device_class = 0xEF;
45-
config.device_sub_class = 0x02;
46-
config.device_protocol = 0x01;
47-
config.composite_with_iads = true;
48-
4944
let mut config_descriptor = [0; 256];
5045
let mut bos_descriptor = [0; 256];
5146
let mut control_buf = [0; 64];

‎examples/stm32l4/src/bin/usb_serial.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,6 @@ async fn main(_spawner: Spawner) {
6262
config.product = Some("USB-serial example");
6363
config.serial_number = Some("12345678");
6464

65-
// Required for windows compatibility.
66-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
67-
config.device_class = 0xEF;
68-
config.device_sub_class = 0x02;
69-
config.device_protocol = 0x01;
70-
config.composite_with_iads = true;
71-
7265
// Create embassy-usb DeviceBuilder using the driver and config.
7366
// It needs some buffers for building the descriptors.
7467
let mut config_descriptor = [0; 256];

‎examples/stm32l5/src/bin/usb_ethernet.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ async fn main(spawner: Spawner) {
7272
config.max_power = 100;
7373
config.max_packet_size_0 = 64;
7474

75-
// Required for Windows support.
76-
config.composite_with_iads = true;
77-
config.device_class = 0xEF;
78-
config.device_sub_class = 0x02;
79-
config.device_protocol = 0x01;
80-
8175
// Create embassy-usb DeviceBuilder using the driver and config.
8276
static CONFIG_DESC: StaticCell<[u8; 256]> = StaticCell::new();
8377
static BOS_DESC: StaticCell<[u8; 256]> = StaticCell::new();

‎examples/stm32u5/src/bin/usb_hs_serial.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,6 @@ async fn main(_spawner: Spawner) {
5959
config.product = Some("USB-serial example");
6060
config.serial_number = Some("12345678");
6161

62-
// Required for windows compatibility.
63-
// https://developer.nordicsemi.com/nRF_Connect_SDK/doc/1.9.1/kconfig/CONFIG_CDC_ACM_IAD.html#help
64-
config.device_class = 0xEF;
65-
config.device_sub_class = 0x02;
66-
config.device_protocol = 0x01;
67-
config.composite_with_iads = true;
68-
6962
// Create embassy-usb DeviceBuilder using the driver and config.
7063
// It needs some buffers for building the descriptors.
7164
let mut config_descriptor = [0; 256];

0 commit comments

Comments
 (0)