summaryrefslogtreecommitdiff
path: root/firmware/drivers/tlv320.c
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2006-02-03 23:59:41 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2006-02-03 23:59:41 +0000
commit44a5c827b7f6576b180043f8edd1837c611033e1 (patch)
treec5c3830de86f87f853bb469b771bcdd8bb1de5c2 /firmware/drivers/tlv320.c
parent97f38e563226e72d440c2f22e9a261ed13bea5d2 (diff)
downloadrockbox-44a5c827b7f6576b180043f8edd1837c611033e1.tar.gz
rockbox-44a5c827b7f6576b180043f8edd1837c611033e1.zip
iAudio X5: Corrected crappy code, just to make the damn thing compile
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8559 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/tlv320.c')
-rw-r--r--firmware/drivers/tlv320.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/firmware/drivers/tlv320.c b/firmware/drivers/tlv320.c
index bafd77cd39..da92028ce1 100644
--- a/firmware/drivers/tlv320.c
+++ b/firmware/drivers/tlv320.c
@@ -60,7 +60,7 @@ unsigned tlv320_regs[0xf];
60 60
61void tlv320_write_reg(unsigned reg, unsigned value) 61void tlv320_write_reg(unsigned reg, unsigned value)
62{ 62{
63 unsigned data[3]; 63 unsigned char data[3];
64 64
65 data[0] = TLV320_ADDR; 65 data[0] = TLV320_ADDR;
66 data[1] = reg << 1; 66 data[1] = reg << 1;
@@ -76,7 +76,7 @@ void tlv320_write_reg(unsigned reg, unsigned value)
76} 76}
77 77
78/* Returns 0 if successful or -1 if some register failed */ 78/* Returns 0 if successful or -1 if some register failed */
79void tlv320_set_regs() 79void tlv320_set_regs(void)
80{ 80{
81 int i; 81 int i;
82 memset(tlv320_regs, 0, sizeof(tlv320_regs)); 82 memset(tlv320_regs, 0, sizeof(tlv320_regs));
@@ -96,7 +96,7 @@ void tlv320_set_regs()
96/** 96/**
97 * Init our tlv with default values 97 * Init our tlv with default values
98 */ 98 */
99void tlv320_init() 99void tlv320_init(void)
100{ 100{
101 tlv320_reset(); 101 tlv320_reset();
102 tlv320_set_regs(); 102 tlv320_set_regs();
@@ -105,14 +105,14 @@ void tlv320_init()
105/** 105/**
106 * Resets tlv320 to default values 106 * Resets tlv320 to default values
107 */ 107 */
108void tlv320_reset() 108void tlv320_reset(void)
109{ 109{
110 tlv320_write_reg(REG_RR, RR_RESET): 110 tlv320_write_reg(REG_RR, RR_RESET);
111} 111}
112 112
113void tlv320_enable_output(bool enable) 113void tlv320_enable_output(bool enable)
114{ 114{
115 unsigned value = tlv320regs[REG_PC]; 115 unsigned value = tlv320_regs[REG_PC];
116 116
117 if (enable) 117 if (enable)
118 value |= PC_OUT; 118 value |= PC_OUT;
@@ -148,11 +148,11 @@ void tlv320_set_headphone_vol(int vol_l, int vol_r)
148 */ 148 */
149void tlv320_set_linein_vol(int vol_l, int vol_r) 149void tlv320_set_linein_vol(int vol_l, int vol_r)
150{ 150{
151 unsigned value_l = tlv320regs[REG_LLIV]; 151 unsigned value_l = tlv320_regs[REG_LLIV];
152 unsigned value_r = tlv320regs[REG_RLIV]; 152 unsigned value_r = tlv320_regs[REG_RLIV];
153 153
154 value_l |= LLIV_LHV(vol_l); 154 value_l |= LLIV_LIV(vol_l);
155 value_r |= RLIV_RHV(vol_r); 155 value_r |= RLIV_RIV(vol_r);
156 156
157 tlv320_write_reg(REG_LLIV, value_l); 157 tlv320_write_reg(REG_LLIV, value_l);
158 tlv320_write_reg(REG_RLIV, value_r); 158 tlv320_write_reg(REG_RLIV, value_r);
@@ -164,8 +164,8 @@ void tlv320_set_linein_vol(int vol_l, int vol_r)
164 */ 164 */
165void tlv320_mute(bool mute) 165void tlv320_mute(bool mute)
166{ 166{
167 unsigned value_l = tlv320regs[REG_LHV]; 167 unsigned value_l = tlv320_regs[REG_LHV];
168 unsigned value_r = tlv320regs[REG_RHV]; 168 unsigned value_r = tlv320_regs[REG_RHV];
169 169
170 if (mute) 170 if (mute)
171 { 171 {
@@ -189,8 +189,8 @@ void tlv320_close()
189 189
190void tlv320_enable_recording(bool source_mic) 190void tlv320_enable_recording(bool source_mic)
191{ 191{
192 unsigned value_pc = tlv320regs[REG_PC]; 192 unsigned value_pc = tlv320_regs[REG_PC];
193 unsigned value_aap = tlv320regs[REG_AAP]; 193 unsigned value_aap = tlv320_regs[REG_AAP];
194 194
195 /* select source*/ 195 /* select source*/
196 if (source_mic) 196 if (source_mic)
@@ -213,11 +213,11 @@ void tlv320_enable_recording(bool source_mic)
213 213
214void tlv320_disable_recording() 214void tlv320_disable_recording()
215{ 215{
216 unsigned value = tlv320regs[REG_PC]; 216 unsigned value = tlv320_regs[REG_PC];
217 217
218 /* powerdown mic, linein and adc */ 218 /* powerdown mic, linein and adc */
219 value &= ~(PC_MIC | PC_LINE | PC_ADC); 219 value &= ~(PC_MIC | PC_LINE | PC_ADC);
220 220
221 /* powerdown mic, linein and adc */ 221 /* powerdown mic, linein and adc */
222 tlv320_write_reg(REG_PC, value); 222 tlv320_write_reg(REG_PC, value);
223} \ No newline at end of file 223}