The GPIO interrupts are split into several port groups on all PP502x versions, so move those definitions into pp5020.h, and add the missing group. Make microSD hotswap detection work on Sansa c200. Note that microSD access itself does not work yet.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15460 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 6 insertions, 12 deletions

diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index 89acb2e8d2..22a53e7ad7 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -96,7 +96,9 @@
 #define USB_IRQ      24
 #define FIREWIRE_IRQ 25
 #define HI_IRQ       30
-#define GPIO_IRQ     (32+0)
+#define GPIO0_IRQ    (32+0) /* Ports A..D */
+#define GPIO1_IRQ    (32+1) /* Ports E..H */
+#define GPIO2_IRQ    (32+2) /* Ports I..L */
 #define SER0_IRQ     (32+4)
 #define SER1_IRQ     (32+5)
 #define I2C_IRQ      (32+8)
@@ -109,7 +111,9 @@
 #define USB_MASK      (1 << USB_IRQ)
 #define FIREWIRE_MASK (1 << FIREWIRE_IRQ)
 #define HI_MASK       (1 << HI_IRQ)
-#define GPIO_MASK     (1 << (GPIO_IRQ-32))
+#define GPIO0_MASK    (1 << (GPIO0_IRQ-32))
+#define GPIO1_MASK    (1 << (GPIO1_IRQ-32))
+#define GPIO2_MASK    (1 << (GPIO2_IRQ-32))
 #define SER0_MASK     (1 << (SER0_IRQ-32))
 #define SER1_MASK     (1 << (SER1_IRQ-32))
 #define I2C_MASK      (1 << (I2C_IRQ-32))
diff --git a/firmware/export/pp5024.h b/firmware/export/pp5024.h
index 5e2de17741..900032132e 100644
--- a/firmware/export/pp5024.h
+++ b/firmware/export/pp5024.h
@@ -23,14 +23,4 @@
    completely and redifine any minor differences */
 #include "pp5020.h"
 
-#undef GPIO_IRQ
-/* Ports A, B, ?? */
-#define GPIO0_IRQ   (32+0)
-/* Ports F, H, ?? */
-#define GPIO1_IRQ   (32+1)
-
-#undef GPIO_MASK
-#define GPIO0_MASK  (1 << (GPIO0_IRQ-32))
-#define GPIO1_MASK  (1 << (GPIO1_IRQ-32))
-
 #endif