diff options
| -rw-r--r-- | firmware/export/mc13783.h | 6 | ||||
| -rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c | 2 | ||||
| -rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/firmware/export/mc13783.h b/firmware/export/mc13783.h index 4324d06..6ad3434 100644 --- a/firmware/export/mc13783.h +++ b/firmware/export/mc13783.h @@ -1338,12 +1338,6 @@ struct mc13783_event void (*callback)(void); }; -struct mc13783_event_list -{ - unsigned count; - const struct mc13783_event *events; -}; - void mc13783_enable_event(enum mc13783_event_ids id, bool enable); /* Read the sense bit if one exists - valid only within event handlers */ diff --git a/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c index 11d1d5a..3972e57 100644 --- a/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c @@ -213,7 +213,7 @@ void button_close_device(void) /* Assumes HP detection is not available */ initialized = false; - mc13783_enable_event(MC13783_ONOFD1_EVENT, true); + mc13783_enable_event(MC13783_ONOFD1_EVENT, false); ext_btn = BUTTON_NONE; } #endif /* BUTTON_DRIVER_CLOSE */ diff --git a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c index 5b255a0..d194a69 100644 --- a/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c @@ -68,8 +68,7 @@ static void update_main_charger(bool present) /* Detect changes in presence of the AC adaptor. Called from PMIC ISR. */ void charger_main_detect_event(void) { - update_main_charger(mc13783_event_sense(MC13783_INT_ID_SE1) - & MC13783_SE1S); + update_main_charger(mc13783_event_sense(MC13783_SE1_EVENT)); } /* Detect changes in USB bus power. Called from usb connect event ISR. */ |