Changeset 54d71e1 in mainline for uspace/drv/vhc/hub.c

Timestamp:

2011-04-29T07:05:30Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

361fcec

Parents:

9014dcd (diff), cd4ae1e (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 development

File:

• uspace/drv/vhc/hub.c (modified) (2 diffs)

uspace/drv/vhc/hub.c

@@ -34 +34 @@
  */
 #include <usb/classes/classes.h>
-#include <usbvirt/hub.h>
 #include <usbvirt/device.h>
 #include <errno.h>
@@ -45 +44 @@
 
 #include "hub.h"
-#include "hub/virthub.h"
+//#include "hub/virthub.h"
 #include "vhcd.h"
 #include "conn.h"
 
-usbvirt_device_t virtual_hub_device;
+usbvirt_device_t virtual_hub_device = {
+        .name = "root hub",
+        .ops = &hub_ops,
+        .address = 0
+};
+
 static ddf_dev_ops_t rh_ops = {
         .interfaces[USB_DEV_IFACE] = &rh_usb_iface,