zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

DUE USB composite device field corrections (#14185)

Browse source
This commit is contained in:
Bob Kuhn 2019-05-30 16:26:48 -05:00 committed by Scott Lahteine
parent f889cc6ea6
commit 688b54d66a
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Marlin/src/HAL/HAL_DUE/usb/udi_composite_desc.c
View file

@ -67,9 +67,9 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {
.bLength = sizeof(usb_dev_desc_t), .bLength = sizeof(usb_dev_desc_t),
.bDescriptorType = USB_DT_DEVICE, .bDescriptorType = USB_DT_DEVICE,
.bcdUSB = LE16(USB_V2_0), .bcdUSB = LE16(USB_V2_0),
.bDeviceClass = 0, .bDeviceClass = CDC_CLASS_MULTI,
.bDeviceSubClass = 0, .bDeviceSubClass = CDC_SUBCLASS_ACM,
.bDeviceProtocol = 0, .bDeviceProtocol = CDC_PROTOCOL_V25TER,
.bMaxPacketSize0 = USB_DEVICE_EP_CTRL_SIZE, .bMaxPacketSize0 = USB_DEVICE_EP_CTRL_SIZE,
.idVendor = LE16(USB_DEVICE_VENDOR_ID), .idVendor = LE16(USB_DEVICE_VENDOR_ID),
.idProduct = LE16(USB_DEVICE_PRODUCT_ID), .idProduct = LE16(USB_DEVICE_PRODUCT_ID),
@ -101,9 +101,9 @@ UDC_DESC_STORAGE usb_dev_qual_desc_t udc_device_qual = {
.bLength = sizeof(usb_dev_qual_desc_t), .bLength = sizeof(usb_dev_qual_desc_t),
.bDescriptorType = USB_DT_DEVICE_QUALIFIER, .bDescriptorType = USB_DT_DEVICE_QUALIFIER,
.bcdUSB = LE16(USB_V2_0), .bcdUSB = LE16(USB_V2_0),
.bDeviceClass = 0, .bDeviceClass = CDC_CLASS_MULTI,
.bDeviceSubClass = 0, .bDeviceSubClass = CDC_SUBCLASS_ACM,
.bDeviceProtocol = 0, .bDeviceProtocol = CDC_PROTOCOL_V25TER,
.bMaxPacketSize0 = USB_DEVICE_EP_CTRL_SIZE, .bMaxPacketSize0 = USB_DEVICE_EP_CTRL_SIZE,
.bNumConfigurations = 1 .bNumConfigurations = 1
}; };

2
Marlin/src/HAL/HAL_DUE/usb/usb_protocol_cdc.h
View file

@ -61,6 +61,8 @@
#define CDC_CLASS_DEVICE 0x02 //!< USB Communication Device Class #define CDC_CLASS_DEVICE 0x02 //!< USB Communication Device Class
#define CDC_CLASS_COMM 0x02 //!< CDC Communication Class Interface #define CDC_CLASS_COMM 0x02 //!< CDC Communication Class Interface
#define CDC_CLASS_DATA 0x0A //!< CDC Data Class Interface #define CDC_CLASS_DATA 0x0A //!< CDC Data Class Interface
#define CDC_CLASS_MULTI 0xEF //!< CDC Multi-interface Function
//@} //@}
//! \name USB CDC Subclass IDs //! \name USB CDC Subclass IDs