Changeset 41df71f9 in mainline for uspace/drv

Timestamp:

2017-11-02T14:29:15Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

887c9de

Parents:

479e32d

Message:

ddf: split usb interface to usb and usbhc

Location:

uspace/drv/bus/usb/usbhub

Files:

• port.c (modified) (7 diffs)
• port.h (modified) (1 diff)

uspace/drv/bus/usb/usbhub/port.c

@@ -40 +40 @@
 #include <inttypes.h>
 #include <fibril_synch.h>
+#include <usbhc_iface.h>
 
 #include <usb/debug.h>
@@ -267 +268 @@
         if (!exch)
                 return ENOMEM;
-        const int rc = usb_device_remove(exch, port->port_number);
+        const int rc = usbhc_device_remove(exch, port->port_number);
         usb_device_bus_exchange_end(exch);
         if (rc == EOK)
@@ -405 +406 @@
 
         /* Reserve default address */
-        while ((ret = usb_reserve_default_address(exch, speed)) == ENOENT) {
+        while ((ret = usbhc_reserve_default_address(exch, speed)) == ENOENT) {
                 async_usleep(1000000);
         }
@@ -421 +422 @@
                 usb_log_error("(%p-%u): Failed to reset port.", hub,
                     port->port_number);
-                if (usb_release_default_address(exch) != EOK)
+                if (usbhc_release_default_address(exch) != EOK)
                         usb_log_warning("(%p-%u): Failed to release default "
                             "address.", hub, port->port_number);
@@ -430 +431 @@
             port->port_number);
 
-        ret = usb_device_enumerate(exch, port->port_number);
+        ret = usbhc_device_enumerate(exch, port->port_number);
         if (ret != EOK) {
                 usb_log_error("(%p-%u): Failed to enumerate device: %s", hub,
@@ -440 +441 @@
                             port->port_number, str_error(ret));
                 } else {
-                        const int ret = usb_release_default_address(exch);
+                        const int ret = usbhc_release_default_address(exch);
                         if (ret != EOK)
                                 usb_log_warning("(%p-%u): Failed to release "
@@ -450 +451 @@
                     port->port_number);
                 port->device_attached = true;
-                if (usb_release_default_address(exch) != EOK)
+                if (usbhc_release_default_address(exch) != EOK)
                         usb_log_warning("(%p-%u): Failed to release default "
                             "address", hub, port->port_number);

uspace/drv/bus/usb/usbhub/port.h

@@ -40 +40 @@
 #include <usb/dev/driver.h>
 #include <usb/classes/hub.h>
-#include <usb_iface.h>
 
 typedef struct usb_hub_dev usb_hub_dev_t;