diff options
| author | tswan22 <[email protected]> | 2025-11-01 12:51:40 -0400 |
|---|---|---|
| committer | tswan22 <[email protected]> | 2025-11-01 12:51:40 -0400 |
| commit | ca44c772f7ad87a8d12de0b3a57ad8816f2edc10 (patch) | |
| tree | 2ac98dc0c073ca161741751504fdbeb0b710dd11 /examples/device/hid_multiple_interface | |
| parent | 9d46cca57637cfd086499970a8f5d5669ba9bfa0 (diff) | |
| parent | a6c16d147593732028ed89292805e0e6a972e4b5 (diff) | |
Merge branch 'master' of https://github.com/hathach/tinyusb
Diffstat (limited to 'examples/device/hid_multiple_interface')
| -rw-r--r-- | examples/device/hid_multiple_interface/src/tusb_config.h | 6 | ||||
| -rw-r--r-- | examples/device/hid_multiple_interface/src/usb_descriptors.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/device/hid_multiple_interface/src/tusb_config.h b/examples/device/hid_multiple_interface/src/tusb_config.h index 49dc962fe..e1805017d 100644 --- a/examples/device/hid_multiple_interface/src/tusb_config.h +++ b/examples/device/hid_multiple_interface/src/tusb_config.h @@ -23,8 +23,8 @@ * */ -#ifndef _TUSB_CONFIG_H_ -#define _TUSB_CONFIG_H_ +#ifndef TUSB_CONFIG_H_ +#define TUSB_CONFIG_H_ #ifdef __cplusplus extern "C" { @@ -104,4 +104,4 @@ } #endif -#endif /* _TUSB_CONFIG_H_ */ +#endif /* TUSB_CONFIG_H_ */ diff --git a/examples/device/hid_multiple_interface/src/usb_descriptors.c b/examples/device/hid_multiple_interface/src/usb_descriptors.c index 145836300..cd2d93c44 100644 --- a/examples/device/hid_multiple_interface/src/usb_descriptors.c +++ b/examples/device/hid_multiple_interface/src/usb_descriptors.c @@ -32,9 +32,9 @@ * Auto ProductID layout's Bitmap: * [MSB] HID | MSC | CDC [LSB] */ -#define _PID_MAP(itf, n) ( (CFG_TUD_##itf) << (n) ) -#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 PID_MAP(itf, n) ((CFG_TUD_##itf) ? (1 << (n)) : 0) +#define USB_PID (0x4000 | PID_MAP(CDC, 0) | PID_MAP(MSC, 1) | PID_MAP(HID, 2) | \ + PID_MAP(MIDI, 3) | PID_MAP(VENDOR, 4) ) //--------------------------------------------------------------------+ // Device Descriptors |