diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config/mpiohd200.h | 32 | ||||
-rw-r--r-- | firmware/export/wm8751.h | 10 |
2 files changed, 21 insertions, 21 deletions
diff --git a/firmware/export/config/mpiohd200.h b/firmware/export/config/mpiohd200.h index 465154a4bd..b9e9b11e2d 100644 --- a/firmware/export/config/mpiohd200.h +++ b/firmware/export/config/mpiohd200.h | |||
@@ -14,26 +14,18 @@ | |||
14 | #define ATA_SWAP_WORDS | 14 | #define ATA_SWAP_WORDS |
15 | 15 | ||
16 | /* define this if you have recording possibility */ | 16 | /* define this if you have recording possibility */ |
17 | /* not implemented yet | 17 | #define HAVE_RECORDING |
18 | * #define HAVE_RECORDING | ||
19 | */ | ||
20 | |||
21 | 18 | ||
22 | /* Define bitmask of input sources - recordable bitmask can be defined | 19 | /* Define bitmask of input sources - recordable bitmask can be defined |
23 | * explicitly if different | 20 | * explicitly if different |
24 | * not implemented yet | ||
25 | */ | 21 | */ |
26 | |||
27 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) | 22 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) |
28 | 23 | ||
29 | |||
30 | /* define the bitmask of hardware sample rates */ | 24 | /* define the bitmask of hardware sample rates */ |
31 | #define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | 25 | #define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
32 | 26 | ||
33 | /* define the bitmask of recording sample rates | 27 | /* define the bitmask of recording sample rates */ |
34 | * not implemented yet | 28 | #define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) |
35 | *#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) | ||
36 | */ | ||
37 | 29 | ||
38 | /* define this if you have a bitmap LCD display */ | 30 | /* define this if you have a bitmap LCD display */ |
39 | #define HAVE_LCD_BITMAP | 31 | #define HAVE_LCD_BITMAP |
@@ -114,9 +106,17 @@ | |||
114 | #define CONFIG_TUNER_XTAL 32768 | 106 | #define CONFIG_TUNER_XTAL 32768 |
115 | 107 | ||
116 | 108 | ||
117 | /* we have WM8750 codec in I2S slave mode */ | 109 | /* we have WM8750 codec in I2S master mode */ |
118 | #define HAVE_WM8750 | 110 | #define HAVE_WM8750 |
119 | #define CODEC_SLAVE | 111 | |
112 | /* clocking setup based on 11.2896 MHz master clock | ||
113 | * provided to the codec by MCU | ||
114 | * WM8750L Datasheet Table 40, page 46 | ||
115 | */ | ||
116 | #define CODEC_SRCTRL_11025HZ (0x18 << 1) | ||
117 | #define CODEC_SRCTRL_22050HZ (0x1A << 1) | ||
118 | #define CODEC_SRCTRL_44100HZ (0x10 << 1) | ||
119 | #define CODEC_SRCTRL_88200HZ (0x1E << 1) | ||
120 | 120 | ||
121 | #define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */ | 121 | #define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */ |
122 | #define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ | 122 | #define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ |
@@ -142,12 +142,6 @@ | |||
142 | /* Define this if you want to use coldfire's i2c interface */ | 142 | /* Define this if you want to use coldfire's i2c interface */ |
143 | #define CONFIG_I2C I2C_COLDFIRE | 143 | #define CONFIG_I2C I2C_COLDFIRE |
144 | 144 | ||
145 | /* OF resets device instead of poweroff while charging | ||
146 | * this triggers bootloader code which takes care of charging. | ||
147 | * I have feeling that powering off while charging may cause | ||
148 | * partition table corruption I am experiencing from time to time | ||
149 | */ | ||
150 | |||
151 | /* define this if the hardware can be powered off while charging */ | 145 | /* define this if the hardware can be powered off while charging */ |
152 | /* #define HAVE_POWEROFF_WHILE_CHARGING */ | 146 | /* #define HAVE_POWEROFF_WHILE_CHARGING */ |
153 | 147 | ||
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h index 8992c88076..7a3a3075af 100644 --- a/firmware/export/wm8751.h +++ b/firmware/export/wm8751.h | |||
@@ -25,13 +25,19 @@ | |||
25 | #define VOLUME_MIN -730 | 25 | #define VOLUME_MIN -730 |
26 | #define VOLUME_MAX 60 | 26 | #define VOLUME_MAX 60 |
27 | 27 | ||
28 | /* turn off 3D Enchance feature of WM8750 for now | ||
29 | #if defined(HAVE_WM8750) | ||
30 | #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP | DEPTH_3D_CAP) | ||
31 | #else | ||
32 | */ | ||
28 | #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP) | 33 | #define AUDIOHW_CAPS (BASS_CAP | TREBLE_CAP | PRESCALER_CAP) |
34 | /* #endif */ | ||
29 | 35 | ||
30 | extern int tenthdb2master(int db); | 36 | extern int tenthdb2master(int db); |
31 | 37 | ||
32 | extern void audiohw_set_master_vol(int vol_l, int vol_r); | 38 | extern void audiohw_set_master_vol(int vol_l, int vol_r); |
33 | extern void audiohw_set_lineout_vol(int vol_l, int vol_r); | 39 | extern void audiohw_set_lineout_vol(int vol_l, int vol_r); |
34 | #if defined(HAVE_WM8750) | 40 | #if defined(HAVE_WM8750) && defined(HAVE_RECORDING) |
35 | void audiohw_set_recsrc(int source, bool recording); | 41 | void audiohw_set_recsrc(int source, bool recording); |
36 | #endif | 42 | #endif |
37 | 43 | ||
@@ -222,7 +228,7 @@ void audiohw_set_recsrc(int source, bool recording); | |||
222 | #define ADCL_LMICBOOST_13DB (1 << 4) | 228 | #define ADCL_LMICBOOST_13DB (1 << 4) |
223 | #define ADCL_LMICBOOST_20DB (2 << 4) | 229 | #define ADCL_LMICBOOST_20DB (2 << 4) |
224 | #define ADCL_LMICBOOST_29DB (3 << 4) | 230 | #define ADCL_LMICBOOST_29DB (3 << 4) |
225 | #define ADCL_LMICBOOST(x) ((x) & (0x3 << 7)) | 231 | #define ADCL_LMICBOOST(x) (((x) & 0x3) << 4)) |
226 | #define ADCL_LINSEL_LINPUT1 (0 << 6) | 232 | #define ADCL_LINSEL_LINPUT1 (0 << 6) |
227 | #define ADCL_LINSEL_LINPUT2 (1 << 6) | 233 | #define ADCL_LINSEL_LINPUT2 (1 << 6) |
228 | #define ADCL_LINSEL_LINPUT3 (2 << 6) | 234 | #define ADCL_LINSEL_LINPUT3 (2 << 6) |