Changeset f5f0cfb in mainline for uspace/drv/bus/usb/vhc/hub

Timestamp:

2012-12-22T16:24:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1e2af6a9

Parents:

f6577d9

Message:

vhc: Remove single instance limitation.

Embed hub vitrul device instead of using global instance.

Location:

uspace/drv/bus/usb/vhc/hub

Files:

• virthub.c (modified) (2 diffs)
• virthub.h (modified) (1 diff)

uspace/drv/bus/usb/vhc/hub/virthub.c

@@ -146 +146 @@
  * @return Error code.
  */
-int virthub_init(usbvirt_device_t *dev)
+int virthub_init(usbvirt_device_t *dev, const char* name)
 {
         if (dev == NULL) {
@@ -153 +153 @@
         dev->ops = &hub_ops;
         dev->descriptors = &descriptors;
+        dev->address = 0;
+        dev->name = str_dup(name);
+        if (!name)
+                return ENOMEM;
 
         hub_t *hub = malloc(sizeof(hub_t));
         if (hub == NULL) {
+                free(dev->name);
                 return ENOMEM;
         }

uspace/drv/bus/usb/vhc/hub/virthub.h

@@ -79 +79 @@
 extern hub_descriptor_t hub_descriptor;
 
-int virthub_init(usbvirt_device_t *);
+int virthub_init(usbvirt_device_t *, const char *name);
 int virthub_connect_device(usbvirt_device_t *, vhc_virtdev_t *);
 int virthub_disconnect_device(usbvirt_device_t *, vhc_virtdev_t *);