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/backlight-m5.c | 8 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/m5/power-m5.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/coldfire/iaudio/m5/audio-m5.c b/firmware/target/coldfire/iaudio/m5/audio-m5.c index 87a7c35574..024621be64 100644 --- a/firmware/target/coldfire/iaudio/m5/audio-m5.c +++ b/firmware/target/coldfire/iaudio/m5/audio-m5.c | |||
@@ -32,7 +32,7 @@ void audio_set_output_source(int source) | |||
32 | txsrc = (4 << 8); /* recording, iis1RcvData */ | 32 | txsrc = (4 << 8); /* recording, iis1RcvData */ |
33 | 33 | ||
34 | IIS1CONFIG = (IIS1CONFIG & ~(7 << 8)) | txsrc; | 34 | IIS1CONFIG = (IIS1CONFIG & ~(7 << 8)) | txsrc; |
35 | set_irq_level(level); | 35 | restore_irq(level); |
36 | } /* audio_set_output_source */ | 36 | } /* audio_set_output_source */ |
37 | 37 | ||
38 | void audio_input_mux(int source, unsigned flags) | 38 | void audio_input_mux(int source, unsigned flags) |
diff --git a/firmware/target/coldfire/iaudio/m5/backlight-m5.c b/firmware/target/coldfire/iaudio/m5/backlight-m5.c index 19bc5bfcae..3461a330ec 100644 --- a/firmware/target/coldfire/iaudio/m5/backlight-m5.c +++ b/firmware/target/coldfire/iaudio/m5/backlight-m5.c | |||
@@ -33,18 +33,18 @@ bool _backlight_init(void) | |||
33 | 33 | ||
34 | void _backlight_on(void) | 34 | void _backlight_on(void) |
35 | { | 35 | { |
36 | int level = set_irq_level(HIGHEST_IRQ_LEVEL); | 36 | int level = disable_irq_save(); |
37 | 37 | ||
38 | pcf50606_write(0x39, 0x07); | 38 | pcf50606_write(0x39, 0x07); |
39 | set_irq_level(level); | 39 | restore_irq(level); |
40 | } | 40 | } |
41 | 41 | ||
42 | void _backlight_off(void) | 42 | void _backlight_off(void) |
43 | { | 43 | { |
44 | int level = set_irq_level(HIGHEST_IRQ_LEVEL); | 44 | int level = disable_irq_save(); |
45 | 45 | ||
46 | pcf50606_write(0x39, 0x00); | 46 | pcf50606_write(0x39, 0x00); |
47 | set_irq_level(level); | 47 | restore_irq(level); |
48 | } | 48 | } |
49 | 49 | ||
50 | void _remote_backlight_on(void) | 50 | void _remote_backlight_on(void) |
diff --git a/firmware/target/coldfire/iaudio/m5/power-m5.c b/firmware/target/coldfire/iaudio/m5/power-m5.c index 939cae02f2..18401af49f 100644 --- a/firmware/target/coldfire/iaudio/m5/power-m5.c +++ b/firmware/target/coldfire/iaudio/m5/power-m5.c | |||
@@ -44,16 +44,16 @@ bool charger_inserted(void) | |||
44 | void ide_power_enable(bool on) | 44 | void ide_power_enable(bool on) |
45 | { | 45 | { |
46 | /* GPOOD3 */ | 46 | /* GPOOD3 */ |
47 | int level = set_irq_level(HIGHEST_IRQ_LEVEL); | 47 | int level = disable_irq_save(); |
48 | pcf50606_write(0x3c, on ? 0x07 : 0x00); | 48 | pcf50606_write(0x3c, on ? 0x07 : 0x00); |
49 | set_irq_level(level); | 49 | restore_irq(level); |
50 | } | 50 | } |
51 | 51 | ||
52 | bool ide_powered(void) | 52 | bool ide_powered(void) |
53 | { | 53 | { |
54 | int level = set_irq_level(HIGHEST_IRQ_LEVEL); | 54 | int level = disable_irq_save(); |
55 | int value = pcf50606_read(0x3c); | 55 | int value = pcf50606_read(0x3c); |
56 | set_irq_level(level); | 56 | restore_irq(level); |
57 | return (value & 0x07) != 0; | 57 | return (value & 0x07) != 0; |
58 | } | 58 | } |
59 | 59 | ||