Merge branch 'master' of git://git/apps/sc_usb_audio

This commit is contained in:
Ross Owen
2014-03-28 12:22:49 +00:00
3 changed files with 17 additions and 7 deletions

View File

@@ -619,12 +619,17 @@ enum USBEndpointNumber_Out
#define MAX_VOL (0x20000000)
#ifdef SELF_POWERED
#define BMAX_POWER 0
/* Default to taking no power from the bus in self-powered mode */
#ifndef BMAX_POWER
#define BMAX_POWER 0
#endif
#else
#ifndef BMAX_POWER
#define BMAX_POWER 250
#endif
/* Default to taking 500mA from the bus in bus-powered mode */
#ifndef BMAX_POWER
#define BMAX_POWER 250
#endif
#endif
/* Length of clock unit/clock-selector units */