diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-04-26 20:22:27 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-04-26 20:22:27 +0000 |
commit | a7c20ac7601ab6f5342c1fac4b696b9132fd0d5b (patch) | |
tree | 0f6cfd1e5821e3350765cff038f5a1faf10c3971 /firmware | |
parent | 171b5ff207179d1cc88cdd268ba5565535c43fbd (diff) | |
download | rockbox-a7c20ac7601ab6f5342c1fac4b696b9132fd0d5b.tar.gz rockbox-a7c20ac7601ab6f5342c1fac4b696b9132fd0d5b.zip |
Replaced remaining '#pragma interrupt' with __attribute__((interrupt_handler)). It's cleaner this way, and fixes sh-elf-gcc 3.4.x builds with -Os or -O2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9816 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/adc.c | 2 | ||||
-rw-r--r-- | firmware/mp3_playback.c | 8 | ||||
-rw-r--r-- | firmware/test/i2c/main.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/firmware/drivers/adc.c b/firmware/drivers/adc.c index 6b703750f8..436c71105a 100644 --- a/firmware/drivers/adc.c +++ b/firmware/drivers/adc.c | |||
@@ -60,7 +60,7 @@ static void adc_tick(void) | |||
60 | ADCSR = ADCSR_ADST | ADCSR_ADIE | ADCSR_SCAN | 3; | 60 | ADCSR = ADCSR_ADST | ADCSR_ADIE | ADCSR_SCAN | 3; |
61 | } | 61 | } |
62 | 62 | ||
63 | #pragma interrupt | 63 | void ADITI(void) __attribute__((interrupt_handler)); |
64 | void ADITI(void) | 64 | void ADITI(void) |
65 | { | 65 | { |
66 | if(ADCSR & ADCSR_ADF) | 66 | if(ADCSR & ADCSR_ADF) |
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c index dd0a403362..58dc3f72fb 100644 --- a/firmware/mp3_playback.c +++ b/firmware/mp3_playback.c | |||
@@ -164,7 +164,7 @@ void play_tick(void) | |||
164 | } | 164 | } |
165 | } | 165 | } |
166 | 166 | ||
167 | #pragma interrupt | 167 | void DEI3(void) __attribute__((interrupt_handler)); |
168 | void DEI3(void) | 168 | void DEI3(void) |
169 | { | 169 | { |
170 | unsigned char* start; | 170 | unsigned char* start; |
@@ -188,7 +188,7 @@ void DEI3(void) | |||
188 | CHCR3 &= ~0x0002; /* Clear DMA interrupt */ | 188 | CHCR3 &= ~0x0002; /* Clear DMA interrupt */ |
189 | } | 189 | } |
190 | 190 | ||
191 | #pragma interrupt | 191 | void IMIA1(void) __attribute__((interrupt_handler)); |
192 | void IMIA1(void) /* Timer 1 interrupt */ | 192 | void IMIA1(void) /* Timer 1 interrupt */ |
193 | { | 193 | { |
194 | if(playing) | 194 | if(playing) |
@@ -200,14 +200,14 @@ void IMIA1(void) /* Timer 1 interrupt */ | |||
200 | #endif | 200 | #endif |
201 | } | 201 | } |
202 | 202 | ||
203 | #pragma interrupt | 203 | void IRQ6(void) __attribute__((interrupt_handler)); |
204 | void IRQ6(void) /* PB14: MAS stop demand IRQ */ | 204 | void IRQ6(void) /* PB14: MAS stop demand IRQ */ |
205 | { | 205 | { |
206 | SCR0 &= ~0x80; | 206 | SCR0 &= ~0x80; |
207 | } | 207 | } |
208 | 208 | ||
209 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 209 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
210 | #pragma interrupt | 210 | void IRQ3(void) __attribute__((interrupt_handler)); |
211 | void IRQ3(void) /* PA15: MAS demand IRQ */ | 211 | void IRQ3(void) /* PA15: MAS demand IRQ */ |
212 | { | 212 | { |
213 | /* Begin with setting the IRQ to edge sensitive */ | 213 | /* Begin with setting the IRQ to edge sensitive */ |
diff --git a/firmware/test/i2c/main.c b/firmware/test/i2c/main.c index 4419dde171..88aa9151d6 100644 --- a/firmware/test/i2c/main.c +++ b/firmware/test/i2c/main.c | |||
@@ -766,7 +766,7 @@ int main(void) | |||
766 | 766 | ||
767 | 767 | ||
768 | 768 | ||
769 | #pragma interrupt | 769 | void IRQ6(void) __attribute__((interrupt_handler)); |
770 | 770 | ||
771 | void IRQ6(void) | 771 | void IRQ6(void) |
772 | 772 | ||
@@ -778,7 +778,7 @@ void IRQ6(void) | |||
778 | 778 | ||
779 | 779 | ||
780 | 780 | ||
781 | #pragma interrupt | 781 | void DEI3(void) __attribute__((interrupt_handler)); |
782 | 782 | ||
783 | void DEI3(void) | 783 | void DEI3(void) |
784 | 784 | ||
@@ -922,7 +922,7 @@ static void mas_poll_start(unsigned int interval_in_ms) | |||
922 | 922 | ||
923 | 923 | ||
924 | 924 | ||
925 | #pragma interrupt | 925 | void IMIA1(void) __attribute__((interrupt_handler)); |
926 | 926 | ||
927 | void IMIA1(void) | 927 | void IMIA1(void) |
928 | 928 | ||