summaryrefslogtreecommitdiffstats
path: root/bootloader
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2008-03-26 01:50:41 +0000
committerMichael Sevakis <jethead71@rockbox.org>2008-03-26 01:50:41 +0000
commitaf395f4db6ad7b83f9d9afefb1c0ceeedd140a45 (patch)
treeb631289b4a3b28d3c65b10d272d50298f377c69f /bootloader
parent74d678fdbcbc427c057e7682ba0a0566e49a8b97 (diff)
downloadrockbox-af395f4db6ad7b83f9d9afefb1c0ceeedd140a45.tar.gz
rockbox-af395f4db6ad7b83f9d9afefb1c0ceeedd140a45.tar.bz2
rockbox-af395f4db6ad7b83f9d9afefb1c0ceeedd140a45.zip
Do core interrupt masking in a less general fashion and save some instructions to decrease size and speed things up a little bit. Small fix to a few places where interrupts would get enabled again where they shouldn't have been (context switching calls when disabled).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16811 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
-rw-r--r--bootloader/iaudio_coldfire.c2
-rw-r--r--bootloader/iriver_h1x0.c2
-rw-r--r--bootloader/iriver_h300.c6
-rwxr-xr-xbootloader/mrobe500.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/bootloader/iaudio_coldfire.c b/bootloader/iaudio_coldfire.c
index 0f3798d783..c1076e98cc 100644
--- a/bootloader/iaudio_coldfire.c
+++ b/bootloader/iaudio_coldfire.c
@@ -164,7 +164,7 @@ void main(void)
set_cpu_frequency(CPUFREQ_NORMAL);
coldfire_set_pllcr_audio_bits(DEFAULT_PLLCR_AUDIO_BITS);
- set_irq_level(0);
+ enable_irq();
lcd_init();
#ifdef HAVE_REMOTE_LCD
lcd_remote_init();
diff --git a/bootloader/iriver_h1x0.c b/bootloader/iriver_h1x0.c
index 6b3527be7a..4be92eb4ac 100644
--- a/bootloader/iriver_h1x0.c
+++ b/bootloader/iriver_h1x0.c
@@ -435,7 +435,7 @@ void main(void)
coldfire_set_pllcr_audio_bits(DEFAULT_PLLCR_AUDIO_BITS);
#endif
#endif
- set_irq_level(0);
+ enable_irq();
#ifdef HAVE_EEPROM_SETTINGS
initialize_eeprom();
diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c
index 1840966aa1..3349be4c2b 100644
--- a/bootloader/iriver_h300.c
+++ b/bootloader/iriver_h300.c
@@ -175,10 +175,10 @@ void main(void)
}
/* get rid of a nasty humming sound during boot */
- mask = set_irq_level(HIGHEST_IRQ_LEVEL);
+ mask = disable_irq_save();
pcf50606_write(0x3b, 0x00); /* GPOOD2 high Z */
pcf50606_write(0x3b, 0x07); /* GPOOD2 low */
- set_irq_level(mask);
+ restore_irq(mask);
/* Start with the main backlight OFF. */
_backlight_init();
@@ -192,7 +192,7 @@ void main(void)
/* Set up waitstates for the peripherals */
set_cpu_frequency(0); /* PLL off */
coldfire_set_pllcr_audio_bits(DEFAULT_PLLCR_AUDIO_BITS);
- set_irq_level(0);
+ enable_irq();
isp1362_init();
diff --git a/bootloader/mrobe500.c b/bootloader/mrobe500.c
index 1dbe7b8edb..e6dc58118d 100755
--- a/bootloader/mrobe500.c
+++ b/bootloader/mrobe500.c
@@ -174,8 +174,8 @@ void main(void)
system_init();
kernel_init();
- set_irq_level(0);
- set_fiq_status(FIQ_ENABLED);
+ enable_irq();
+ enable_fiq();
adc_init();
button_init();