From 268114ee666448398a13a9099e95d4f28d90493e Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Fri, 2 Jan 2015 00:26:28 +0100 Subject: usb: move usb charging function prototype from usb_core.h to usb.h Change-Id: Id29c60d3aa26f8badca6c38c1cbb2e5a39c554dc Reviewed-on: http://gerrit.rockbox.org/1094 Reviewed-by: Amaury Pouly --- firmware/export/usb.h | 7 +++++++ firmware/export/usb_core.h | 10 ---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/firmware/export/usb.h b/firmware/export/usb.h index 13ef398..6c9cdac 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h @@ -127,6 +127,13 @@ void usb_charging_enable(int state); #ifdef HAVE_USBSTACK void usb_charger_update(void); #endif /* HAVE_USBSTACK */ +/* hardware which knows how to control usb current should use one + * of the following to find out from the usb stack how much is ok + */ +/* implemented by target, called by usb when value changes */ +void usb_charging_maxcurrent_change(int maxcurrent); +/* implemented by usb, called by target to get value */ +int usb_charging_maxcurrent(void); #endif /* HAVE_USB_CHARGING_ENABLE */ #endif /* HAVE_USB_POWER */ #ifdef HAVE_USBSTACK diff --git a/firmware/export/usb_core.h b/firmware/export/usb_core.h index 9e3d0d7..75fafc0 100644 --- a/firmware/export/usb_core.h +++ b/firmware/export/usb_core.h @@ -63,15 +63,5 @@ void usb_core_release_endpoint(int dir); void usb_core_hotswap_event(int volume,bool inserted); #endif -#ifdef HAVE_USB_CHARGING_ENABLE -/* hardware which knows how to control usb current should use one - * of the following to find out from the usb stack how much is ok - */ -/* implemented by target, called by usb when value changes */ -void usb_charging_maxcurrent_change(int maxcurrent); -/* implemented by usb, called by target to get value */ -int usb_charging_maxcurrent(void); -#endif - #endif -- cgit v1.1