summaryrefslogtreecommitdiff
path: root/firmware/target/coldfire/iaudio/x5
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/coldfire/iaudio/x5')
-rw-r--r--firmware/target/coldfire/iaudio/x5/audio-x5.c2
-rw-r--r--firmware/target/coldfire/iaudio/x5/power-x5.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/firmware/target/coldfire/iaudio/x5/audio-x5.c b/firmware/target/coldfire/iaudio/x5/audio-x5.c
index e673d4ad47..91100ed751 100644
--- a/firmware/target/coldfire/iaudio/x5/audio-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/audio-x5.c
@@ -23,6 +23,7 @@
23 23
24void audio_set_output_source(int source) 24void audio_set_output_source(int source)
25{ 25{
26 int level = set_irq_level(DMA_IRQ_LEVEL);
26 unsigned long txsrc; 27 unsigned long txsrc;
27 28
28 if ((unsigned)source >= AUDIO_NUM_SOURCES) 29 if ((unsigned)source >= AUDIO_NUM_SOURCES)
@@ -31,6 +32,7 @@ void audio_set_output_source(int source)
31 txsrc = (4 << 8); /* recording, iis1RcvData */ 32 txsrc = (4 << 8); /* recording, iis1RcvData */
32 33
33 IIS1CONFIG = (IIS1CONFIG & ~(7 << 8)) | txsrc; 34 IIS1CONFIG = (IIS1CONFIG & ~(7 << 8)) | txsrc;
35 set_irq_level(level);
34} /* audio_set_output_source */ 36} /* audio_set_output_source */
35 37
36void audio_set_source(int source, unsigned flags) 38void audio_set_source(int source, unsigned flags)
diff --git a/firmware/target/coldfire/iaudio/x5/power-x5.c b/firmware/target/coldfire/iaudio/x5/power-x5.c
index 4d44500fd5..c646570821 100644
--- a/firmware/target/coldfire/iaudio/x5/power-x5.c
+++ b/firmware/target/coldfire/iaudio/x5/power-x5.c
@@ -60,7 +60,7 @@ bool ide_powered(void)
60void power_off(void) 60void power_off(void)
61{ 61{
62 lcd_remote_poweroff(); 62 lcd_remote_poweroff();
63 set_irq_level(HIGHEST_IRQ_LEVEL); 63 set_irq_level(DISABLE_INTERRUPTS);
64 and_l(~0x00000008, &GPIO_OUT); /* Set KEEPACT low */ 64 and_l(~0x00000008, &GPIO_OUT); /* Set KEEPACT low */
65 asm("halt"); 65 asm("halt");
66} 66}