diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2012-01-03 06:13:59 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2012-01-03 06:13:59 +0000 |
| commit | 30c4efcd16ad00f4ee108856f99967df80be1caf (patch) | |
| tree | e93ed1eb661d14be87f06a51145e48e3d71745bd /firmware/target | |
| parent | 4c917f76c6b6b04de8f0e7d7c49ab6accbd58362 (diff) | |
i.MX31: Fix a couple oopses from r31528
Enabled a PMIC event where it should be disabled. Used constant from wrong enum
to get sense bits (??) which messed up main charger detection.
Also remove an obsolete struct declaration.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31536 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
| -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 |
2 files changed, 2 insertions, 3 deletions
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 11d1d5a0b4..3972e5722f 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 5b255a0e27..d194a69ab1 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. */ |