diff options
Diffstat (limited to 'firmware/target/arm/as3525/system-as3525.c')
-rw-r--r-- | firmware/target/arm/as3525/system-as3525.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index 0bb8c4ce95..5614427e20 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c | |||
@@ -122,7 +122,8 @@ struct vec_int_src vec_int_srcs[] = | |||
122 | { INT_SRC_TIMER2, INT_TIMER2 }, | 122 | { INT_SRC_TIMER2, INT_TIMER2 }, |
123 | { INT_SRC_I2C_AUDIO, INT_I2C_AUDIO }, | 123 | { INT_SRC_I2C_AUDIO, INT_I2C_AUDIO }, |
124 | { INT_SRC_AUDIO, INT_AUDIO }, | 124 | { INT_SRC_AUDIO, INT_AUDIO }, |
125 | #ifdef HAVE_HOTSWAP | 125 | #if defined(HAVE_HOTSWAP) || \ |
126 | (defined(SANSA_FUZEV2) && !defined(INCREASED_SCROLLWHEEL_POLLING) | ||
126 | { INT_SRC_GPIOA, INT_GPIOA, }, | 127 | { INT_SRC_GPIOA, INT_GPIOA, }, |
127 | #endif | 128 | #endif |
128 | /* Lowest priority at the end of the list */ | 129 | /* Lowest priority at the end of the list */ |
@@ -150,11 +151,11 @@ static void setup_vic(void) | |||
150 | 151 | ||
151 | void INT_GPIOA(void) | 152 | void INT_GPIOA(void) |
152 | { | 153 | { |
153 | #ifdef HAVE_MULTIDRIVE | 154 | #ifdef HAVE_HOTSWAP |
154 | void sd_gpioa_isr(void); | 155 | void sd_gpioa_isr(void); |
155 | sd_gpioa_isr(); | 156 | sd_gpioa_isr(); |
156 | #endif | 157 | #endif |
157 | #if (defined(HAVE_SCROLLWHEEL) && CONFIG_CPU != AS3525) | 158 | #if defined(SANSA_FUZEV2) && !defined(INCREASED_SCROLLWHEEL_POLLING |
158 | void button_gpioa_isr(void); | 159 | void button_gpioa_isr(void); |
159 | button_gpioa_isr(); | 160 | button_gpioa_isr(); |
160 | #endif | 161 | #endif |
@@ -368,8 +369,9 @@ void system_init(void) | |||
368 | ascodec_init(); | 369 | ascodec_init(); |
369 | 370 | ||
370 | #ifndef BOOTLOADER | 371 | #ifndef BOOTLOADER |
371 | /* setup isr for microsd monitoring and for scrollwheel irq */ | 372 | /* setup isr for microsd monitoring and for fuzev2 scrollwheel irq */ |
372 | #if defined(HAVE_MULTIDRIVE) || (defined(HAVE_SCROLLWHEEL) && CONFIG_CPU != AS3525) | 373 | #if defined(HAVE_HOTSWAP) || \ |
374 | (defined(SANSA_FUZEV2) && !defined(INCREASED_SCROLLWHEEL_POLLING) | ||
373 | VIC_INT_ENABLE = (INTERRUPT_GPIOA); | 375 | VIC_INT_ENABLE = (INTERRUPT_GPIOA); |
374 | /* pin selection for irq happens in the drivers */ | 376 | /* pin selection for irq happens in the drivers */ |
375 | #endif | 377 | #endif |