Changeset ace12560 in mainline for uspace/drv/usbhub

Timestamp:

2011-02-20T21:52:43Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

b317b0b, d37b235

Parents:

62066b4 (diff), 41e645c (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:

yet another merge with usb/development

File:

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

uspace/drv/usbhub/usbhub.c

@@ -39 +39 @@
 
 #include <usb_iface.h>
+#include <usb/ddfiface.h>
 #include <usb/usbdrv.h>
 #include <usb/descriptor.h>
@@ -52 +53 @@
 #include "usb/pipes.h"
 
-static int iface_get_hc_handle(device_t *device, devman_handle_t *handle)
-{
-        return usb_hc_find(device->handle, handle);
-}
-
-static usb_iface_t hub_usb_iface = {
-        .get_hc_handle = iface_get_hc_handle
-};
-
 static device_ops_t hub_device_ops = {
-        .interfaces[USB_DEV_IFACE] = &hub_usb_iface
+        .interfaces[USB_DEV_IFACE] = &usb_iface_hub_impl
 };