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

DFU properly removed for audio class 1.0

Browse Source
This commit is contained in:
Ross Owen
2012-08-03 12:20:22 +01:00
parent 9f8893aae1
commit 8ea567febf
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module_usb_aud_shared/devicedefines.h
View File

@@ -273,6 +273,11 @@
/* Total number of USB interfaces this device implements (+1 for required control interface) */ /* Total number of USB interfaces this device implements (+1 for required control interface) */
#define NUM_INTERFACES INPUT_INTERFACES + OUTPUT_INTERFACES + DFU_INTERFACES + MIDI_INTERFACES + IAP_INTERFACES + 1 + HID_INTERFACES #define NUM_INTERFACES INPUT_INTERFACES + OUTPUT_INTERFACES + DFU_INTERFACES + MIDI_INTERFACES + IAP_INTERFACES + 1 + HID_INTERFACES
/* Number of interfaces for Audio 1.0 */
#define NUM_INTERFACES_A1 (1+INPUT_INTERFACES+OUTPUT_INTERFACES)
/* Audio Unit ID defines */ /* Audio Unit ID defines */
#define FU_USBIN 11 /* Feature Unit: USB Audio device -> host */ #define FU_USBIN 11 /* Feature Unit: USB Audio device -> host */
#define FU_USBOUT 10 /* Feature Unit: USB Audio host -> device*/ #define FU_USBOUT 10 /* Feature Unit: USB Audio host -> device*/

7
module_usb_aud_shared/endpoint0/descriptors_2.h
View File

@@ -1585,9 +1585,9 @@ unsigned char cfgDesc_Audio1[] =
(CFG_TOTAL_LENGTH_A1 & 0xFF), /* wTotalLength */ (CFG_TOTAL_LENGTH_A1 & 0xFF), /* wTotalLength */
(CFG_TOTAL_LENGTH_A1 >> 8), /* wTotalLength */ (CFG_TOTAL_LENGTH_A1 >> 8), /* wTotalLength */
#ifdef MIDI #ifdef MIDI
NUM_INTERFACES-2, /* numInterfaces - we dont support MIDI in audio 1.0 mode*/ NUM_INTERFACES_A1-2, /* numInterfaces - we dont support MIDI in audio 1.0 mode*/
#else #else
NUM_INTERFACES, NUM_INTERFACES_A1,
#endif #endif
0x01, /* ID of this configuration */ 0x01, /* ID of this configuration */
0x00, /* Unused */ 0x00, /* Unused */
@@ -1855,6 +1855,7 @@ unsigned char cfgDesc_Audio1[] =
0x00, 0x00, /* Unused */ 0x00, 0x00, /* Unused */
#endif #endif
#if 0
/* Standard DFU class Interface descriptor */ /* Standard DFU class Interface descriptor */
0x09, /* 0 bLength : Size of this descriptor, in bytes. (field size 1 bytes) */ 0x09, /* 0 bLength : Size of this descriptor, in bytes. (field size 1 bytes) */
0x04, /* 1 bDescriptorType : INTERFACE descriptor. (field size 1 bytes) */ 0x04, /* 1 bDescriptorType : INTERFACE descriptor. (field size 1 bytes) */
@@ -1865,7 +1866,7 @@ unsigned char cfgDesc_Audio1[] =
0x01, /* 6 bInterfaceSubclass : (field size 1 bytes) */ 0x01, /* 6 bInterfaceSubclass : (field size 1 bytes) */
0x01, /* 7 bInterfaceProtocol : Unused. (field size 1 bytes) */ 0x01, /* 7 bInterfaceProtocol : Unused. (field size 1 bytes) */
8, /* 8 iInterface : Unused. (field size 1 bytes) */ 8, /* 8 iInterface : Unused. (field size 1 bytes) */
#endif
#if 0 #if 0
/* DFU 1.0 Run-Time DFU Functional Descriptor */ /* DFU 1.0 Run-Time DFU Functional Descriptor */
0x07, 0x07,