laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

String tidy

Browse Source
This commit is contained in:
Ross Owen
2013-09-20 12:03:08 +01:00
parent 13bd9d9b06
commit 82876da22c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_usb_audio/devicedefines.h
View File

@@ -193,14 +193,14 @@
/* Product string for Audio Class 2.0 mode */ /* Product string for Audio Class 2.0 mode */
#ifndef PRODUCT_STR_A2 #ifndef PRODUCT_STR_A2
#warning PRODUCT_STR_A2 not defined. Using default string #warning PRODUCT_STR_A2 not defined. Using default string
#define PRODUCT_STR_A2 "xCORE USB Audio 2.0 " #define PRODUCT_STR_A2 "xCORE USB Audio 2.0"
#endif #endif
/* Product string for Audio Class 1.0 mode */ /* Product string for Audio Class 1.0 mode */
#ifndef PRODUCT_STR_A1 #ifndef PRODUCT_STR_A1
#warning PRODUCT_STR_A1 not defined. Using default string #warning PRODUCT_STR_A1 not defined. Using default string
#define PRODUCT_STR_A1 "xCORE USB Audio 1.0 " #define PRODUCT_STR_A1 "xCORE USB Audio 1.0"
#endif #endif
#if (AUDIO_CLASS==1) || defined(AUDIO_CLASS_FALLBACK) #if (AUDIO_CLASS==1) || defined(AUDIO_CLASS_FALLBACK)

8
module_usb_audio/endpoint0/descriptors.h
View File

@@ -1432,11 +1432,11 @@ unsigned char cfgDesc_Audio2[] =
#define STR_INDEX_OUT_CHAN (10 + SPDIF_RX_NUM_STRS + ADAT_RX_NUM_STRS + MIDI_NUM_STRS + DFU_NUM_STRS) #define STR_INDEX_OUT_CHAN (10 + SPDIF_RX_NUM_STRS + ADAT_RX_NUM_STRS + MIDI_NUM_STRS + DFU_NUM_STRS)
#define STR_INDEX_IN_CHAN (STR_INDEX_OUT_CHAN + NUM_USB_CHAN_OUT) #define STR_INDEX_IN_CHAN (STR_INDEX_OUT_CHAN + NUM_USB_CHAN_OUT)
#define APPEND_VENDOR_STR(x) VENDOR_STR " "#x #define APPEND_VENDOR_STR(x) VENDOR_STR#x
#define APPEND_PRODUCT_STR_A2(x) PRODUCT_STR_A2 " " #x #define APPEND_PRODUCT_STR_A2(x) PRODUCT_STR_A2 " "#x
#define APPEND_PRODUCT_STR_A1(x) PRODUCT_STR_A1 " " #x #define APPEND_PRODUCT_STR_A1(x) PRODUCT_STR_A1 " "#x
#if defined(SPDIF) #if defined(SPDIF)
#if ((NUM_USB_CHAN_OUT - 2) <= 0) #if ((NUM_USB_CHAN_OUT - 2) <= 0)
@@ -1449,7 +1449,7 @@ unsigned char cfgDesc_Audio2[] =
static unsigned char strDescs[][40] = static unsigned char strDescs[][40] =
{ {
"Langids", // 0 LangIDs place holder "Langids", // 0 LangIDs place holder
APPEND_VENDOR_STR( ), // 1 iManufacturer (at MANUFACTURER_STRING_INDEX) APPEND_VENDOR_STR(), // 1 iManufacturer (at MANUFACTURER_STRING_INDEX)
"",//SERIAL_STR, // 2 iSerialNumber (at SERIAL_STR_INDEX) "",//SERIAL_STR, // 2 iSerialNumber (at SERIAL_STR_INDEX)