diff options
| author | HiFiPhile <[email protected]> | 2025-10-30 19:50:47 +0100 |
|---|---|---|
| committer | HiFiPhile <[email protected]> | 2025-10-30 19:50:47 +0100 |
| commit | aa739c946d0258be4f07914bcb48288e2c977145 (patch) | |
| tree | 9ac52bd6a4d38c7b88c0158ac79a8525c14d58e4 /examples/device/audio_test/src | |
| parent | 9f1a86c0cbf2974775687848a95a126c6503c1cf (diff) | |
| parent | fc3857eb1abefff3cf19816e231e549bf75b9dc3 (diff) | |
Merge branch 'master' into uac1
Signed-off-by: HiFiPhile <[email protected]>
Diffstat (limited to 'examples/device/audio_test/src')
| -rw-r--r-- | examples/device/audio_test/src/tusb_config.h | 6 | ||||
| -rw-r--r-- | examples/device/audio_test/src/usb_descriptors.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/device/audio_test/src/tusb_config.h b/examples/device/audio_test/src/tusb_config.h index cb9554582..e311d892f 100644 --- a/examples/device/audio_test/src/tusb_config.h +++ b/examples/device/audio_test/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" { @@ -119,4 +119,4 @@ extern "C" { } #endif -#endif /* _TUSB_CONFIG_H_ */ +#endif /* TUSB_CONFIG_H_ */ diff --git a/examples/device/audio_test/src/usb_descriptors.c b/examples/device/audio_test/src/usb_descriptors.c index af9b7f1dc..b6c19deba 100644 --- a/examples/device/audio_test/src/usb_descriptors.c +++ b/examples/device/audio_test/src/usb_descriptors.c @@ -32,14 +32,14 @@ * Auto ProductID layout's Bitmap: * [MSB] AUDIO | MIDI | 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(AUDIO, 4) | _PID_MAP(VENDOR, 5) ) +#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(AUDIO, 4) | PID_MAP(VENDOR, 5) ) //--------------------------------------------------------------------+ // Device Descriptors //--------------------------------------------------------------------+ -tusb_desc_device_t const desc_device = +static tusb_desc_device_t const desc_device = { .bLength = sizeof(tusb_desc_device_t), .bDescriptorType = TUSB_DESC_DEVICE, |