Tidy only

This commit is contained in:
Ross Owen
2013-09-05 23:19:07 +01:00
parent 04dd2a2a05
commit a952c18a83

View File

@@ -171,13 +171,13 @@
/* Vendor/Product strings */ /* Vendor/Product strings */
#ifndef VENDOR_STR #ifndef VENDOR_STR
#define VENDOR_STR "XMOS " #define VENDOR_STR "XMOS"
//#warning VENDOR_STR not defined. Using XMOS #warning VENDOR_STR not defined. Using "XMOS"
#endif #endif
#ifndef VENDOR_ID #ifndef VENDOR_ID
#warning VENDOR_ID not defined. Using XMOS vendor ID #warning VENDOR_ID not defined. Using XMOS vendor ID (0x20B1)
#define VENDOR_ID (0x20B1) /* XMOS VID */ #define VENDOR_ID (0x20B1)
#endif #endif
#ifdef PRODUCT_STR #ifdef PRODUCT_STR
@@ -362,7 +362,7 @@
#define ID_MIXER_1 60 #define ID_MIXER_1 60
#define MANUFACTURER_STR_INDEX 0x01 #define MANUFACTURER_STR_INDEX 0x01
#define PRODUCT_STR_INDEX 0x02 #define PRODUCT_STR_INDEX_A2 0x03
/* Mixer defines */ /* Mixer defines */
#ifndef MIX_INPUTS #ifndef MIX_INPUTS
@@ -462,17 +462,12 @@
#endif #endif
#endif #endif
/* Defines for DFU */ /* Defines for DFU */
#ifndef PID_DFU #define DFU_PID PID_AUDIO_2
#define PID_DFU PID_AUDIO_2
#endif
#define DFU_VENDOR_ID VENDOR_ID #define DFU_VENDOR_ID VENDOR_ID
#define DFU_BCD_DEVICE BCD_DEVICE #define DFU_BCD_DEVICE BCD_DEVICE
#define DFU_MANUFACTURER_INDEX MANUFACTURER_STR_INDEX #define DFU_MANUFACTURER_STR_INDEX MANUFACTURER_STR_INDEX
#define DFU_PRODUCT_INDEX PRODUCT_STR_INDEX #define DFU_PRODUCT_STR_INDEX PRODUCT_STR_INDEX_A2
#endif #endif
#if defined(FAST_MODE) && (FAST_MODE == 0) #if defined(FAST_MODE) && (FAST_MODE == 0)