summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--payloads/libpayload/drivers/usb/usb.c16
-rw-r--r--payloads/libpayload/drivers/usb/usbinit.c5
-rw-r--r--payloads/libpayload/include/libpayload.h1
3 files changed, 17 insertions, 5 deletions
diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c
index 4f423327d5..995b4c2918 100644
--- a/payloads/libpayload/drivers/usb/usb.c
+++ b/payloads/libpayload/drivers/usb/usb.c
@@ -68,6 +68,22 @@ detach_controller (hci_t *controller)
}
/**
+ * Shut down all controllers
+ */
+int
+usb_exit (void)
+{
+ if (usb_hcs == 0)
+ return 0;
+ hci_t *controller = usb_hcs;
+ while (controller != 0) {
+ controller->shutdown(controller);
+ controller = controller->next;
+ }
+ return 0;
+}
+
+/**
* Polls all hubs on all USB controllers, to find out about device changes
*/
void
diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c
index 3964197038..8499b82411 100644
--- a/payloads/libpayload/drivers/usb/usbinit.c
+++ b/payloads/libpayload/drivers/usb/usbinit.c
@@ -139,8 +139,3 @@ usb_initialize (void)
return 0;
}
-int
-usb_exit (void)
-{
- return 0;
-}
diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 80eaaa40b7..0e892c80cd 100644
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -123,6 +123,7 @@ void rtc_read_clock(struct tm *tm);
* @{
*/
int usb_initialize(void);
+int usb_exit (void);
int usbhid_havechar(void);
int usbhid_getchar(void);
/** @} */