summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2008-07-16 11:02:14 +0000
committerBertrik Sikken <bertrik@sikken.nl>2008-07-16 11:02:14 +0000
commita12894c6dc53156ac6af2d270f1ce31f45a2aa17 (patch)
tree137c44085ed515db43cdfa6348453e34fcf6f509 /firmware/drivers
parenteb66b559e1566ffaf9ee7af6d19f7ea9b55fd2e5 (diff)
downloadrockbox-a12894c6dc53156ac6af2d270f1ce31f45a2aa17.tar.gz
rockbox-a12894c6dc53156ac6af2d270f1ce31f45a2aa17.zip
Ensure consistency between header file and implementation for iPod drivers, by #including the appropriate header file and #ifdef'fing out unused code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18066 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/audio/wm8731.c4
-rw-r--r--firmware/drivers/pcf50605.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c
index b9de5d4cf0..66bdfe014c 100644
--- a/firmware/drivers/audio/wm8731.c
+++ b/firmware/drivers/audio/wm8731.c
@@ -34,6 +34,7 @@
34#include "wmcodec.h" 34#include "wmcodec.h"
35#include "audiohw.h" 35#include "audiohw.h"
36#include "i2s.h" 36#include "i2s.h"
37#include "sound.h"
37 38
38const struct sound_settings_info audiohw_settings[] = { 39const struct sound_settings_info audiohw_settings[] = {
39 [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25}, 40 [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25},
@@ -236,6 +237,7 @@ void audiohw_set_sample_rate(int sampling_control)
236 codec_set_active(true); 237 codec_set_active(true);
237} 238}
238 239
240#ifdef HAVE_RECORDING
239void audiohw_enable_recording(bool source_mic) 241void audiohw_enable_recording(bool source_mic)
240{ 242{
241 codec_set_active(false); 243 codec_set_active(false);
@@ -331,3 +333,5 @@ void audiohw_set_monitor(bool enable)
331 wm8731_write_or(PDCTRL, PDCTRL_LINEINPD); 333 wm8731_write_or(PDCTRL, PDCTRL_LINEINPD);
332 } 334 }
333} 335}
336#endif /* HAVE_RECORDING */
337
diff --git a/firmware/drivers/pcf50605.c b/firmware/drivers/pcf50605.c
index 9192ec11b5..a76c1dbc3c 100644
--- a/firmware/drivers/pcf50605.c
+++ b/firmware/drivers/pcf50605.c
@@ -32,6 +32,7 @@
32#endif 32#endif
33#include "rtc.h" 33#include "rtc.h"
34#include "pcf5060x.h" 34#include "pcf5060x.h"
35#include "pcf50605.h"
35 36
36unsigned char pcf50605_wakeup_flags = 0; 37unsigned char pcf50605_wakeup_flags = 0;
37 38