From aa5b7b68dfe3d6a0d9d5b8ffa57b09ec5408efa6 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 27 Jan 2014 14:16:02 +0000 Subject: [PATCH 1/4] Updated to new termtype defines in descriptors --- module_usb_audio/endpoint0/descriptors.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module_usb_audio/endpoint0/descriptors.h b/module_usb_audio/endpoint0/descriptors.h index 4bf7b544..8b9d0c6b 100644 --- a/module_usb_audio/endpoint0/descriptors.h +++ b/module_usb_audio/endpoint0/descriptors.h @@ -457,7 +457,8 @@ unsigned char cfgDesc_Audio2[] = CS_INTERFACE, /* 1 bDescriptorType: 0x24 */ INPUT_TERMINAL, /* 2 bDescriptorSubType: INPUT_TERMINAL */ ID_IT_USB, /* 3 bTerminalID */ - (USB_STREAMING&0xff),USB_STREAMING>>8, /* 4 wTerminalType: USB Streaming */ + USB_TERMTYPE_USB_STREAMING&0xff, + USB_TERMTYPE_USB_STREAMING>>8, /* 5 wTerminalType: USB Streaming */ 0x00, /* 6 bAssocTerminal */ ID_CLKSEL, /* 7 bCSourceID: ID of Clock Entity */ NUM_USB_CHAN_OUT, /* 8 bNrChannels */ @@ -680,7 +681,8 @@ unsigned char cfgDesc_Audio2[] = CS_INTERFACE, /* 1 bDescriptorType: 0x24 */ OUTPUT_TERMINAL, /* 2 bDescriptorSubType: OUTPUT_TERMINAL */ ID_OT_USB, /* 3 bTerminalID */ - (USB_STREAMING&0xff),USB_STREAMING>>8, /* 4 wTerminalType */ + (USB_TERMTYPE_USB_STREAMING&0xff), + (USB_TERMTYPE_USB_STREAMING>>8),/* 5 wTerminalType */ 0x00, /* 6 bAssocTerminal */ FU_USBIN, /* 7 bSourceID Connect to analog input feature unit*/ ID_CLKSEL, /* 8 bCSourceUD */ From 6192b9a5fa4dd1dd391b8799d109ea74c89f2a2e Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 27 Jan 2014 14:26:36 +0000 Subject: [PATCH 2/4] Removed #warning when DFU_FLASH_DEVICE defined --- module_usb_audio/flashlib_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_usb_audio/flashlib_user.c b/module_usb_audio/flashlib_user.c index 028b2760..1ea6b428 100644 --- a/module_usb_audio/flashlib_user.c +++ b/module_usb_audio/flashlib_user.c @@ -14,7 +14,7 @@ #define portout(a,b) {__asm__ __volatile__("out res[%0], %1": : "r" (a) , "r" (b));} #ifdef DFU_FLASH_DEVICE -#warning Using custom flash spec +/* Using specified flash device rather than all supported in tools */ fl_DeviceSpec flash_devices[] = {DFU_FLASH_DEVICE}; #endif From b178eec970a0811ec77ee548037a08fca327904d Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 27 Jan 2014 14:27:52 +0000 Subject: [PATCH 3/4] Fixed unused var warning relating to chanend c_mix_out --- module_usb_audio/main.xc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc index 60d746f0..f1ae822b 100755 --- a/module_usb_audio/main.xc +++ b/module_usb_audio/main.xc @@ -330,8 +330,9 @@ void usb_audio_io(chanend c_aud_in, chanend ?c_adc #endif ) { +#ifdef MIXER chan c_mix_out; - +#endif par { From bc8b311be07c60a9df798d6c4c62a30cee41dfbc Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Mon, 27 Jan 2014 14:36:27 +0000 Subject: [PATCH 4/4] Warning removal (unused funcs) --- module_usb_audio/clocking/clockgen.xc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module_usb_audio/clocking/clockgen.xc b/module_usb_audio/clocking/clockgen.xc index a2cf7ade..9180d298 100644 --- a/module_usb_audio/clocking/clockgen.xc +++ b/module_usb_audio/clocking/clockgen.xc @@ -38,6 +38,8 @@ static int clockValid[NUM_CLOCKS]; /* Store current val static int clockInt[NUM_CLOCKS]; /* Interupt flag for clocks */ static int clockId[NUM_CLOCKS]; + +#if defined(SPDIF_RX) || defined(ADAT_RX) static int abs(int x) { if (x < 0) return -x; @@ -67,6 +69,7 @@ static void outInterrupt(chanend c_interruptControl, int value) outct(c_interruptControl, XS1_CT_END); } } +#endif #ifdef CLOCK_VALIDITY_CALL void VendorClockValidity(int valid);