Vergil_Wong/lib_xua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assign unique string indexes using a enum instead of #defines.

Browse Source
This commit is contained in:
Richard Osborne
2013-12-03 18:10:40 +00:00
parent b2816ac3aa
commit 2c36043119
1 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
module_usb_audio/endpoint0/descriptors.h
View File

@@ -243,44 +243,32 @@ unsigned char devQualDesc_Null[] =
// Positions in strDescs_Audio2 // Positions in strDescs_Audio2
#define INTERNAL_CLOCK_STRING_INDEX (14) enum {
#define SPDIF_CLOCK_STRING_INDEX (15) INTERNAL_CLOCK_STRING_INDEX = 14,
#ifdef SPDIF_RX #ifdef SPDIF_RX
#define ADAT_CLOCK_STRING_INDEX (SPDIF_CLOCK_STRING_INDEX + 1) SPDIF_CLOCK_STRING_INDEX,
#else
#define ADAT_CLOCK_STRING_INDEX (SPDIF_CLOCK_STRING_INDEX)
#endif #endif
#ifdef ADAT_RX #ifdef ADAT_RX
#define DFU_STRING_INDEX (ADAT_CLOCK_STRING_INDEX + 1) ADAT_CLOCK_STRING_INDEX,
#else
#define DFU_STRING_INDEX (ADAT_CLOCK_STRING_INDEX)
#endif #endif
#ifdef DFU #ifdef DFU
#define MIDI_OUT_STRING_INDEX (DFU_STRING_INDEX + 1) DFU_STRING_INDEX,
#else
#define MIDI_OUT_STRING_INDEX (DFU_STRING_INDEX)
#endif #endif
#define MIDI_IN_STRING_INDEX (MIDI_OUT_STRING_INDEX + 1)
#ifdef MIDI #ifdef MIDI
#define OUTPUT_INTERFACE_STRING_INDEX (MIDI_OUT_STRING_INDEX + 2) MIDI_OUT_STRING_INDEX,
#else MIDI_IN_STRING_INDEX,
#define OUTPUT_INTERFACE_STRING_INDEX (MIDI_OUT_STRING_INDEX)
#endif #endif
OUTPUT_INTERFACE_STRING_INDEX,
#define INPUT_INTERFACE_STRING_INDEX (OUTPUT_INTERFACE_STRING_INDEX + NUM_USB_CHAN_OUT) OUTPUT_INTERFACE_LAST_STRING_INDEX = OUTPUT_INTERFACE_STRING_INDEX + NUM_USB_CHAN_OUT - 1,
INPUT_INTERFACE_STRING_INDEX,
#define MIXER_STRING_INDEX (INPUT_INTERFACE_STRING_INDEX + NUM_USB_CHAN_IN) INPUT_INTERFACE_LAST_STRING_INDEX = INPUT_INTERFACE_STRING_INDEX + NUM_USB_CHAN_IN - 1,
#ifdef MIXER #ifdef MIXER
#define IAP_INTERFACE_STRING_INDEX (MIXER_STRING_INDEX + MAX_MIX_COUNT) MIXER_STRING_INDEX,
#else
#define IAP_INTERFACE_STRING_INDEX (MIXER_STRING_INDEX)
#endif #endif
#ifdef IAP
IAP_INTERFACE_STRING_INDEX,
#endif
};
#ifdef HID_CONTROLS #ifdef HID_CONTROLS
unsigned char hidReportDescriptor[] = { unsigned char hidReportDescriptor[] = {