DFU_BCD_DEVICE removed (use BCD_DEVICE)

This commit is contained in:
xross
2017-11-02 15:40:27 +00:00
parent 69e24a7b88
commit 516b4f5171
3 changed files with 5 additions and 8 deletions

View File

@@ -17,6 +17,7 @@ lib_xua Change Log
- CHANGE: Renaming in descriptors.h to avoid clashes with application
- CHANGE: Vendor specific control interface in UAC1 descriptor now has a string descriptor
so it shows up with a descriptive name in Windows Device Manager
- CHANGE: DFU_BCD_DEVICE removed (used BCD_DEVICE)
- CHANGE: Fork from sc_usb_audio to lib_xua
Legacy release history

View File

@@ -535,7 +535,7 @@
* @brief Device firmware version number in Binary Coded Decimal format: 0xJJMN where JJ: major, M: minor, N: sub-minor version number.
*/
#ifndef BCD_DEVICE_N
#define BCD_DEVICE_N 0
#define BCD_DEVICE_N
#endif
/**
@@ -1275,7 +1275,7 @@ enum USBEndpointNumber_Out
#define DFU_PID PID_AUDIO_1
#endif
#define DFU_VENDOR_ID VENDOR_ID
#define DFU_BCD_DEVICE BCD_DEVICE
#define DFU_MANUFACTURER_STR_INDEX offsetof(StringDescTable_t, vendorStr)/sizeof(char *)
#if (AUDIO_CLASS == 2)
#define DFU_PRODUCT_STR_INDEX offsetof(StringDescTable_t, productStr_Audio2)/sizeof(char *)

View File

@@ -13,10 +13,6 @@
#error DFU_PID not defined!
#endif
#ifndef DFU_BCD_DEVICE
#error DFU_BCD_DEVICE not defined!
#endif
#ifndef DFU_SERIAL_STR_INDEX
/* By default no serial string */
#define DFU_SERIAL_STR_INDEX (0x00)
@@ -43,8 +39,8 @@ unsigned char DFUdevDesc[] = {
(DFU_VENDOR_ID >> 8), /* 9 idVendor */
(DFU_PID & 0xFF), /* 10 idProduct */
(DFU_PID >> 8), /* 11 idProduct */
(DFU_BCD_DEVICE & 0xFF), /* 12 bcdDevice : Device release number */
(DFU_BCD_DEVICE >> 8), /* 13 bcdDevice : Device release number */
(BCD_DEVICE & 0xFF), /* 12 bcdDevice : Device release number */
(BCD_DEVICE >> 8), /* 13 bcdDevice : Device release number */
DFU_MANUFACTURER_STR_INDEX, /* 14 iManufacturer : Index of manufacturer string */
DFU_PRODUCT_STR_INDEX, /* 15 iProduct : Index of product string descriptor */
DFU_SERIAL_STR_INDEX, /* 16 iSerialNumber : Index of serial number decriptor */