diff options
-rw-r--r-- | firmware/export/pp5024.h | 8 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/button-e200.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/system-pp502x.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/firmware/export/pp5024.h b/firmware/export/pp5024.h index 59c003613b..e7758b9ce5 100644 --- a/firmware/export/pp5024.h +++ b/firmware/export/pp5024.h | |||
@@ -24,9 +24,13 @@ | |||
24 | #include "pp5020.h" | 24 | #include "pp5020.h" |
25 | 25 | ||
26 | #undef GPIO_IRQ | 26 | #undef GPIO_IRQ |
27 | #define GPIO_IRQ (32+1) | 27 | /* Ports A, ?? */ |
28 | #define GPIO0_IRQ (32+0) | ||
29 | /* Ports F, H, ?? */ | ||
30 | #define GPIO1_IRQ (32+1) | ||
28 | 31 | ||
29 | #undef GPIO_MASK | 32 | #undef GPIO_MASK |
30 | #define GPIO_MASK (1 << (GPIO_IRQ-32)) | 33 | #define GPIO0_MASK (1 << (GPIO0_IRQ-32)) |
34 | #define GPIO1_MASK (1 << (GPIO1_IRQ-32)) | ||
31 | 35 | ||
32 | #endif | 36 | #endif |
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-e200.c b/firmware/target/arm/sandisk/sansa-e200/button-e200.c index 6365a3f4d4..5e2c38e8e3 100644 --- a/firmware/target/arm/sandisk/sansa-e200/button-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/button-e200.c | |||
@@ -84,7 +84,7 @@ void button_init_device(void) | |||
84 | GPIOH_INT_EN |= 0xc0; | 84 | GPIOH_INT_EN |= 0xc0; |
85 | 85 | ||
86 | CPU_INT_EN = HI_MASK; | 86 | CPU_INT_EN = HI_MASK; |
87 | CPU_HI_INT_EN = GPIO_MASK; | 87 | CPU_HI_INT_EN = GPIO1_MASK; |
88 | #endif /* BOOTLOADER */ | 88 | #endif /* BOOTLOADER */ |
89 | } | 89 | } |
90 | 90 | ||
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c index 2b6a801128..ef0c62dcf5 100644 --- a/firmware/target/arm/system-pp502x.c +++ b/firmware/target/arm/system-pp502x.c | |||
@@ -68,7 +68,7 @@ void irq(void) | |||
68 | else if (CPU_INT_STAT & TIMER2_MASK) | 68 | else if (CPU_INT_STAT & TIMER2_MASK) |
69 | TIMER2(); | 69 | TIMER2(); |
70 | #ifdef SANSA_E200 | 70 | #ifdef SANSA_E200 |
71 | else if (CPU_HI_INT_STAT & GPIO_MASK) | 71 | else if (CPU_HI_INT_STAT & GPIO1_MASK) |
72 | { | 72 | { |
73 | if (GPIOF_INT_STAT & 0xff) | 73 | if (GPIOF_INT_STAT & 0xff) |
74 | button_int(); | 74 | button_int(); |