From a7c20ac7601ab6f5342c1fac4b696b9132fd0d5b Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Wed, 26 Apr 2006 20:22:27 +0000 Subject: 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 --- firmware/drivers/adc.c | 2 +- firmware/mp3_playback.c | 8 ++++---- 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) ADCSR = ADCSR_ADST | ADCSR_ADIE | ADCSR_SCAN | 3; } -#pragma interrupt +void ADITI(void) __attribute__((interrupt_handler)); void ADITI(void) { 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) } } -#pragma interrupt +void DEI3(void) __attribute__((interrupt_handler)); void DEI3(void) { unsigned char* start; @@ -188,7 +188,7 @@ void DEI3(void) CHCR3 &= ~0x0002; /* Clear DMA interrupt */ } -#pragma interrupt +void IMIA1(void) __attribute__((interrupt_handler)); void IMIA1(void) /* Timer 1 interrupt */ { if(playing) @@ -200,14 +200,14 @@ void IMIA1(void) /* Timer 1 interrupt */ #endif } -#pragma interrupt +void IRQ6(void) __attribute__((interrupt_handler)); void IRQ6(void) /* PB14: MAS stop demand IRQ */ { SCR0 &= ~0x80; } #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) -#pragma interrupt +void IRQ3(void) __attribute__((interrupt_handler)); void IRQ3(void) /* PA15: MAS demand IRQ */ { /* 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) -#pragma interrupt +void IRQ6(void) __attribute__((interrupt_handler)); void IRQ6(void) @@ -778,7 +778,7 @@ void IRQ6(void) -#pragma interrupt +void DEI3(void) __attribute__((interrupt_handler)); void DEI3(void) @@ -922,7 +922,7 @@ static void mas_poll_start(unsigned int interval_in_ms) -#pragma interrupt +void IMIA1(void) __attribute__((interrupt_handler)); void IMIA1(void) -- cgit v1.2.3