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

iPod Classic: use PMU interrupts to detect USB and FW

Browse source 
Change-Id: I9be733e1a943ddeb99335d362f81f74879eeb94b
This commit is contained in:
Cástor Muñoz 2016-05-25 23:43:26 +02:00
parent f6ed4f8306
commit daee722455
6 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
firmware/target/arm/s5l8702/ipod6g/pmu-ipod6g.c
View file

@ -161,18 +161,12 @@ static struct eint_handler pmu_eint = {
};
static int pmu_input_holdswitch;
static int pmu_input_usb;
int pmu_holdswitch_locked(void)
{
return pmu_input_holdswitch;
}
int pmu_usb_present(void)
{
return pmu_input_usb;
}
#ifdef IPOD_ACCESSORY_PROTOCOL
static int pmu_input_accessory;
@ -206,7 +200,10 @@ static void pmu_read_inputs_gpio(void)
static void pmu_read_inputs_ooc(void)
{
unsigned char oocstat = pmu_read(PCF5063X_REG_OOCSTAT);
pmu_input_usb = !!(oocstat & PCF5063X_OOCSTAT_EXTON2);
if (oocstat & PCF5063X_OOCSTAT_EXTON2)
usb_insert_int();
else
usb_remove_int();
#ifdef IPOD_ACCESSORY_PROTOCOL
pmu_input_accessory = !(oocstat & PCF5063X_OOCSTAT_EXTON3);
#endif

1
firmware/target/arm/s5l8702/ipod6g/pmu-target.h
View file

@ -92,7 +92,6 @@ void pmu_write_rtc(unsigned char* buffer);
void pmu_hdd_power(bool on);
int pmu_holdswitch_locked(void);
int pmu_usb_present(void);
#if CONFIG_CHARGING
int pmu_firewire_present(void);
#endif

17
firmware/target/arm/s5l8702/ipod6g/power-ipod6g.c
View file

@ -119,17 +119,12 @@ void usb_charging_maxcurrent_change(int maxcurrent)
unsigned int power_input_status(void)
{
/* This checks if USB Vbus is present. */
if (!(PDAT(12) & 0x8)) return POWER_INPUT_USB_CHARGER;
/* If USB Vbus is not present, check if we have a positive power balance
regardless. This would indicate FireWire charging. Note that this will
drop to POWER_INPUT_NONE if FireWire isn't able to supply enough current
for device operation, e.g. during disk spinup. */
if (PDAT(11) & 0x20) return POWER_INPUT_NONE;
/* Looks like we have FireWire power. */
return POWER_INPUT_MAIN_CHARGER;
unsigned int status = POWER_INPUT_NONE;
if (usb_detect() == USB_INSERTED)
status |= POWER_INPUT_USB_CHARGER;
if (pmu_firewire_present())
status |= POWER_INPUT_MAIN_CHARGER;
return status;
}
bool charging_state(void)