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

BMAX_POWER can now be defined

Browse Source
This commit is contained in:
Ross Owen
2013-06-05 10:31:08 +01:00
parent fe11029a6c
commit c9ac6aac73
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module_usb_audio/devicedefines.h
View File

@@ -186,8 +186,8 @@
/* Device release number in BCD: 0xJJMNi */ /* Device release number in BCD: 0xJJMNi */
#ifndef BCD_DEVICE #ifndef BCD_DEVICE
#define BCD_DEVICE (0x0610) #define BCD_DEVICE (0x0620)
#warning BCD_DEVICE not defined. Using 0x0610 #warning BCD_DEVICE not defined. Using 0x0620
#endif #endif
/* Addition interfaces based on defines */ /* Addition interfaces based on defines */
@@ -290,6 +290,14 @@
#define MAX_VOL (0x20000000) #define MAX_VOL (0x20000000)
#ifdef SELF_POWERED
#define BMAX_POWER 0
#else
#ifndef BMAX_POWER
#define BMAX_POWER 250
#endif
#endif
/* Length of clock unit/clock-selector units */ /* Length of clock unit/clock-selector units */
#if defined(SPDIF_RX) && defined(ADAT_RX) #if defined(SPDIF_RX) && defined(ADAT_RX)

9
module_usb_audio/endpoint0/descriptors_2.h
View File

@@ -307,11 +307,10 @@ unsigned char cfgDesc_Audio2[] =
0x00, /* 6 iConfiguration */ 0x00, /* 6 iConfiguration */
#ifdef SELF_POWERED #ifdef SELF_POWERED
192, /* 7 bmAttributes */ 192, /* 7 bmAttributes */
0, /* 8 bMaxPower */
#else #else
128, /* 7 bmAttributes */ 128, /* 7 bmAttributes */
250, /* 8 bMaxPower */
#endif #endif
BMAX_POWER, /* 8 bMaxPower */
/* Interface Association Descriptor */ /* Interface Association Descriptor */
0x08, /* 0 bLength */ 0x08, /* 0 bLength */
@@ -1543,11 +1542,10 @@ unsigned char cfgDesc_Null[] =
0x00, /* 6 iConfiguration */ 0x00, /* 6 iConfiguration */
#ifdef SELF_POWERED #ifdef SELF_POWERED
192, /* 7 bmAttributes */ 192, /* 7 bmAttributes */
0, /* 8 bMaxPower */
#else #else
128, 128,
250, /* 8 bMaxPower */
#endif #endif
BMAX_POWER, /* 8 bMaxPower */
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) */
@@ -1608,11 +1606,10 @@ unsigned char cfgDesc_Audio1[] =
0x00, /* Unused */ 0x00, /* Unused */
#ifdef SELF_POWERED #ifdef SELF_POWERED
192, /* 7 bmAttributes */ 192, /* 7 bmAttributes */
0, /* 8 bMaxPower */
#else #else
128, /* 7 bmAttributes */ 128, /* 7 bmAttributes */
250, /* 8 bMaxPower */
#endif #endif
BMAX_POWER, /* 8 bMaxPower */
/* Standard AC interface descriptor */ /* Standard AC interface descriptor */
0x09, 0x09,