RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #12430 from bergzand/wip/cdcacm/assoc

Browse Source 
CDCACM: Add interface association descriptor before CDC ACM control interface descriptor
This commit is contained in:
Dylan Laduranty 2019-10-20 17:02:37 +02:00 committed by GitHub
commit 2b98b12e07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/usb/usbus/cdc/acm/cdc_acm.c
View File

@ -47,9 +47,11 @@ static const usbus_handler_driver_t cdc_driver = {
}; };
static size_t _gen_full_acm_descriptor(usbus_t *usbus, void *arg); static size_t _gen_full_acm_descriptor(usbus_t *usbus, void *arg);
static size_t _gen_assoc_descriptor(usbus_t *usbus, void *arg);
/* Descriptors */ /* Descriptors */
static const usbus_hdr_gen_funcs_t _cdcacm_descriptor = { static const usbus_hdr_gen_funcs_t _cdcacm_descriptor = {
.fmt_pre_descriptor = _gen_assoc_descriptor,
.get_header = _gen_full_acm_descriptor, .get_header = _gen_full_acm_descriptor,
.len = { .len = {
.fixed_len = sizeof(usb_desc_cdc_t) + .fixed_len = sizeof(usb_desc_cdc_t) +
@ -60,6 +62,22 @@ static const usbus_hdr_gen_funcs_t _cdcacm_descriptor = {
.len_type = USBUS_HDR_LEN_FIXED, .len_type = USBUS_HDR_LEN_FIXED,
}; };
static size_t _gen_assoc_descriptor(usbus_t *usbus, void *arg)
{
usbus_cdcacm_device_t *cdcacm = arg;
usb_descriptor_interface_association_t iad;
iad.length = sizeof(usb_descriptor_interface_association_t);
iad.type = USB_TYPE_DESCRIPTOR_INTERFACE_ASSOC;
iad.first_interface = cdcacm->iface_ctrl.idx;
iad.interface_count = 2; /* Management and data interface */
iad.class = USB_CLASS_CDC_CONTROL;
iad.subclass = USB_CDC_SUBCLASS_ACM;
iad.protocol = 0;
iad.idx = 0;
usbus_control_slicer_put_bytes(usbus, (uint8_t*)&iad, sizeof(iad));
return sizeof(iad);
}
static size_t _gen_mngt_descriptor(usbus_t *usbus, usbus_cdcacm_device_t *cdcacm) static size_t _gen_mngt_descriptor(usbus_t *usbus, usbus_cdcacm_device_t *cdcacm)
{ {
usb_desc_call_mngt_t mngt; usb_desc_call_mngt_t mngt;