From 1916aca7f3e76dd5440a9fa22ef4ea623bda8512 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sat, 3 Oct 2020 16:52:59 -0400 Subject: imx233: Enable 96/192K playback for all imx233 targets that have room Change-Id: Ief00cc9243af3168f0c088520936137b64f3b581 --- firmware/export/config/creativezen.h | 4 ++-- firmware/export/config/creativezenmozaic.h | 4 ++-- firmware/export/config/creativezenv.h | 4 ++-- firmware/export/config/creativezenxfi.h | 4 ++-- firmware/export/config/creativezenxfi2.h | 6 +++--- firmware/export/config/creativezenxfi3.h | 6 +++--- firmware/export/config/creativezenxfistyle.h | 6 ++++-- firmware/export/config/sansafuzeplus.h | 4 +++- firmware/export/config/sonynwze360.h | 10 +++------- firmware/export/config/sonynwze370.h | 4 ++-- firmware/export/fiiolinux_codec.h | 9 +++++++++ 11 files changed, 35 insertions(+), 26 deletions(-) create mode 100644 firmware/export/fiiolinux_codec.h (limited to 'firmware') diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h index bd1dd6c2b1..a3bb3a0ac6 100644 --- a/firmware/export/config/creativezen.h +++ b/firmware/export/config/creativezen.h @@ -11,12 +11,12 @@ /* Define if boot data from bootloader has been enabled for the target */ #define HAVE_BOOTDATA -#define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 /* define this if you have recording possibility */ #define HAVE_RECORDING -#define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Default recording levels */ #define DEFAULT_REC_MIC_GAIN 23 diff --git a/firmware/export/config/creativezenmozaic.h b/firmware/export/config/creativezenmozaic.h index 9272a7b412..77775f2eab 100644 --- a/firmware/export/config/creativezenmozaic.h +++ b/firmware/export/config/creativezenmozaic.h @@ -9,12 +9,12 @@ #define MODEL_NUMBER 87 #define MODEL_NAME "Creative ZEN Mozaic" -#define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 /* define this if you have recording possibility */ #define HAVE_RECORDING -#define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Default recording levels */ #define DEFAULT_REC_MIC_GAIN 23 diff --git a/firmware/export/config/creativezenv.h b/firmware/export/config/creativezenv.h index 5caf7c8c2b..bc05954264 100644 --- a/firmware/export/config/creativezenv.h +++ b/firmware/export/config/creativezenv.h @@ -9,12 +9,12 @@ #define MODEL_NUMBER 92 #define MODEL_NAME "Creative ZEN V" -#define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 /* define this if you have recording possibility */ #define HAVE_RECORDING -#define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Default recording levels */ #define DEFAULT_REC_MIC_GAIN 23 diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h index 604cf2c3cd..d384a45333 100644 --- a/firmware/export/config/creativezenxfi.h +++ b/firmware/export/config/creativezenxfi.h @@ -9,12 +9,12 @@ #define MODEL_NUMBER 86 #define MODEL_NAME "Creative Zen X-Fi" -#define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 /* define this if you have recording possibility */ #define HAVE_RECORDING -#define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Default recording levels */ #define DEFAULT_REC_MIC_GAIN 23 diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h index 171f5fb2b0..979ed4ab2d 100644 --- a/firmware/export/config/creativezenxfi2.h +++ b/firmware/export/config/creativezenxfi2.h @@ -11,12 +11,14 @@ /* Define if boot data from bootloader has been enabled for the target */ #define HAVE_BOOTDATA +// HW supports it but our buffers don't fit. +//#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 /* define this if you have recording possibility */ #define HAVE_RECORDING -#define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Default recording levels */ #define DEFAULT_REC_MIC_GAIN 23 @@ -27,8 +29,6 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - - /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h index 5f0914b9e4..f7acbf39bc 100644 --- a/firmware/export/config/creativezenxfi3.h +++ b/firmware/export/config/creativezenxfi3.h @@ -11,12 +11,14 @@ /* Define if boot data from bootloader has been enabled for the target */ #define HAVE_BOOTDATA +// HW supports it but our buffers don't fit. +//#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 /* define this if you have recording possibility */ #define HAVE_RECORDING -#define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Default recording levels */ #define DEFAULT_REC_MIC_GAIN 23 @@ -27,8 +29,6 @@ explicitly if different */ #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - - /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR diff --git a/firmware/export/config/creativezenxfistyle.h b/firmware/export/config/creativezenxfistyle.h index 33f459dba9..fe4e274b75 100644 --- a/firmware/export/config/creativezenxfistyle.h +++ b/firmware/export/config/creativezenxfistyle.h @@ -9,12 +9,14 @@ #define MODEL_NUMBER 94 #define MODEL_NAME "Creative Zen X-Fi Style" -#define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 +// HW can do it but we don't have the IRAM for mix buffers +//#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 +#define HW_SAMPR_CAPS SAMPR_CAP_ALL_96 /* define this if you have recording possibility */ #define HAVE_RECORDING -#define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Default recording levels */ #define DEFAULT_REC_MIC_GAIN 23 diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h index aeb9153fcc..4b3591931f 100644 --- a/firmware/export/config/sansafuzeplus.h +++ b/firmware/export/config/sansafuzeplus.h @@ -13,12 +13,14 @@ /* define boot redirect file name allows booting from external drives */ #define BOOT_REDIR "rockbox_main.fuze+" +// HW can do it but we don't have the IRAM for mix buffers +//#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 /* define this if you have recording possibility */ #define HAVE_RECORDING -#define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 +#define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Default recording levels */ #define DEFAULT_REC_MIC_GAIN 23 diff --git a/firmware/export/config/sonynwze360.h b/firmware/export/config/sonynwze360.h index 5b33d9d6d1..e52dbfcac3 100644 --- a/firmware/export/config/sonynwze360.h +++ b/firmware/export/config/sonynwze360.h @@ -11,14 +11,14 @@ /* Define if boot data from bootloader has been enabled for the target */ #define HAVE_BOOTDATA +// HW can do it but we don't have the IRAM for mix buffers +//#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 #define HW_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Define bitmask of input sources - recordable bitmask can be defined explicitly if different */ #define INPUT_SRC_CAPS SRC_CAP_FMRADIO - - /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR @@ -83,9 +83,6 @@ /* Define this to enable morse code input */ #define HAVE_MORSE_INPUT - - - /* LCD dimensions */ #define LCD_WIDTH 240 #define LCD_HEIGHT 320 @@ -189,5 +186,4 @@ #define BOOTDIR "/.rockbox" #define INCLUDE_TIMEOUT_API - - + diff --git a/firmware/export/config/sonynwze370.h b/firmware/export/config/sonynwze370.h index b20ab00550..5dd1c4bc9e 100644 --- a/firmware/export/config/sonynwze370.h +++ b/firmware/export/config/sonynwze370.h @@ -11,14 +11,14 @@ /* Define if boot data from bootloader has been enabled for the target */ #define HAVE_BOOTDATA +// HW can do it but we don't have the IRAM for mix buffers +//#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 #define HW_SAMPR_CAPS SAMPR_CAP_ALL_96 /* Define bitmask of input sources - recordable bitmask can be defined explicitly if different */ #define INPUT_SRC_CAPS SRC_CAP_FMRADIO - - /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR diff --git a/firmware/export/fiiolinux_codec.h b/firmware/export/fiiolinux_codec.h new file mode 100644 index 0000000000..22c2263046 --- /dev/null +++ b/firmware/export/fiiolinux_codec.h @@ -0,0 +1,9 @@ +#ifndef __FIIOLINUX_CODEC__ +#define __FIIOLINUX_CODEC__ + +#define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP) +AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -100, 0, -30) +AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 4, 0) +#endif + +void audiohw_mute(int mute); -- cgit v1.2.3