From fb22564406a7d42a46aacf0f45208d175ff31ad7 Mon Sep 17 00:00:00 2001 From: Russell Date: Thu, 17 Nov 2011 16:51:35 +0000 Subject: [PATCH] [PATCH 05/19] Added checks for NUM_USB_CHAN_IN and NUM_USB_CHAN_OUT being 0 - previously build errors --- module_usb_aud_shared/endpoint0/audiorequests.xc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module_usb_aud_shared/endpoint0/audiorequests.xc b/module_usb_aud_shared/endpoint0/audiorequests.xc index 19d8fd96..2cde9948 100644 --- a/module_usb_aud_shared/endpoint0/audiorequests.xc +++ b/module_usb_aud_shared/endpoint0/audiorequests.xc @@ -40,8 +40,12 @@ extern unsigned char mixer1Crossbar[]; extern short mixer1Weights[]; /* Device channel mapping */ +#if NUM_USB_CHAN_OUT > 0 extern unsigned char channelMapAud[NUM_USB_CHAN_OUT]; +#endif +#if NUM_USB_CHAN_IN > 0 extern unsigned char channelMapUsb[NUM_USB_CHAN_IN]; +#endif /* Mixer input mapping */ extern unsigned char mixSel[MIX_INPUTS]; @@ -52,10 +56,6 @@ extern unsigned int g_curSamFreq; extern unsigned int g_curSamFreq48000Family; extern unsigned int g_curSamFreqMultiplier; -/* Global level data */ -//unsigned short g_lvlMixOut[MAX_MIX_COUNT]; -//unsigned short g_lvlMixIn[NUM_USB_CHAN_IN + NUM_USB_CHAN_OUT]; - /* Store an int into a char array: Note this allows non-word aligned access unlike reinerpret cast */ void storeInt(unsigned char buffer[], int index, int val) {