Changeset 944f8fdd in mainline for uspace/drv/bus

Timestamp:

2018-01-19T17:38:22Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2833bb4

Parents:

861b5d6

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-19 17:06:40)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-19 17:38:22)

Message:

libusbhost: move utility functions to new header utility.h

Location:

uspace/drv/bus/usb

Files:

• ehci/main.c (modified) (2 diffs)
• ohci/main.c (modified) (2 diffs)
• uhci/main.c (modified) (2 diffs)
• vhc/main.c (modified) (2 diffs)
• xhci/bus.c (modified) (3 diffs)

uspace/drv/bus/usb/ehci/main.c

@@ -37 +37 @@
 #include <io/logctl.h>
 #include <usb/host/hcd.h>
-#include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include "res.h"
@@ -52 +52 @@
         .claim = disable_legacy,
         .start = hc_start,
-        .setup_root_hub = hcd_setup_virtual_root_hub,
+        .setup_root_hub = hc_setup_virtual_root_hub,
         .hc_gone = hc_gone,
 };

uspace/drv/bus/usb/ohci/main.c

@@ -43 +43 @@
 
 #include <usb/debug.h>
-#include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include "hc.h"
@@ -58 +58 @@
         .claim = hc_gain_control,
         .start = hc_start,
-        .setup_root_hub = hcd_setup_virtual_root_hub,
+        .setup_root_hub = hc_setup_virtual_root_hub,
         .hc_gone = hc_gone,
 };

uspace/drv/bus/usb/uhci/main.c

@@ -43 +43 @@
 #include <str_error.h>
 #include <usb/debug.h>
-#include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include "hc.h"
@@ -58 +58 @@
         .hc_add = hc_add,
         .start = hc_start,
-        .setup_root_hub = hcd_setup_virtual_root_hub,
+        .setup_root_hub = hc_setup_virtual_root_hub,
         .hc_gone = hc_gone,
 };

uspace/drv/bus/usb/vhc/main.c

@@ -40 +40 @@
 
 #include <usb/host/ddf_helpers.h>
+#include <usb/host/utility.h>
 
 #include <usb/debug.h>
@@ -106 +107 @@
          * needs to be ready at this time.
          */
-        ret = hcd_setup_virtual_root_hub(&vhc->base);
+        ret = hc_setup_virtual_root_hub(&vhc->base);
         if (ret != EOK) {
                 usb_log_error("Failed to init VHC root hub: %s",

uspace/drv/bus/usb/xhci/bus.c

@@ -36 +36 @@
 #include <usb/host/endpoint.h>
 #include <usb/host/hcd.h>
+#include <usb/host/utility.h>
 #include <usb/descriptor.h>
 #include <usb/debug.h>
@@ -113 +114 @@
 
         uint16_t max_packet_size;
-        if ((err = hcd_get_ep0_max_packet_size(&max_packet_size, (bus_t *) &hc->bus, &dev->base)))
+        if ((err = hc_get_ep0_max_packet_size(&max_packet_size, (bus_t *) &hc->bus, &dev->base)))
                 return err;
 
@@ -184 +185 @@
 
         /* Read the device descriptor, derive the match ids */
-        if ((err = hcd_device_explore(dev))) {
+        if ((err = hc_device_explore(dev))) {
                 usb_log_error("Device(%d): Failed to explore device: %s", dev->address, str_error(err));
                 goto err_address;