4 files changed, 6 insertions, 16 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/gpio-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/gpio-gigabeat-s.c
index 3d0ff977da..f4402d5617 100644
--- a/firmware/target/arm/imx31/gigabeat-s/gpio-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/gpio-gigabeat-s.c
@@ -28,7 +28,7 @@
 /* Gigabeat S definitions for static GPIO event registration */
 
 /* Describes single events for each GPIO1 pin */
-static const struct gpio_event gpio1_events[] =
+const struct gpio_event gpio1_events[] =
 {
     /* mc13783 keeps the PRIINT high (no low pulse) if other unmasked
      * interrupts become active when clearing them or if a source being
@@ -41,11 +41,3 @@ static const struct gpio_event gpio1_events[] =
         .callback = mc13783_event,
     }
 };
-
-/* Describes the events attached to GPIO1 port */
-const struct gpio_event_list gpio1_event_list =
-{
-    .ints_priority = INT_PRIO_DEFAULT,
-    .count         = ARRAYLEN(gpio1_events),
-    .events        = gpio1_events,
-};
diff --git a/firmware/target/arm/imx31/gigabeat-s/gpio-target.h b/firmware/target/arm/imx31/gigabeat-s/gpio-target.h
index 0c213611ff..2eea27c3be 100644
--- a/firmware/target/arm/imx31/gigabeat-s/gpio-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/gpio-target.h
@@ -29,11 +29,14 @@
 #define MC13783_GPIO_ISR    GPIO1_ISR
 #define MC13783_GPIO_LINE   31
 
+#define GPIO1_INT_PRIO      INT_PRIO_DEFAULT
+
 /* Declare event indexes in priority order in a packed array */
 enum gpio_event_ids
 {
     /* GPIO1 event IDs */
     MC13783_EVENT_ID = GPIO1_EVENT_FIRST,
+    GPIO1_NUM_EVENTS = 1,
     /* GPIO2 event IDs */
     /* none defined */
     /* GPIO3 event IDs */
diff --git a/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c
index 22c9f3e1df..e0745a5b8b 100644
--- a/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/mc13783-gigabeat-s.c
@@ -52,7 +52,7 @@ struct spi_node mc13783_spi =
 
 /* Gigabeat S definitions for static MC13783 event registration */
 
-static const struct mc13783_event mc13783_events[] =
+const struct mc13783_event mc13783_events[MC13783_NUM_EVENTS] =
 {
     [MC13783_ADCDONE_EVENT] = /* ADC conversion complete */
     {
@@ -87,9 +87,3 @@ static const struct mc13783_event mc13783_events[] =
     },
 #endif
 };
-
-const struct mc13783_event_list mc13783_event_list =
-{
-    .count = ARRAYLEN(mc13783_events),
-    .events = mc13783_events
-};
diff --git a/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h b/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h
index 2ae3be1819..48d634035a 100644
--- a/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/mc13783-target.h
@@ -33,6 +33,7 @@ enum mc13783_event_ids
 #endif
     MC13783_SE1_EVENT,         /* Main charger detection */
     MC13783_USB_EVENT,         /* USB insertion */
+    MC13783_NUM_EVENTS,
 };
 
 #endif /* MC13783_TARGET_H */