From 2b358ffa7f65d3e67ae58a2f076477dae5bf67d5 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sat, 3 Oct 2020 15:27:30 -0400 Subject: [PATCH] Disable 88/96KHz from targets that lack the IRAM to hold the mix buffers Change-Id: I67b15d4c517a74a23639f8659acbc89022c264b5 --- firmware/export/config/gogearhdd1630.h | 7 ++----- firmware/export/config/iaudiom5.h | 7 ++----- firmware/export/config/ipodmini1g.h | 5 +---- firmware/export/config/ipodmini2g.h | 5 +---- firmware/export/config/iriverh10.h | 7 ++----- firmware/export/config/iriverh100.h | 8 +------- firmware/export/config/iriverh120.h | 8 +------- firmware/export/config/vibe500.h | 7 ++----- 8 files changed, 12 insertions(+), 42 deletions(-) diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h index e1e40cee0b..4c56646dbf 100644 --- a/firmware/export/config/gogearhdd1630.h +++ b/firmware/export/config/gogearhdd1630.h @@ -20,16 +20,13 @@ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) /* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ +#define HW_SAMPR_CAPS (/*SAMPR_CAP_96 | SAMPR_CAP_88 |*/ SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) /* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ +#define REC_SAMPR_CAPS (/*SAMPR_CAP_96 | SAMPR_CAP_88 |*/ SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - - - /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config/iaudiom5.h index a597590508..a90b0f061b 100644 --- a/firmware/export/config/iaudiom5.h +++ b/firmware/export/config/iaudiom5.h @@ -25,13 +25,10 @@ #endif /* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) +#define HW_SAMPR_CAPS (/*SAMPR_CAP_88* |*/ SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) /* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - - - +#define REC_SAMPR_CAPS (/*SAMPR_CAP_88 |*/ SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) /* define this if you want album art for this target */ #define HAVE_ALBUMART diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h index abcf237aa9..b8f52ff936 100644 --- a/firmware/export/config/ipodmini1g.h +++ b/firmware/export/config/ipodmini1g.h @@ -21,16 +21,13 @@ #define INPUT_SRC_CAPS (SRC_CAP_FMRADIO) /* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ +#define HW_SAMPR_CAPS (/*SAMPR_CAP_96 | SAMPR_CAP_88 |*/ SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) /* define the bitmask of recording sample rates #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ - - - /* define this if you want album art for this target */ #define HAVE_ALBUMART diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h index f11681978c..c1cd45310c 100644 --- a/firmware/export/config/ipodmini2g.h +++ b/firmware/export/config/ipodmini2g.h @@ -21,16 +21,13 @@ #define INPUT_SRC_CAPS (SRC_CAP_FMRADIO) /* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ +#define HW_SAMPR_CAPS (/*SAMPR_CAP_96 | SAMPR_CAP_88 |*/ SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) /* define the bitmask of recording sample rates #define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ - - - /* define this if you want album art for this target */ #define HAVE_ALBUMART diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h index 91ed963b0b..6342a90deb 100644 --- a/firmware/export/config/iriverh10.h +++ b/firmware/export/config/iriverh10.h @@ -19,16 +19,13 @@ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) /* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ +#define HW_SAMPR_CAPS (/*SAMPR_CAP_96 | SAMPR_CAP_88 |*/ SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) /* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ +#define REC_SAMPR_CAPS (/*SAMPR_CAP_96 | SAMPR_CAP_88 |*/ SAMPR_CAP_48 | \ SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - - - /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h index 3cff24de4f..bbfab01ba5 100644 --- a/firmware/export/config/iriverh100.h +++ b/firmware/export/config/iriverh100.h @@ -14,9 +14,6 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 - - - /* define this if you want album art for this target */ #define HAVE_ALBUMART @@ -73,9 +70,6 @@ /* Define this to enable morse code input */ #define HAVE_MORSE_INPUT - - - /* Define this if you have an remote lcd */ #define HAVE_REMOTE_LCD @@ -114,7 +108,7 @@ #define HAVE_RECORDING /* define hardware samples rate caps mask */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) +#define HW_SAMPR_CAPS (/*SAMPR_CAP_88 |*/ SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h index 70670a0418..77ee1382be 100644 --- a/firmware/export/config/iriverh120.h +++ b/firmware/export/config/iriverh120.h @@ -14,9 +14,6 @@ /*define this if the ATA controller and method of USB access support LBA48 */ #define HAVE_LBA48 - - - /* define this if you want album art for this target */ #define HAVE_ALBUMART @@ -73,9 +70,6 @@ /* Define this to enable morse code input */ #define HAVE_MORSE_INPUT - - - /* define this if you have a disk storage, i.e. something that needs spinups and can cause skips when shaked */ #define HAVE_DISK_STORAGE @@ -121,7 +115,7 @@ SRC_CAP_FMRADIO | SRC_CAP_SPDIF) /* define hardware samples rate caps mask */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) +#define HW_SAMPR_CAPS (/*SAMPR_CAP_88 |*/ SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) /* define the bitmask of recording sample rates */ #define REC_SAMPR_CAPS (SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h index 0444a2e065..edbc1e321a 100644 --- a/firmware/export/config/vibe500.h +++ b/firmware/export/config/vibe500.h @@ -20,13 +20,10 @@ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN) /* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) +#define HW_SAMPR_CAPS (/*SAMPR_CAP_88 |*/ SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) /* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - - - +#define REC_SAMPR_CAPS (/*SAMPR_CAP_88 |*/ SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) /* define this if you can flip your LCD */ #define HAVE_LCD_FLIP