From a63663da13965571496ad2df58d2951a819dfc80 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 12 Nov 2015 19:02:15 +0000 Subject: [PATCH] NUM_USB_CHAN_IN_FS and NUM_USB_CHAN_OUT_FS can now be over-ridden for multi-channel at FS. Default is still 2. --- module_usb_audio/devicedefines.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h index 53043dad..c7db6685 100644 --- a/module_usb_audio/devicedefines.h +++ b/module_usb_audio/devicedefines.h @@ -1311,17 +1311,21 @@ enum USBEndpointNumber_Out -/* For Audio Class 1.0 and Full-speed Audio 2.0 we always have at most 2 channels */ -#if (NUM_USB_CHAN_OUT > 2) -#define NUM_USB_CHAN_OUT_FS (2) -#else -#define NUM_USB_CHAN_OUT_FS (NUM_USB_CHAN_OUT) +/* For Audio Class 1.0 and Full-speed Audio 2.0 we default having at most 2 channels */ +#ifndef NUM_USB_CHAN_OUT_FS + #if (NUM_USB_CHAN_OUT > 2) + #define NUM_USB_CHAN_OUT_FS (2) + #else + #define NUM_USB_CHAN_OUT_FS (NUM_USB_CHAN_OUT) + #endif #endif -#if (NUM_USB_CHAN_IN > 2) -#define NUM_USB_CHAN_IN_FS (2) -#else -#define NUM_USB_CHAN_IN_FS (NUM_USB_CHAN_IN) +#ifndef NUM_USB_CHAN_IN_FS + #if (NUM_USB_CHAN_IN > 2) + #define NUM_USB_CHAN_IN_FS (2) + #else + #define NUM_USB_CHAN_IN_FS (NUM_USB_CHAN_IN) + #endif #endif /* Apply sample-rate restrictions to full-speed operation */