Addition of XUD_PWR_CFG define (required for role-switch)

This commit is contained in:
Ross Owen
2014-07-01 16:03:06 +01:00
parent aaac508fca
commit 7c8e64ee87
2 changed files with 10 additions and 8 deletions

View File

@@ -769,6 +769,14 @@
#endif
#endif
#ifndef XUD_PWR_CFG
#ifdef SELF_POWERED
#define XUD_PWR_CFG XUD_PWR_SELF
#else
#define XUD_PWR_CFG XUD_PWR_BUS
#endif
#endif
/* Mixer defines */
/**

View File

@@ -224,12 +224,6 @@ void xscope_user_init()
}
#endif
#ifdef SELF_POWERED
#define pwrConfig XUD_PWR_SELF
#else
#define pwrConfig XUD_PWR_BUS
#endif
/* Core USB Audio functions - must be called on the Tile connected to the USB Phy */
void usb_audio_core(chanend c_mix_out
#ifdef MIDI
@@ -262,11 +256,11 @@ void usb_audio_core(chanend c_mix_out
#if (AUDIO_CLASS==2)
XUD_Manager(c_xud_out, ENDPOINT_COUNT_OUT, c_xud_in, ENDPOINT_COUNT_IN,
c_sof, epTypeTableOut, epTypeTableIn, p_usb_rst,
clk, 1, XUD_SPEED_HS, pwrConfig);
clk, 1, XUD_SPEED_HS, XUD_PWR_CFG);
#else
XUD_Manager(c_xud_out, ENDPOINT_COUNT_OUT, c_xud_in, ENDPOINT_COUNT_IN,
c_sof, epTypeTableOut, epTypeTableIn, p_usb_rst,
clk, 1, XUD_SPEED_FS, pwrConfig);
clk, 1, XUD_SPEED_FS, XUD_PWR_CFG);
#endif
/* USB Packet buffering Core */