summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2009-10-13 16:41:20 +0000
committerRafaël Carré <rafael.carre@gmail.com>2009-10-13 16:41:20 +0000
commit0290094d8a386acef6656e4c4b881d59edbb7079 (patch)
tree2886443f4f3c9a71cfb675769ccf03b866bebe02
parent9680079496f86192dcce41794d989015798ef2a1 (diff)
downloadrockbox-0290094d8a386acef6656e4c4b881d59edbb7079.tar.gz
rockbox-0290094d8a386acef6656e4c4b881d59edbb7079.zip
Sansa AMS PCM : replace buggy and confusing one-liner
The bits which are not divider (i2si/i2so enable and clock selection) would be unset. This is not a problem in the current code since this function was always called before starting playback (and setting those bits) but this might be a problem when recording is enabled. Finally it is simpler to read. Thanks to Fred Bauer for pointing this. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23156 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/as3525/pcm-as3525.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c
index 4f9e18523d..20579806c0 100644
--- a/firmware/target/arm/as3525/pcm-as3525.c
+++ b/firmware/target/arm/as3525/pcm-as3525.c
@@ -150,9 +150,14 @@ void pcm_dma_apply_settings(void)
150 if(divider < 0 || divider > 511) 150 if(divider < 0 || divider > 511)
151 panicf("unsupported frequency %ld", frequency); 151 panicf("unsupported frequency %ld", frequency);
152 152
153 CGU_AUDIO &= ~(((511 ^ divider) << 2) /* I2SOUT */ 153 int cgu_audio = CGU_AUDIO; /* read register */
154 /*| ((511 ^ divider) << 14) */ /* I2SIN */ 154 cgu_audio &= ~(511 << 2); /* clear i2sout divider */
155 ); 155 cgu_audio |= divider << 2; /* set new i2sout divider */
156#if 0
157 cgu_audio &= ~(511 << 14); /* clear i2sin divider */
158 cgu_audio |= divider << 14; /* set new i2sin divider */
159#endif
160 CGU_AUDIO = cgu_audio; /* write back register */
156} 161}
157 162
158size_t pcm_get_bytes_waiting(void) 163size_t pcm_get_bytes_waiting(void)