summaryrefslogtreecommitdiffstats
path: root/firmware/target/coldfire/system-coldfire.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-03-07 06:23:02 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-03-07 06:23:02 +0000
commit633f3880024a2f83a21dd96368aa397940bc9ad6 (patch)
tree7c4319b1715c5c86252fd816764fdf53435163fb /firmware/target/coldfire/system-coldfire.c
parent2c94c1afc377c6605772008e6c27b06d579cecf4 (diff)
downloadrockbox-633f3880024a2f83a21dd96368aa397940bc9ad6.tar.gz
rockbox-633f3880024a2f83a21dd96368aa397940bc9ad6.zip
Coldfire targets: Shuffle IRQ levels around to have all interaction between low level audio function calls and DMA be atomic. Make recording and playback independently startable and stoppable so one can be running and not interfere with the other. All tests I can do at the moment check out ok (play, record, play+record, FM radio on iRivers, S/PDIF on H120 (w/running optical on/off), and on-the-fly samplerate changes). Recording tested for well over an hour run and no problems.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12658 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/coldfire/system-coldfire.c')
-rw-r--r--firmware/target/coldfire/system-coldfire.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/firmware/target/coldfire/system-coldfire.c b/firmware/target/coldfire/system-coldfire.c
index 251c97fb73..f2ac075e14 100644
--- a/firmware/target/coldfire/system-coldfire.c
+++ b/firmware/target/coldfire/system-coldfire.c
@@ -324,5 +324,8 @@ void coldfire_set_pllcr_audio_bits(long bits)
/* Set DATAINCONTROL without disturbing FIFO reset state */
void coldfire_set_dataincontrol(unsigned long value)
{
+ /* Have to be atomic against recording stop initiated by DMA1 */
+ int level = set_irq_level(DMA_IRQ_LEVEL);
DATAINCONTROL = (DATAINCONTROL & (1 << 9)) | value;
+ set_irq_level(level);
}