diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2009-02-05 19:57:18 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2009-02-05 19:57:18 +0000 |
commit | ea7f1430960cc6ccc16f67fe43c95d2341033642 (patch) | |
tree | 68843470bb257523cda24d8ddf09ed088aea872f /firmware/export | |
parent | d8662489dc19592abccca44c0e1254584c6a0d29 (diff) | |
download | rockbox-ea7f1430960cc6ccc16f67fe43c95d2341033642.tar.gz rockbox-ea7f1430960cc6ccc16f67fe43c95d2341033642.zip |
FS#9611 - Sansa Clip radio code. Commit final part which enables the LINE2 input that carries the analog radio signal on ams sansas.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19927 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/as3514.h | 2 | ||||
-rw-r--r-- | firmware/export/audiohw.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h index aeabb16144..53851335c8 100644 --- a/firmware/export/as3514.h +++ b/firmware/export/as3514.h | |||
@@ -202,6 +202,8 @@ extern void audiohw_set_lineout_vol(int vol_l, int vol_r); | |||
202 | #define AUDIOSET1_LIN1_on (0x1 << 2) | 202 | #define AUDIOSET1_LIN1_on (0x1 << 2) |
203 | #define AUDIOSET1_MIC2_on (0x1 << 1) | 203 | #define AUDIOSET1_MIC2_on (0x1 << 1) |
204 | #define AUDIOSET1_MIC1_on (0x1 << 0) | 204 | #define AUDIOSET1_MIC1_on (0x1 << 0) |
205 | #define AUDIOSET1_INPUT_MASK AUDIOSET1_MIC1_on | AUDIOSET1_MIC2_on | \ | ||
206 | AUDIOSET1_LIN1_on | AUDIOSET1_LIN2_on | ||
205 | 207 | ||
206 | /* AUDIOSET2 (15h) */ | 208 | /* AUDIOSET2 (15h) */ |
207 | #define AUDIOSET2_BIAS_off (0x1 << 7) | 209 | #define AUDIOSET2_BIAS_off (0x1 << 7) |
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index 7dba54a8a2..b173feb77f 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h | |||
@@ -272,14 +272,17 @@ void audiohw_disable_recording(void); | |||
272 | */ | 272 | */ |
273 | void audiohw_set_recvol(int left, int right, int type); | 273 | void audiohw_set_recvol(int left, int right, int type); |
274 | 274 | ||
275 | #endif /*HAVE_RECORDING*/ | ||
276 | |||
277 | #if defined(HAVE_RECORDING) || defined(HAVE_FMRADIO_IN) | ||
278 | |||
275 | /** | 279 | /** |
276 | * Enable or disable recording monitor. | 280 | * Enable or disable recording monitor. |
277 | * @param enable ture or false. | 281 | * @param enable ture or false. |
278 | */ | 282 | */ |
279 | void audiohw_set_monitor(bool enable); | 283 | void audiohw_set_monitor(bool enable); |
280 | 284 | ||
281 | #endif /*HAVE_RECORDING*/ | 285 | #endif /* HAVE_RECORDING || HAVE_FMRADIO_IN */ |
282 | |||
283 | 286 | ||
284 | #if CONFIG_CODEC != SWCODEC | 287 | #if CONFIG_CODEC != SWCODEC |
285 | 288 | ||