Improve imx31 interrupt code for PMIC and GPIO

Fix stuff that was bugging me about the way I did it at first.

While messing around I found RDS code wasn't masking its GPIO
ISR as it should, which might lead to two different interrupts
messing with the static data.

Change-Id: I54626809ea3039a842af0cc9e3e42853326c4193

1 files changed, 3 insertions, 3 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
index 9129568b7a..71e8342595 100644
--- a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c
@@ -70,10 +70,10 @@ static void update_usb_status(bool sense)
 }
 
 /* Detect presence of USB bus - called from PMIC ISR */
-void usb_connect_event(void)
+void MC13783_EVENT_CB_USB(void)
 {
     /* Read the associated sense value */
-    update_usb_status(mc13783_event_sense(MC13783_USB_EVENT));
+    update_usb_status(mc13783_event_sense());
 }
 
 int usb_detect(void)
@@ -90,7 +90,7 @@ void usb_init_device(void)
     update_usb_status(usb_plugged());
 
     /* Enable PMIC event */
-    mc13783_enable_event(MC13783_USB_EVENT, true);
+    mc13783_enable_event(MC13783_INT_ID_USB, true);
 }
 
 void usb_enable(bool on)