diff options
-rw-r--r-- | firmware/export/config/creativezen.h | 4 | ||||
-rw-r--r-- | firmware/export/config/creativezenmozaic.h | 4 | ||||
-rw-r--r-- | firmware/export/config/creativezenv.h | 4 | ||||
-rw-r--r-- | firmware/export/config/creativezenxfi.h | 4 | ||||
-rw-r--r-- | firmware/export/config/creativezenxfi2.h | 6 | ||||
-rw-r--r-- | firmware/export/config/creativezenxfi3.h | 6 | ||||
-rw-r--r-- | firmware/export/config/creativezenxfistyle.h | 6 | ||||
-rw-r--r-- | firmware/export/config/sansafuzeplus.h | 4 | ||||
-rw-r--r-- | firmware/export/config/sonynwze360.h | 10 | ||||
-rw-r--r-- | firmware/export/config/sonynwze370.h | 4 | ||||
-rw-r--r-- | firmware/export/fiiolinux_codec.h | 9 |
11 files changed, 35 insertions, 26 deletions
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 @@ | |||
11 | /* Define if boot data from bootloader has been enabled for the target */ | 11 | /* Define if boot data from bootloader has been enabled for the target */ |
12 | #define HAVE_BOOTDATA | 12 | #define HAVE_BOOTDATA |
13 | 13 | ||
14 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 | 14 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 |
15 | 15 | ||
16 | /* define this if you have recording possibility */ | 16 | /* define this if you have recording possibility */ |
17 | #define HAVE_RECORDING | 17 | #define HAVE_RECORDING |
18 | 18 | ||
19 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 | 19 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 |
20 | 20 | ||
21 | /* Default recording levels */ | 21 | /* Default recording levels */ |
22 | #define DEFAULT_REC_MIC_GAIN 23 | 22 | #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 @@ | |||
9 | #define MODEL_NUMBER 87 | 9 | #define MODEL_NUMBER 87 |
10 | #define MODEL_NAME "Creative ZEN Mozaic" | 10 | #define MODEL_NAME "Creative ZEN Mozaic" |
11 | 11 | ||
12 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 | 12 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 |
13 | 13 | ||
14 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
15 | #define HAVE_RECORDING | 15 | #define HAVE_RECORDING |
16 | 16 | ||
17 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 | 17 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 |
18 | 18 | ||
19 | /* Default recording levels */ | 19 | /* Default recording levels */ |
20 | #define DEFAULT_REC_MIC_GAIN 23 | 20 | #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 @@ | |||
9 | #define MODEL_NUMBER 92 | 9 | #define MODEL_NUMBER 92 |
10 | #define MODEL_NAME "Creative ZEN V" | 10 | #define MODEL_NAME "Creative ZEN V" |
11 | 11 | ||
12 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 | 12 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 |
13 | 13 | ||
14 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
15 | #define HAVE_RECORDING | 15 | #define HAVE_RECORDING |
16 | 16 | ||
17 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 | 17 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 |
18 | 18 | ||
19 | /* Default recording levels */ | 19 | /* Default recording levels */ |
20 | #define DEFAULT_REC_MIC_GAIN 23 | 20 | #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 @@ | |||
9 | #define MODEL_NUMBER 86 | 9 | #define MODEL_NUMBER 86 |
10 | #define MODEL_NAME "Creative Zen X-Fi" | 10 | #define MODEL_NAME "Creative Zen X-Fi" |
11 | 11 | ||
12 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 | 12 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 |
13 | 13 | ||
14 | /* define this if you have recording possibility */ | 14 | /* define this if you have recording possibility */ |
15 | #define HAVE_RECORDING | 15 | #define HAVE_RECORDING |
16 | 16 | ||
17 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 | 17 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 |
18 | 18 | ||
19 | /* Default recording levels */ | 19 | /* Default recording levels */ |
20 | #define DEFAULT_REC_MIC_GAIN 23 | 20 | #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 @@ | |||
11 | /* Define if boot data from bootloader has been enabled for the target */ | 11 | /* Define if boot data from bootloader has been enabled for the target */ |
12 | #define HAVE_BOOTDATA | 12 | #define HAVE_BOOTDATA |
13 | 13 | ||
14 | // HW supports it but our buffers don't fit. | ||
15 | //#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 | ||
14 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 | 16 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 |
15 | 17 | ||
16 | /* define this if you have recording possibility */ | 18 | /* define this if you have recording possibility */ |
17 | #define HAVE_RECORDING | 19 | #define HAVE_RECORDING |
18 | 20 | ||
19 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 | 21 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 |
20 | 22 | ||
21 | /* Default recording levels */ | 23 | /* Default recording levels */ |
22 | #define DEFAULT_REC_MIC_GAIN 23 | 24 | #define DEFAULT_REC_MIC_GAIN 23 |
@@ -27,8 +29,6 @@ | |||
27 | explicitly if different */ | 29 | explicitly if different */ |
28 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 30 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
29 | 31 | ||
30 | |||
31 | |||
32 | /* define this if you have a colour LCD */ | 32 | /* define this if you have a colour LCD */ |
33 | #define HAVE_LCD_COLOR | 33 | #define HAVE_LCD_COLOR |
34 | 34 | ||
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 @@ | |||
11 | /* Define if boot data from bootloader has been enabled for the target */ | 11 | /* Define if boot data from bootloader has been enabled for the target */ |
12 | #define HAVE_BOOTDATA | 12 | #define HAVE_BOOTDATA |
13 | 13 | ||
14 | // HW supports it but our buffers don't fit. | ||
15 | //#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 | ||
14 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 | 16 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 |
15 | 17 | ||
16 | /* define this if you have recording possibility */ | 18 | /* define this if you have recording possibility */ |
17 | #define HAVE_RECORDING | 19 | #define HAVE_RECORDING |
18 | 20 | ||
19 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 | 21 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 |
20 | 22 | ||
21 | /* Default recording levels */ | 23 | /* Default recording levels */ |
22 | #define DEFAULT_REC_MIC_GAIN 23 | 24 | #define DEFAULT_REC_MIC_GAIN 23 |
@@ -27,8 +29,6 @@ | |||
27 | explicitly if different */ | 29 | explicitly if different */ |
28 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 30 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) |
29 | 31 | ||
30 | |||
31 | |||
32 | /* define this if you have a colour LCD */ | 32 | /* define this if you have a colour LCD */ |
33 | #define HAVE_LCD_COLOR | 33 | #define HAVE_LCD_COLOR |
34 | 34 | ||
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 @@ | |||
9 | #define MODEL_NUMBER 94 | 9 | #define MODEL_NUMBER 94 |
10 | #define MODEL_NAME "Creative Zen X-Fi Style" | 10 | #define MODEL_NAME "Creative Zen X-Fi Style" |
11 | 11 | ||
12 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 | 12 | // HW can do it but we don't have the IRAM for mix buffers |
13 | //#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 | ||
14 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_96 | ||
13 | 15 | ||
14 | /* define this if you have recording possibility */ | 16 | /* define this if you have recording possibility */ |
15 | #define HAVE_RECORDING | 17 | #define HAVE_RECORDING |
16 | 18 | ||
17 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 | 19 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 |
18 | 20 | ||
19 | /* Default recording levels */ | 21 | /* Default recording levels */ |
20 | #define DEFAULT_REC_MIC_GAIN 23 | 22 | #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 @@ | |||
13 | /* define boot redirect file name allows booting from external drives */ | 13 | /* define boot redirect file name allows booting from external drives */ |
14 | #define BOOT_REDIR "rockbox_main.fuze+" | 14 | #define BOOT_REDIR "rockbox_main.fuze+" |
15 | 15 | ||
16 | // HW can do it but we don't have the IRAM for mix buffers | ||
17 | //#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 | ||
16 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 | 18 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_48 |
17 | 19 | ||
18 | /* define this if you have recording possibility */ | 20 | /* define this if you have recording possibility */ |
19 | #define HAVE_RECORDING | 21 | #define HAVE_RECORDING |
20 | 22 | ||
21 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_48 | 23 | #define REC_SAMPR_CAPS SAMPR_CAP_ALL_96 |
22 | 24 | ||
23 | /* Default recording levels */ | 25 | /* Default recording levels */ |
24 | #define DEFAULT_REC_MIC_GAIN 23 | 26 | #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 @@ | |||
11 | /* Define if boot data from bootloader has been enabled for the target */ | 11 | /* Define if boot data from bootloader has been enabled for the target */ |
12 | #define HAVE_BOOTDATA | 12 | #define HAVE_BOOTDATA |
13 | 13 | ||
14 | // HW can do it but we don't have the IRAM for mix buffers | ||
15 | //#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 | ||
14 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_96 | 16 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_96 |
15 | 17 | ||
16 | /* Define bitmask of input sources - recordable bitmask can be defined | 18 | /* Define bitmask of input sources - recordable bitmask can be defined |
17 | explicitly if different */ | 19 | explicitly if different */ |
18 | #define INPUT_SRC_CAPS SRC_CAP_FMRADIO | 20 | #define INPUT_SRC_CAPS SRC_CAP_FMRADIO |
19 | 21 | ||
20 | |||
21 | |||
22 | /* define this if you have a colour LCD */ | 22 | /* define this if you have a colour LCD */ |
23 | #define HAVE_LCD_COLOR | 23 | #define HAVE_LCD_COLOR |
24 | 24 | ||
@@ -83,9 +83,6 @@ | |||
83 | /* Define this to enable morse code input */ | 83 | /* Define this to enable morse code input */ |
84 | #define HAVE_MORSE_INPUT | 84 | #define HAVE_MORSE_INPUT |
85 | 85 | ||
86 | |||
87 | |||
88 | |||
89 | /* LCD dimensions */ | 86 | /* LCD dimensions */ |
90 | #define LCD_WIDTH 240 | 87 | #define LCD_WIDTH 240 |
91 | #define LCD_HEIGHT 320 | 88 | #define LCD_HEIGHT 320 |
@@ -189,5 +186,4 @@ | |||
189 | #define BOOTDIR "/.rockbox" | 186 | #define BOOTDIR "/.rockbox" |
190 | 187 | ||
191 | #define INCLUDE_TIMEOUT_API | 188 | #define INCLUDE_TIMEOUT_API |
192 | 189 | ||
193 | |||
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 @@ | |||
11 | /* Define if boot data from bootloader has been enabled for the target */ | 11 | /* Define if boot data from bootloader has been enabled for the target */ |
12 | #define HAVE_BOOTDATA | 12 | #define HAVE_BOOTDATA |
13 | 13 | ||
14 | // HW can do it but we don't have the IRAM for mix buffers | ||
15 | //#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 | ||
14 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_96 | 16 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_96 |
15 | 17 | ||
16 | /* Define bitmask of input sources - recordable bitmask can be defined | 18 | /* Define bitmask of input sources - recordable bitmask can be defined |
17 | explicitly if different */ | 19 | explicitly if different */ |
18 | #define INPUT_SRC_CAPS SRC_CAP_FMRADIO | 20 | #define INPUT_SRC_CAPS SRC_CAP_FMRADIO |
19 | 21 | ||
20 | |||
21 | |||
22 | /* define this if you have a colour LCD */ | 22 | /* define this if you have a colour LCD */ |
23 | #define HAVE_LCD_COLOR | 23 | #define HAVE_LCD_COLOR |
24 | 24 | ||
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 @@ | |||
1 | #ifndef __FIIOLINUX_CODEC__ | ||
2 | #define __FIIOLINUX_CODEC__ | ||
3 | |||
4 | #define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP) | ||
5 | AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -100, 0, -30) | ||
6 | AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 4, 0) | ||
7 | #endif | ||
8 | |||
9 | void audiohw_mute(int mute); | ||