Changeset 43c3937 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-01-07T10:43:15Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

5097bed4

Parents:

5f7d96e (diff), 0f191a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with usb/development

File:

• uspace/drv/usbhub/usbhub.c (modified) (4 diffs)

uspace/drv/usbhub/usbhub.c

@@ -37 +37 @@
 #include <errno.h>
 
-#include <usbhc_iface.h>
+#include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/descriptor.h>
@@ -46 +46 @@
 #include "usbhub_private.h"
 #include "port_status.h"
+
+static usb_iface_t hub_usb_iface = {
+        .get_hc_handle = usb_drv_find_hc
+};
+
+static device_ops_t hub_device_ops = {
+        .interfaces[USB_DEV_IFACE] = &hub_usb_iface
+};
 
 //*********************************************
@@ -135 +143 @@
          * connected devices.
          */
+        dev->ops = &hub_device_ops;
 
         //create the hub structure
         //get hc connection
-        int hc = usb_drv_hc_connect(dev, 0);
+        int hc = usb_drv_hc_connect_auto(dev, 0);
+        if (hc < 0) {
+                return hc;
+        }
 
         usb_hub_info_t * hub_info = usb_create_hub_info(dev, hc);
@@ -464 +476 @@
                  * Connect to respective HC.
                  */
-                int hc = usb_drv_hc_connect(hub_info->device, 0);
+                int hc = usb_drv_hc_connect_auto(hub_info->device, 0);
                 if (hc < 0) {
                         continue;