diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-12-12 11:20:58 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-12-12 11:20:58 +0000 |
commit | 4bbaef6fd50be130e2232770eee46f975817313d (patch) | |
tree | 5388528914b1408a9333e90ef3bf6c203453111a | |
parent | e69d567d9ebf7d236ff9663b11ac396cc71dcd75 (diff) | |
download | rockbox-4bbaef6fd50be130e2232770eee46f975817313d.tar.gz rockbox-4bbaef6fd50be130e2232770eee46f975817313d.zip |
Fix-m the ruddiness.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19401 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/audio/tlv320.c | 8 | ||||
-rw-r--r-- | firmware/drivers/audio/tsc2100.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8758.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/audio-pp.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/pcm-telechips.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/pcm-creativezvm.c | 2 |
6 files changed, 8 insertions, 12 deletions
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) | |||
157 | /* All rates available for 11.2896MHz besides 8.021 */ | 157 | /* All rates available for 11.2896MHz besides 8.021 */ |
158 | static const unsigned char values_src[HW_NUM_FREQ] = | 158 | static const unsigned char values_src[HW_NUM_FREQ] = |
159 | { | 159 | { |
160 | [HW_FREQ_11] = (0x8 << 2) | SRC_CLKIN, | 160 | HW_HAVE_11_([HW_FREQ_11] = (0x8 << 2) | SRC_CLKIN,) |
161 | [HW_FREQ_22] = (0x8 << 2) | SRC_CLKIN, | 161 | HW_HAVE_22_([HW_FREQ_22] = (0x8 << 2) | SRC_CLKIN,) |
162 | [HW_FREQ_44] = (0x8 << 2), | 162 | HW_HAVE_44_([HW_FREQ_44] = (0x8 << 2),) |
163 | [HW_FREQ_88] = (0xf << 2), | 163 | HW_HAVE_88_([HW_FREQ_88] = (0xf << 2),) |
164 | }; | 164 | }; |
165 | 165 | ||
166 | unsigned value_dap, value_pc; | 166 | 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) | |||
131 | } | 131 | } |
132 | 132 | ||
133 | void audiohw_set_frequency(int fsel) | 133 | void audiohw_set_frequency(int fsel) |
134 | 134 | { | |
135 | (void)fsel; | 135 | (void)fsel; |
136 | } | 136 | } |
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) | |||
107 | wmcodec_write(OUTCTRL, OUTCTRL_VROI); | 107 | wmcodec_write(OUTCTRL, OUTCTRL_VROI); |
108 | wmcodec_write(CLKCTRL, CLKCTRL_MS); /* WM8758 is clock master */ | 108 | wmcodec_write(CLKCTRL, CLKCTRL_MS); /* WM8758 is clock master */ |
109 | 109 | ||
110 | audiohw_set_sample_rate(HW_FREQ_44); | 110 | audiohw_set_frequency(HW_FREQ_44); |
111 | 111 | ||
112 | wmcodec_write(LOUTMIX, LOUTMIX_DACL2LMIX); | 112 | wmcodec_write(LOUTMIX, LOUTMIX_DACL2LMIX); |
113 | wmcodec_write(ROUTMIX, ROUTMIX_DACR2RMIX); | 113 | 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) | |||
35 | (void)flags; | 35 | (void)flags; |
36 | /* Prevent pops from unneeded switching */ | 36 | /* Prevent pops from unneeded switching */ |
37 | static int last_source = AUDIO_SRC_PLAYBACK; | 37 | static int last_source = AUDIO_SRC_PLAYBACK; |
38 | #ifdef HAVE_FMRADIO_REC | 38 | #ifdef HAVE_FMRADIO_REC |
39 | bool recording = flags & SRCF_RECORDING; | 39 | bool recording = flags & SRCF_RECORDING; |
40 | static bool last_recording = false; | 40 | static bool last_recording = false; |
41 | #endif | 41 | #endif |
@@ -43,7 +43,7 @@ void audio_input_mux(int source, unsigned flags) | |||
43 | #if defined(IPOD_COLOR) || defined (IPOD_4G) | 43 | #if defined(IPOD_COLOR) || defined (IPOD_4G) |
44 | /* The usual magic from IPL - I'm guessing this configures the headphone | 44 | /* The usual magic from IPL - I'm guessing this configures the headphone |
45 | socket to be input or output. */ | 45 | socket to be input or output. */ |
46 | if (recording && source != AUDIO_SRC_PLAYBACK) | 46 | if ((flags & SRCF_RECORDING) && source != AUDIO_SRC_PLAYBACK) |
47 | { | 47 | { |
48 | /* input */ | 48 | /* input */ |
49 | GPIO_CLEAR_BITWISE(GPIOI_OUTPUT_VAL, 0x40); | 49 | 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 = | |||
58 | .state = 0 | 58 | .state = 0 |
59 | }; | 59 | }; |
60 | 60 | ||
61 | static unsigned long pcm_sampr SHAREDDATA_ATTR = HW_SAMPR_DEFAULT; /* 44.1 is default */ | ||
62 | |||
63 | void pcm_postinit(void) | 61 | void pcm_postinit(void) |
64 | { | 62 | { |
65 | audiohw_postinit(); | 63 | 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 @@ | |||
28 | #include "audiohw.h" | 28 | #include "audiohw.h" |
29 | #include "dsp-target.h" | 29 | #include "dsp-target.h" |
30 | 30 | ||
31 | static int pcm_fsel = HW_FREQ_DEFAULT; | ||
32 | |||
33 | void pcm_play_dma_init(void) | 31 | void pcm_play_dma_init(void) |
34 | { | 32 | { |
35 | IO_CLK_O1DIV = 3; | 33 | IO_CLK_O1DIV = 3; |