diff options
Diffstat (limited to 'firmware/target/coldfire/iaudio/m5')
-rw-r--r-- | firmware/target/coldfire/iaudio/m5/audio-m5.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/m5/power-m5.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/firmware/target/coldfire/iaudio/m5/audio-m5.c b/firmware/target/coldfire/iaudio/m5/audio-m5.c index 9531f932ad..2442351fed 100644 --- a/firmware/target/coldfire/iaudio/m5/audio-m5.c +++ b/firmware/target/coldfire/iaudio/m5/audio-m5.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | void audio_set_output_source(int source) | 24 | void 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 | ||
36 | void audio_set_source(int source, unsigned flags) | 38 | void audio_set_source(int source, unsigned flags) |
diff --git a/firmware/target/coldfire/iaudio/m5/power-m5.c b/firmware/target/coldfire/iaudio/m5/power-m5.c index c689488bfe..f3e7cdd496 100644 --- a/firmware/target/coldfire/iaudio/m5/power-m5.c +++ b/firmware/target/coldfire/iaudio/m5/power-m5.c | |||
@@ -60,7 +60,7 @@ bool ide_powered(void) | |||
60 | void power_off(void) | 60 | void 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 | } |