riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #12535 from bergzand/pr/usbus/cdcacm_assoc_len

Browse Source 
cdcacm: Add the interface assoc descriptor to the length
This commit is contained in:
Martine Lenders 2019-10-22 08:49:08 +02:00 committed by GitHub
commit 789cbb9a79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,8 @@ static const usbus_hdr_gen_funcs_t _cdcacm_descriptor = {
.fmt_pre_descriptor = _gen_assoc_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_descriptor_interface_association_t) +
sizeof(usb_desc_cdc_t) +
sizeof(usb_desc_acm_t) + sizeof(usb_desc_acm_t) +
sizeof(usb_desc_union_t) + sizeof(usb_desc_union_t) +
sizeof(usb_desc_call_mngt_t), sizeof(usb_desc_call_mngt_t),