summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2006-12-18 02:37:35 +0000
committerBarry Wardell <rockbox@barrywardell.net>2006-12-18 02:37:35 +0000
commitf2c03e827e6f6e83f1816039d01ff7ca2d55d0ad (patch)
tree8766ba59fe4422d891b34c4dddf9a183adab804a /firmware
parentcf887d6e682e58d566030a3cddc68978e5443369 (diff)
downloadrockbox-f2c03e827e6f6e83f1816039d01ff7ca2d55d0ad.tar.gz
rockbox-f2c03e827e6f6e83f1816039d01ff7ca2d55d0ad.zip
Fix more compile errors/warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11798 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/target/arm/audio-pp.c4
-rw-r--r--firmware/target/arm/pcm-pp.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/firmware/target/arm/audio-pp.c b/firmware/target/arm/audio-pp.c
index 8163295661..994b223d43 100644
--- a/firmware/target/arm/audio-pp.c
+++ b/firmware/target/arm/audio-pp.c
@@ -29,6 +29,7 @@ void audio_set_output_source(int source)
void audio_set_source(int source, unsigned flags)
{
+ (void)flags;
/* Prevent pops from unneeded switching */
static int last_source = AUDIO_SRC_PLAYBACK;
#ifdef CONFIG_TUNER
@@ -39,6 +40,7 @@ void audio_set_source(int source, unsigned flags)
{
default: /* playback - no recording */
source = AUDIO_SRC_PLAYBACK;
+#ifdef HAVE_RECORDING
case AUDIO_SRC_PLAYBACK:
if (source != last_source)
{
@@ -46,7 +48,6 @@ void audio_set_source(int source, unsigned flags)
audiohw_set_monitor(false);
}
break;
-
case AUDIO_SRC_MIC: /* recording only */
if (source != last_source)
{
@@ -62,6 +63,7 @@ void audio_set_source(int source, unsigned flags)
audiohw_set_monitor(false);
}
break;
+#endif
#ifdef CONFIG_TUNER
case AUDIO_SRC_FMRADIO: /* recording and playback */
if (!recording)
diff --git a/firmware/target/arm/pcm-pp.c b/firmware/target/arm/pcm-pp.c
index 77dedc1535..d05884e8eb 100644
--- a/firmware/target/arm/pcm-pp.c
+++ b/firmware/target/arm/pcm-pp.c
@@ -32,8 +32,10 @@
/* peaks */
+#ifdef HAVE_RECORDING
static unsigned long *rec_peak_addr;
static int rec_peak_left, rec_peak_right;
+#endif
/** DMA **/
#if CONFIG_CPU == PP5020
@@ -356,6 +358,7 @@ void pcm_init(void)
/****************************************************************************
** Recording DMA transfer
**/
+#ifdef HAVE_RECORDING
static short peak_l, peak_r IBSS_ATTR;
void fiq_record(void) ICODE_ATTR __attribute__ ((interrupt ("FIQ")));
@@ -502,6 +505,7 @@ void pcm_calculate_rec_peaks(int *left, int *right)
*left = rec_peak_left;
*right = rec_peak_right;
}
+#endif
/*
* This function goes directly into the DMA buffer to calculate the left and