Further re-apply #341

This commit is contained in:
Ed
2024-01-26 15:02:28 +00:00
parent 7847a5ee42
commit 41566b3970

View File

@@ -1403,7 +1403,7 @@ enum USBEndpointNumber_Out
/* Some defines that allow us to remove unused code */ /* Some defines that allow us to remove unused code */
/* Useful for dropping lower part of macs in volume processing... */ /* Useful for dropping lower part of macs in volume processing... */
#if (FS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24) || \ #if (FS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_1_RESOLUTION_BITS > 24) || \
(((FS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24)) && (OUTPUT_FORMAT_COUNT > 1)) || \ (((FS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_2_RESOLUTION_BITS > 24)) && (OUTPUT_FORMAT_COUNT > 1)) || \
(((FS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24)) && (OUTPUT_FORMAT_COUNT > 2)) (((FS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_OUTPUT_3_RESOLUTION_BITS > 24)) && (OUTPUT_FORMAT_COUNT > 2))
#define STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED 1 #define STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED 1
@@ -1437,29 +1437,29 @@ enum USBEndpointNumber_Out
#endif #endif
/* Useful for dropping lower part of macs in volume processing... */ /* Useful for dropping lower part of macs in volume processing... */
#if (FS_STREAM_FORMAT_INPUT_1_RESOLUTION_BITS > 24) || (FS_STREAM_FORMAT_INPUT_2_RESOLUTION_BITS > 24) #if (FS_STREAM_FORMAT_INPUT_1_RESOLUTION_BITS > 24) || (HS_STREAM_FORMAT_INPUT_1_RESOLUTION_BITS > 24)
#define STREAM_FORMAT_INPUT_RESOLUTION_32BIT_USED 1 #define STREAM_FORMAT_INPUT_RESOLUTION_32BIT_USED 1
#else #else
#define STREAM_FORMAT_INPUT_RESOLUTION_32BIT_USED 0 #define STREAM_FORMAT_INPUT_RESOLUTION_32BIT_USED 0
#endif #endif
#if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 4) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 4)) #if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 4) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 4))
#define STREAM_FORMAT_INPUT_SUBSLOT_4_USED 1 #define STREAM_FORMAT_INPUT_SUBSLOT_4_USED 1
#else #else
#define STREAM_FORMAT_INPUT_SUBSLOT_4_USED 0 #define STREAM_FORMAT_INPUT_SUBSLOT_4_USED 0
#endif #endif
#if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 3) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 3)) #if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 3) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 3))
#define STREAM_FORMAT_INPUT_SUBSLOT_3_USED 1 #define STREAM_FORMAT_INPUT_SUBSLOT_3_USED 1
#else #else
#define STREAM_FORMAT_INPUT_SUBSLOT_3_USED 0 #define STREAM_FORMAT_INPUT_SUBSLOT_3_USED 0
#endif #endif
#if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 2) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 2)) #if((FS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 2) || (HS_STREAM_FORMAT_INPUT_1_SUBSLOT_BYTES == 2))
#define STREAM_FORMAT_INPUT_SUBSLOT_2_USED 1 #define STREAM_FORMAT_INPUT_SUBSLOT_2_USED 1
#else #else
#define STREAM_FORMAT_INPUT_SUBSLOT_2_USED 0 #define STREAM_FORMAT_INPUT_SUBSLOT_2_USED 0
#endif #endif
#if MAX_FREQ < MIN_FREQ #if MAX_FREQ < MIN_FREQ
#error MAX_FREQ should be >= MIN_FREQ!! #error MAX_FREQ should be >= MIN_FREQ!!