devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix more compile errors/warnings.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11798 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Barry Wardell 2006-12-18 02:37:35 +00:00
parent cf887d6e68
commit f2c03e827e
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/target/arm/audio-pp.c
View file

@ -29,6 +29,7 @@ void audio_set_output_source(int source)
void audio_set_source(int source, unsigned flags) void audio_set_source(int source, unsigned flags)
{ {
(void)flags;
/* Prevent pops from unneeded switching */ /* Prevent pops from unneeded switching */
static int last_source = AUDIO_SRC_PLAYBACK; static int last_source = AUDIO_SRC_PLAYBACK;
#ifdef CONFIG_TUNER #ifdef CONFIG_TUNER
@ -39,6 +40,7 @@ void audio_set_source(int source, unsigned flags)
{ {
default: /* playback - no recording */ default: /* playback - no recording */
source = AUDIO_SRC_PLAYBACK; source = AUDIO_SRC_PLAYBACK;
#ifdef HAVE_RECORDING
case AUDIO_SRC_PLAYBACK: case AUDIO_SRC_PLAYBACK:
if (source != last_source) if (source != last_source)
{ {
@ -46,7 +48,6 @@ void audio_set_source(int source, unsigned flags)
audiohw_set_monitor(false); audiohw_set_monitor(false);
} }
break; break;
case AUDIO_SRC_MIC: /* recording only */ case AUDIO_SRC_MIC: /* recording only */
if (source != last_source) if (source != last_source)
{ {
@ -62,6 +63,7 @@ void audio_set_source(int source, unsigned flags)
audiohw_set_monitor(false); audiohw_set_monitor(false);
} }
break; break;
#endif
#ifdef CONFIG_TUNER #ifdef CONFIG_TUNER
case AUDIO_SRC_FMRADIO: /* recording and playback */ case AUDIO_SRC_FMRADIO: /* recording and playback */
if (!recording) if (!recording)

4
firmware/target/arm/pcm-pp.c
View file

@ -32,8 +32,10 @@
/* peaks */ /* peaks */
#ifdef HAVE_RECORDING
static unsigned long *rec_peak_addr; static unsigned long *rec_peak_addr;
static int rec_peak_left, rec_peak_right; static int rec_peak_left, rec_peak_right;
#endif
/** DMA **/ /** DMA **/
#if CONFIG_CPU == PP5020 #if CONFIG_CPU == PP5020
@ -356,6 +358,7 @@ void pcm_init(void)
/**************************************************************************** /****************************************************************************
** Recording DMA transfer ** Recording DMA transfer
**/ **/
#ifdef HAVE_RECORDING
static short peak_l, peak_r IBSS_ATTR; static short peak_l, peak_r IBSS_ATTR;
void fiq_record(void) ICODE_ATTR __attribute__ ((interrupt ("FIQ"))); 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; *left = rec_peak_left;
*right = rec_peak_right; *right = rec_peak_right;
} }
#endif
/* /*
* This function goes directly into the DMA buffer to calculate the left and * This function goes directly into the DMA buffer to calculate the left and