diff options
| author | Michael Sparmann <theseven@rockbox.org> | 2010-12-12 12:40:37 +0000 |
|---|---|---|
| committer | Michael Sparmann <theseven@rockbox.org> | 2010-12-12 12:40:37 +0000 |
| commit | 7b3c7db486febc6b830db106af6df5aaf5838421 (patch) | |
| tree | 1a0effc4b027a61a4143ab8db5ddaf89bd2797f3 /firmware/target/arm | |
| parent | 951a519dc4ac82cc05cafa1a3c7c974a72d390f7 (diff) | |
| download | rockbox-7b3c7db486febc6b830db106af6df5aaf5838421.tar.gz rockbox-7b3c7db486febc6b830db106af6df5aaf5838421.zip | |
iPod Nano 2G: Correct clickwheel interrupt handler name, this time consistently.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28807 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
| -rw-r--r-- | firmware/target/arm/ipod/button-clickwheel.c | 2 | ||||
| -rw-r--r-- | firmware/target/arm/s5l8700/system-s5l8700.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c index c59458a84b..eb7c36b6ee 100644 --- a/firmware/target/arm/ipod/button-clickwheel.c +++ b/firmware/target/arm/ipod/button-clickwheel.c @@ -335,7 +335,7 @@ bool headphones_inserted(void) return (GPIOA_INPUT_VAL & 0x80)?true:false; } #else -void INT_SPI(void) +void INT_WHEEL(void) { int clickwheel_events = WHEELINT; diff --git a/firmware/target/arm/s5l8700/system-s5l8700.c b/firmware/target/arm/s5l8700/system-s5l8700.c index 72b0caf6db..950a584448 100644 --- a/firmware/target/arm/s5l8700/system-s5l8700.c +++ b/firmware/target/arm/s5l8700/system-s5l8700.c @@ -61,7 +61,7 @@ default_interrupt(INT_UART0); default_interrupt(INT_SPDIF_OUT); default_interrupt(INT_SDCI); default_interrupt(INT_LCD); -default_interrupt(INT_SPI); +default_interrupt(INT_WHEEL); default_interrupt(INT_IIC); default_interrupt(RESERVED2); default_interrupt(INT_MSTICK); @@ -87,7 +87,7 @@ static void (* const irqvector[])(void) = EXT0,EXT1,EXT2,EINT_VBUS,EINTG,INT_TIMER,INT_WDT,INT_UNK1, INT_UNK2,INT_UNK3,INT_DMA,INT_ALARM_RTC,INT_PRI_RTC,RESERVED1,INT_UART,INT_USB_HOST, INT_USB_FUNC,INT_LCDC_0,INT_LCDC_1,INT_CALM,INT_ATA,INT_UART0,INT_SPDIF_OUT,INT_ECC, - INT_SDCI,INT_LCD,INT_SPI,INT_IIC,RESERVED2,INT_MSTICK,INT_ADC_WAKEUP,INT_ADC + INT_SDCI,INT_LCD,INT_WHEEL,INT_IIC,RESERVED2,INT_MSTICK,INT_ADC_WAKEUP,INT_ADC }; #else static void (* const irqvector[])(void) = @@ -95,7 +95,7 @@ static void (* const irqvector[])(void) = EXT0,EXT1,EXT2,EINT_VBUS,EINTG,INT_TIMERA,INT_WDT,INT_TIMERB, INT_TIMERC,INT_TIMERD,INT_DMA,INT_ALARM_RTC,INT_PRI_RTC,RESERVED1,INT_UART,INT_USB_HOST, INT_USB_FUNC,INT_LCDC_0,INT_LCDC_1,INT_ECC,INT_CALM,INT_ATA,INT_UART0,INT_SPDIF_OUT, - INT_SDCI,INT_LCD,INT_SPI,INT_IIC,RESERVED2,INT_MSTICK,INT_ADC_WAKEUP,INT_ADC + INT_SDCI,INT_LCD,INT_WHEEL,INT_IIC,RESERVED2,INT_MSTICK,INT_ADC_WAKEUP,INT_ADC }; #endif @@ -105,7 +105,7 @@ static const char * const irqname[] = "EXT0","EXT1","EXT2","EINT_VBUS","EINTG","INT_TIMER","INT_WDT","INT_UNK1", "INT_UNK2","INT_UNK3","INT_DMA","INT_ALARM_RTC","INT_PRI_RTC","Reserved","INT_UART","INT_USB_HOST", "INT_USB_FUNC","INT_LCDC_0","INT_LCDC_1","INT_CALM","INT_ATA","INT_UART0","INT_SPDIF_OUT","INT_ECC", - "INT_SDCI","INT_LCD","INT_SPI","INT_IIC","Reserved","INT_MSTICK","INT_ADC_WAKEUP","INT_ADC" + "INT_SDCI","INT_LCD","INT_WHEEL","INT_IIC","Reserved","INT_MSTICK","INT_ADC_WAKEUP","INT_ADC" }; #else static const char * const irqname[] = @@ -113,7 +113,7 @@ static const char * const irqname[] = "EXT0","EXT1","EXT2","EINT_VBUS","EINTG","INT_TIMERA","INT_WDT","INT_TIMERB", "INT_TIMERC","INT_TIMERD","INT_DMA","INT_ALARM_RTC","INT_PRI_RTC","Reserved","INT_UART","INT_USB_HOST", "INT_USB_FUNC","INT_LCDC_0","INT_LCDC_1","INT_ECC","INT_CALM","INT_ATA","INT_UART0","INT_SPDIF_OUT", - "INT_SDCI","INT_LCD","INT_SPI","INT_IIC","Reserved","INT_MSTICK","INT_ADC_WAKEUP","INT_ADC" + "INT_SDCI","INT_LCD","INT_WHEEL","INT_IIC","Reserved","INT_MSTICK","INT_ADC_WAKEUP","INT_ADC" }; #endif |