summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2015-01-02 00:26:28 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2015-01-08 16:44:55 +0100
commit268114ee666448398a13a9099e95d4f28d90493e (patch)
treeae5ae5626b0a87ae1913fa2aee00dcc9a57b2056
parent66690ca98709773c2591d6090d9c0274bb723c37 (diff)
downloadrockbox-268114ee666448398a13a9099e95d4f28d90493e.zip
rockbox-268114ee666448398a13a9099e95d4f28d90493e.tar.gz
rockbox-268114ee666448398a13a9099e95d4f28d90493e.tar.bz2
rockbox-268114ee666448398a13a9099e95d4f28d90493e.tar.xz
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 <amaury.pouly@gmail.com>
-rw-r--r--firmware/export/usb.h7
-rw-r--r--firmware/export/usb_core.h10
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