From 6145bfde6f80955c453672607d3325caf3598dc0 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Thu, 6 Mar 2014 16:04:10 +0000 Subject: [PATCH] Added STREAM_FORMAT_OUTPUT_SUBSLOT_X_USED defines --- module_usb_audio/devicedefines.h | 38 ++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h index 66b5b2d3..d87b1192 100644 --- a/module_usb_audio/devicedefines.h +++ b/module_usb_audio/devicedefines.h @@ -302,8 +302,6 @@ #define BCD_DEVICE ((BCD_DEVICE_J << 8) | ((BCD_DEVICE_M & 0xF) << 4) | (BCD_DEVICE_N & 0xF)) #endif -#define OUTPUT_FORMAT_COUNT 3 - #ifndef OUTPUT_FORMAT_COUNT #ifndef NATIVE_DSD /* Default format count is 2 (16bit, 24bit) */ @@ -314,8 +312,6 @@ #endif #endif - - #if(OUTPUT_FORMAT_COUNT > 3) #error only OUTPUT_FORMAT_COUNT of 3 or less supported #endif @@ -471,7 +467,41 @@ #endif #endif +/* Some defines that allow us to remove unused code */ +/* Useful for dropping lower part of macs in volume processing... */ +#if (FS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS > 24) || (FS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24) || \ + (FS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS > 24) || \ + (HS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24) + #define STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED 1 +#else + #define STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED 0 +#endif + +/* SUBSLOT defines useful for removing packing/unpacking code in USB buffering code */ +#if (FS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES == 2) || (FS_STREAM_FORMAT_OUTPUT_2_SUBSLOT_BYTES == 2) || \ + (FS_STREAM_FORMAT_OUTPUT_3_SUBSLOT_BYTES == 2) || (HS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES == 2) || \ + (HS_STREAM_FORMAT_OUTPUT_2_SUBSLOT_BYTES == 2) || (HS_STREAM_FORMAT_OUTPUT_3_SUBSLOT_BYTES == 2) + #define STREAM_FORMAT_OUTPUT_SUBSLOT_2_USED 1 +#else + #define STREAM_FORMAT_OUTPUT_SUBSLOT_2_USED 0 +#endif + +#if (FS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES == 3) || (FS_STREAM_FORMAT_OUTPUT_2_SUBSLOT_BYTES == 3) || \ + (FS_STREAM_FORMAT_OUTPUT_3_SUBSLOT_BYTES == 3) || (HS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES == 3) || \ + (HS_STREAM_FORMAT_OUTPUT_2_SUBSLOT_BYTES == 3) || (HS_STREAM_FORMAT_OUTPUT_3_SUBSLOT_BYTES == 3) + #define STREAM_FORMAT_OUTPUT_SUBSLOT_3_USED 1 +#else + #define STREAM_FORMAT_OUTPUT_SUBSLOT_3_USED 0 +#endif + +#if (FS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES == 4) || (FS_STREAM_FORMAT_OUTPUT_2_SUBSLOT_BYTES == 4) || \ + (FS_STREAM_FORMAT_OUTPUT_3_SUBSLOT_BYTES == 4) || (HS_STREAM_FORMAT_OUTPUT_1_SUBSLOT_BYTES == 4) || \ + (HS_STREAM_FORMAT_OUTPUT_2_SUBSLOT_BYTES == 4) || (HS_STREAM_FORMAT_OUTPUT_3_SUBSLOT_BYTES == 4) + #define STREAM_FORMAT_OUTPUT_SUBSLOT_4_USED 1 +#else + #define STREAM_FORMAT_OUTPUT_SUBSLOT_4_USED 0 +#endif //#ifdef INPUT #if 1