Skip to content

Commit

Permalink
Merge pull request #2765 from hinxx/usbtmc-clean
Browse files Browse the repository at this point in the history
couple of fixes for usbtmc example
  • Loading branch information
HiFiPhile authored Sep 1, 2024
2 parents 12f5a6e + 06e52e4 commit 8eb3bd2
Showing 1 changed file with 5 additions and 16 deletions.
21 changes: 5 additions & 16 deletions examples/device/usbtmc/src/usb_descriptors.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#define USB_PID (0x4000 | _PID_MAP(CDC, 0) | _PID_MAP(MSC, 1) | _PID_MAP(HID, 2) | \
_PID_MAP(MIDI, 3) | _PID_MAP(VENDOR, 4) )

#define USB_VID 0xCafe
#define USB_VID 0xcafe
#define USB_BCD 0x0200

//--------------------------------------------------------------------+
Expand All @@ -48,16 +48,16 @@ tusb_desc_device_t const desc_device =
{
.bLength = sizeof(tusb_desc_device_t),
.bDescriptorType = TUSB_DESC_DEVICE,
.bcdUSB = 0x0200,
.bDeviceClass = 0x00,
.bcdUSB = USB_BCD,
.bDeviceClass = TUSB_CLASS_UNSPECIFIED,
.bDeviceSubClass = 0x00,
.bDeviceProtocol = 0x00,

.bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,

.idVendor = USB_VID,
.idProduct = USB_PID,
.bcdDevice = USB_BCD,
.bcdDevice = 0x0100,

.iManufacturer = 0x01,
.iProduct = 0x02,
Expand Down Expand Up @@ -112,17 +112,6 @@ enum

#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_USBTMC_DESC_LEN)

#if CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC177X_8X || CFG_TUSB_MCU == OPT_MCU_LPC40XX
// LPC 17xx and 40xx endpoint type (bulk/interrupt/iso) are fixed by its number
// 0 control, 1 In, 2 Bulk, 3 Iso, 4 In etc ...
// Note: since CDC EP ( 1 & 2), HID (4) are spot-on, thus we only need to force
// endpoint number for MSC to 5
#define EPNUM_MSC 0x05
#else
#define EPNUM_MSC 0x03
#endif


uint8_t const desc_fs_configuration[] =
{
// Config number, interface count, string index, total length, attribute, power in mA
Expand Down Expand Up @@ -151,7 +140,7 @@ tusb_desc_device_qualifier_t const desc_device_qualifier =
.bDescriptorType = TUSB_DESC_DEVICE_QUALIFIER,
.bcdUSB = USB_BCD,

.bDeviceClass = 0x00,
.bDeviceClass = TUSB_CLASS_UNSPECIFIED,
.bDeviceSubClass = 0x00,
.bDeviceProtocol = 0x00,

Expand Down

0 comments on commit 8eb3bd2

Please sign in to comment.