From 4bbaef6fd50be130e2232770eee46f975817313d Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 12 Dec 2008 11:20:58 +0000 Subject: Fix-m the ruddiness. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19401 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/audio/tlv320.c | 8 ++++---- firmware/drivers/audio/tsc2100.c | 2 +- firmware/drivers/audio/wm8758.c | 2 +- firmware/target/arm/audio-pp.c | 4 ++-- firmware/target/arm/pcm-telechips.c | 2 -- firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c | 2 -- 6 files changed, 8 insertions(+), 12 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/audio/tlv320.c b/firmware/drivers/audio/tlv320.c index c85627e683..753a2453c3 100644 --- a/firmware/drivers/audio/tlv320.c +++ b/firmware/drivers/audio/tlv320.c @@ -157,10 +157,10 @@ void audiohw_set_frequency(int fsel) /* All rates available for 11.2896MHz besides 8.021 */ static const unsigned char values_src[HW_NUM_FREQ] = { - [HW_FREQ_11] = (0x8 << 2) | SRC_CLKIN, - [HW_FREQ_22] = (0x8 << 2) | SRC_CLKIN, - [HW_FREQ_44] = (0x8 << 2), - [HW_FREQ_88] = (0xf << 2), + HW_HAVE_11_([HW_FREQ_11] = (0x8 << 2) | SRC_CLKIN,) + HW_HAVE_22_([HW_FREQ_22] = (0x8 << 2) | SRC_CLKIN,) + HW_HAVE_44_([HW_FREQ_44] = (0x8 << 2),) + HW_HAVE_88_([HW_FREQ_88] = (0xf << 2),) }; unsigned value_dap, value_pc; diff --git a/firmware/drivers/audio/tsc2100.c b/firmware/drivers/audio/tsc2100.c index 11f30a8560..ca7f22d097 100644 --- a/firmware/drivers/audio/tsc2100.c +++ b/firmware/drivers/audio/tsc2100.c @@ -131,6 +131,6 @@ void audiohw_close(void) } void audiohw_set_frequency(int fsel) - +{ (void)fsel; } diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c index defc415f98..b8bf0906e3 100644 --- a/firmware/drivers/audio/wm8758.c +++ b/firmware/drivers/audio/wm8758.c @@ -107,7 +107,7 @@ void audiohw_preinit(void) wmcodec_write(OUTCTRL, OUTCTRL_VROI); wmcodec_write(CLKCTRL, CLKCTRL_MS); /* WM8758 is clock master */ - audiohw_set_sample_rate(HW_FREQ_44); + audiohw_set_frequency(HW_FREQ_44); wmcodec_write(LOUTMIX, LOUTMIX_DACL2LMIX); wmcodec_write(ROUTMIX, ROUTMIX_DACR2RMIX); diff --git a/firmware/target/arm/audio-pp.c b/firmware/target/arm/audio-pp.c index b170518af4..1a4952fcc3 100644 --- a/firmware/target/arm/audio-pp.c +++ b/firmware/target/arm/audio-pp.c @@ -35,7 +35,7 @@ void audio_input_mux(int source, unsigned flags) (void)flags; /* Prevent pops from unneeded switching */ static int last_source = AUDIO_SRC_PLAYBACK; -#ifdef HAVE_FMRADIO_REC +#ifdef HAVE_FMRADIO_REC bool recording = flags & SRCF_RECORDING; static bool last_recording = false; #endif @@ -43,7 +43,7 @@ void audio_input_mux(int source, unsigned flags) #if defined(IPOD_COLOR) || defined (IPOD_4G) /* The usual magic from IPL - I'm guessing this configures the headphone socket to be input or output. */ - if (recording && source != AUDIO_SRC_PLAYBACK) + if ((flags & SRCF_RECORDING) && source != AUDIO_SRC_PLAYBACK) { /* input */ GPIO_CLEAR_BITWISE(GPIOI_OUTPUT_VAL, 0x40); diff --git a/firmware/target/arm/pcm-telechips.c b/firmware/target/arm/pcm-telechips.c index a4dc63fc56..823eb3a3a5 100644 --- a/firmware/target/arm/pcm-telechips.c +++ b/firmware/target/arm/pcm-telechips.c @@ -58,8 +58,6 @@ struct dma_data dma_play_data SHAREDBSS_ATTR = .state = 0 }; -static unsigned long pcm_sampr SHAREDDATA_ATTR = HW_SAMPR_DEFAULT; /* 44.1 is default */ - void pcm_postinit(void) { audiohw_postinit(); diff --git a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c index d8c953bbce..9e2e73e0fc 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c @@ -28,8 +28,6 @@ #include "audiohw.h" #include "dsp-target.h" -static int pcm_fsel = HW_FREQ_DEFAULT; - void pcm_play_dma_init(void) { IO_CLK_O1DIV = 3; -- cgit v1.2.3