len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-05-12 19:53:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

New USB charging system, part 1 - API rework and user-visible setting update

Browse source 
1) "Charge during USB connection" option is now tristate: off/on/force. Currently "force" behaves just like "on", but in future it will allow charging even when it was not possible to positively identify a charger.

2) The H300 code has been adjusted to use the new system but there should be no functional differences, it already had the USB charging option and its USB/charging support is hardware controlled.

3) The Gigabeat S code has been adjusted to use the new system: the player now has the USB charging option, which wasn't previously available. The player will only charge at full speed when allowed to do so by a working USB host, so USB AC adapters won't work very well; however, they didn't work before either, so this is not a change in functionality.

4) The iPod Nano 2G code has been adjusted to use the new system: it already had the USB charging option. Using a USB AC adapter won't charge at full speed any more (it did before) - the old implementation was equivalent to the not-yet-implemented "force" option in the new system.

No other target should be affected. Support for the "force" mode and support for at least some other iPod models will come in a future commit :)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26570 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Torne Wuff 2010-06-05 10:05:27 +00:00
parent e49464b387
commit 991e92fd3d
11 changed files with 87 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

42
firmware/usbstack/usb_core.c
View file

@ -166,6 +166,11 @@ static int usb_address = 0;
static bool initialized = false;
static enum { DEFAULT, ADDRESS, CONFIGURED } usb_state;
#ifdef HAVE_USB_CHARGING_ENABLE
static int usb_charging_mode = USB_CHARGING_DISABLE;
static int usb_charging_current_requested = 500;
#endif
static int usb_core_num_interfaces;
typedef void (*completion_handler_t)(int ep, int dir, int status, int length);
@ -378,6 +383,9 @@ void usb_core_exit(void)
initialized = false;
}
usb_state = DEFAULT;
#ifdef HAVE_USB_CHARGING_ENABLE
usb_charging_maxcurrent_change(usb_charging_maxcurrent());
#endif
logf("usb_core_exit() finished");
}
@ -552,6 +560,16 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req)
config_descriptor.bDescriptorType =
USB_DT_OTHER_SPEED_CONFIG;
}
#ifdef HAVE_USB_CHARGING_ENABLE
if (usb_charging_mode == USB_CHARGING_DISABLE) {
config_descriptor.bMaxPower = (100+1)/2;
usb_charging_current_requested = 100;
}
else {
config_descriptor.bMaxPower = (500+1)/2;
usb_charging_current_requested = 500;
}
#endif
size = sizeof(struct usb_config_descriptor);
for(i = 0; i < USB_NUM_DRIVERS; i++)
@ -628,8 +646,10 @@ static void request_handler_device(struct usb_ctrlrequest* req)
}
else
usb_state = ADDRESS;
usb_drv_send(EP_CONTROL, NULL, 0);
#ifdef HAVE_USB_CHARGING_ENABLE
usb_charging_maxcurrent_change(usb_charging_maxcurrent());
#endif
break;
}
case USB_REQ_SET_ADDRESS: {
@ -809,6 +829,9 @@ void usb_core_bus_reset(void)
{
usb_address = 0;
usb_state = DEFAULT;
#ifdef HAVE_USB_CHARGING_ENABLE
usb_charging_maxcurrent_change(usb_charging_maxcurrent());
#endif
}
/* called by usb_drv_transfer_completed() */
@ -850,9 +873,20 @@ void usb_core_control_request(struct usb_ctrlrequest* req)
usb_signal_transfer_completion(completion_event);
}
#ifdef HAVE_USB_POWER
unsigned short usb_allowed_current()
#ifdef HAVE_USB_CHARGING_ENABLE
void usb_charging_enable(int state)
{
return (usb_state == CONFIGURED) ? MAX(USB_MAX_CURRENT, 100) : 100;
usb_charging_mode = state;
usb_charging_maxcurrent_change(usb_charging_maxcurrent());
}
int usb_charging_maxcurrent()
{
if (!initialized
|| usb_charging_mode == USB_CHARGING_DISABLE
|| usb_state != CONFIGURED)
return 100;
/* usb_state == CONFIGURED, charging enabled/forced */
return usb_charging_current_requested;
}
#endif