devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

better preprocessor conditions for enabling GPIOA interrupt

Browse source 
it's only needed if we hotswap the µSD or if we build the fuzev2
scrollwheel code without irq (which we don't do anyway)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26165 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-05-19 14:30:34 +00:00
parent 627baea953
commit 8e12292e75
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
firmware/target/arm/as3525/system-as3525.c
View file

@ -122,7 +122,8 @@ struct vec_int_src vec_int_srcs[] =
{ INT_SRC_TIMER2, INT_TIMER2 }, { INT_SRC_TIMER2, INT_TIMER2 },
{ INT_SRC_I2C_AUDIO, INT_I2C_AUDIO }, { INT_SRC_I2C_AUDIO, INT_I2C_AUDIO },
{ INT_SRC_AUDIO, INT_AUDIO }, { INT_SRC_AUDIO, INT_AUDIO },
#ifdef HAVE_HOTSWAP #if defined(HAVE_HOTSWAP) || \
(defined(SANSA_FUZEV2) && !defined(INCREASED_SCROLLWHEEL_POLLING)
{ INT_SRC_GPIOA, INT_GPIOA, }, { INT_SRC_GPIOA, INT_GPIOA, },
#endif #endif
/* Lowest priority at the end of the list */ /* Lowest priority at the end of the list */
@ -150,11 +151,11 @@ static void setup_vic(void)
void INT_GPIOA(void) void INT_GPIOA(void)
{ {
#ifdef HAVE_MULTIDRIVE #ifdef HAVE_HOTSWAP
void sd_gpioa_isr(void); void sd_gpioa_isr(void);
sd_gpioa_isr(); sd_gpioa_isr();
#endif #endif
#if (defined(HAVE_SCROLLWHEEL) && CONFIG_CPU != AS3525) #if defined(SANSA_FUZEV2) && !defined(INCREASED_SCROLLWHEEL_POLLING
void button_gpioa_isr(void); void button_gpioa_isr(void);
button_gpioa_isr(); button_gpioa_isr();
#endif #endif
@ -368,8 +369,9 @@ void system_init(void)
ascodec_init(); ascodec_init();
#ifndef BOOTLOADER #ifndef BOOTLOADER
/* setup isr for microsd monitoring and for scrollwheel irq */ /* setup isr for microsd monitoring and for fuzev2 scrollwheel irq */
#if defined(HAVE_MULTIDRIVE) || (defined(HAVE_SCROLLWHEEL) && CONFIG_CPU != AS3525) #if defined(HAVE_HOTSWAP) || \
(defined(SANSA_FUZEV2) && !defined(INCREASED_SCROLLWHEEL_POLLING)
VIC_INT_ENABLE = (INTERRUPT_GPIOA); VIC_INT_ENABLE = (INTERRUPT_GPIOA);
/* pin selection for irq happens in the drivers */ /* pin selection for irq happens in the drivers */
#endif #endif