len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-09 21:25:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

i.MX31: Fix a couple oopses from r31528

Browse source 
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
This commit is contained in:
Michael Sevakis 2012-01-03 06:13:59 +00:00
parent 4c917f76c6
commit 30c4efcd16
3 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/export/mc13783.h
View file

@ -1338,12 +1338,6 @@ struct mc13783_event
void (*callback)(void); 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); void mc13783_enable_event(enum mc13783_event_ids id, bool enable);
/* Read the sense bit if one exists - valid only within event handlers */ /* Read the sense bit if one exists - valid only within event handlers */

2
firmware/target/arm/imx31/gigabeat-s/button-gigabeat-s.c
View file

@ -213,7 +213,7 @@ void button_close_device(void)
/* Assumes HP detection is not available */ /* Assumes HP detection is not available */
initialized = false; initialized = false;
mc13783_enable_event(MC13783_ONOFD1_EVENT, true); mc13783_enable_event(MC13783_ONOFD1_EVENT, false);
ext_btn = BUTTON_NONE; ext_btn = BUTTON_NONE;
} }
#endif /* BUTTON_DRIVER_CLOSE */ #endif /* BUTTON_DRIVER_CLOSE */

3
firmware/target/arm/imx31/gigabeat-s/power-gigabeat-s.c
View file

@ -68,8 +68,7 @@ static void update_main_charger(bool present)
/* Detect changes in presence of the AC adaptor. Called from PMIC ISR. */ /* Detect changes in presence of the AC adaptor. Called from PMIC ISR. */
void charger_main_detect_event(void) void charger_main_detect_event(void)
{ {
update_main_charger(mc13783_event_sense(MC13783_INT_ID_SE1) update_main_charger(mc13783_event_sense(MC13783_SE1_EVENT));
& MC13783_SE1S);
} }
/* Detect changes in USB bus power. Called from usb connect event ISR. */ /* Detect changes in USB bus power. Called from usb connect event ISR. */