max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose a handle to the config descriptor writer

Browse Source
This commit is contained in:
Ali Somay
2023-08-15 21:36:21 +02:00
parent 7b91597e9c
commit 847e5a7a75
3 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
embassy-usb/src/class/cdc_acm.rs
View File

@ -182,7 +182,6 @@ impl<'d, D: Driver<'d>> CdcAcmClass<'d, D> {
// Control interface
let mut iface = func.interface();
let comm_if = iface.interface_number();
let data_if = u8::from(comm_if) + 1;
let mut alt = iface.alt_setting(USB_CLASS_CDC, CDC_SUBCLASS_ACM, CDC_PROTOCOL_NONE, None);
alt.descriptor(
@ -208,19 +207,29 @@ impl<'d, D: Driver<'d>> CdcAcmClass<'d, D> {
&[
CDC_TYPE_UNION, // bDescriptorSubtype
comm_if.into(), // bControlInterface
data_if.into(), // bSubordinateInterface
// Padding, bSubordinateInterface byte will be written later.
0x0, // bSubordinateInterface
],
);
// Keep the position of the subordinate interface byte so we can fill it in later
let subordinate_interface_position = alt.config_descriptor_writer().position() - 1;
let comm_ep = alt.endpoint_interrupt_in(8, 255);
// Data interface
let mut iface = func.interface();
let data_if = iface.interface_number();
let data_if_number_byte = data_if.0;
let mut alt = iface.alt_setting(USB_CLASS_CDC_DATA, 0x00, CDC_PROTOCOL_NONE, None);
let read_ep = alt.endpoint_bulk_out(max_packet_size);
let write_ep = alt.endpoint_bulk_in(max_packet_size);
// Fill in the subordinate interface byte with the right interface number.
alt.config_descriptor_writer()
.overwrite(subordinate_interface_position, &[data_if_number_byte]);
drop(func);
let control = state.control.write(Control {