diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/pp5020.h | 8 | ||||
-rw-r--r-- | firmware/export/pp5024.h | 10 |
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 @@ | |||
96 | #define USB_IRQ 24 | 96 | #define USB_IRQ 24 |
97 | #define FIREWIRE_IRQ 25 | 97 | #define FIREWIRE_IRQ 25 |
98 | #define HI_IRQ 30 | 98 | #define HI_IRQ 30 |
99 | #define GPIO_IRQ (32+0) | 99 | #define GPIO0_IRQ (32+0) /* Ports A..D */ |
100 | #define GPIO1_IRQ (32+1) /* Ports E..H */ | ||
101 | #define GPIO2_IRQ (32+2) /* Ports I..L */ | ||
100 | #define SER0_IRQ (32+4) | 102 | #define SER0_IRQ (32+4) |
101 | #define SER1_IRQ (32+5) | 103 | #define SER1_IRQ (32+5) |
102 | #define I2C_IRQ (32+8) | 104 | #define I2C_IRQ (32+8) |
@@ -109,7 +111,9 @@ | |||
109 | #define USB_MASK (1 << USB_IRQ) | 111 | #define USB_MASK (1 << USB_IRQ) |
110 | #define FIREWIRE_MASK (1 << FIREWIRE_IRQ) | 112 | #define FIREWIRE_MASK (1 << FIREWIRE_IRQ) |
111 | #define HI_MASK (1 << HI_IRQ) | 113 | #define HI_MASK (1 << HI_IRQ) |
112 | #define GPIO_MASK (1 << (GPIO_IRQ-32)) | 114 | #define GPIO0_MASK (1 << (GPIO0_IRQ-32)) |
115 | #define GPIO1_MASK (1 << (GPIO1_IRQ-32)) | ||
116 | #define GPIO2_MASK (1 << (GPIO2_IRQ-32)) | ||
113 | #define SER0_MASK (1 << (SER0_IRQ-32)) | 117 | #define SER0_MASK (1 << (SER0_IRQ-32)) |
114 | #define SER1_MASK (1 << (SER1_IRQ-32)) | 118 | #define SER1_MASK (1 << (SER1_IRQ-32)) |
115 | #define I2C_MASK (1 << (I2C_IRQ-32)) | 119 | #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 @@ | |||
23 | completely and redifine any minor differences */ | 23 | completely and redifine any minor differences */ |
24 | #include "pp5020.h" | 24 | #include "pp5020.h" |
25 | 25 | ||
26 | #undef GPIO_IRQ | ||
27 | /* Ports A, B, ?? */ | ||
28 | #define GPIO0_IRQ (32+0) | ||
29 | /* Ports F, H, ?? */ | ||
30 | #define GPIO1_IRQ (32+1) | ||
31 | |||
32 | #undef GPIO_MASK | ||
33 | #define GPIO0_MASK (1 << (GPIO0_IRQ-32)) | ||
34 | #define GPIO1_MASK (1 << (GPIO1_IRQ-32)) | ||
35 | |||
36 | #endif | 26 | #endif |