Changeset b4b534ac in mainline for uspace/drv/bus/usb/vhc/hub/virthub.c

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (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 from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/vhc/hub/virthub.c (modified) (5 diffs)

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

@@ -34 +34 @@
  */
 #include <usb/classes/classes.h>
+#include <usb/classes/hub.h>
 #include <usbvirt/device.h>
 #include <assert.h>
 #include <errno.h>
 #include <str_error.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <ddf/driver.h>
@@ -75 +77 @@
         .type = USB_DESCTYPE_HUB,
         .port_count = HUB_PORT_COUNT,
-        .characteristics = 0, 
+        .characteristics = HUB_CHAR_NO_POWER_SWITCH_FLAG | HUB_CHAR_NO_OC_FLAG,
         .power_on_warm_up = 50, /* Huh? */
         .max_current = 100, /* Huh again. */
@@ -96 +98 @@
         .length = sizeof(usb_standard_configuration_descriptor_t),
         .descriptor_type = USB_DESCTYPE_CONFIGURATION,
-        .total_length = 
+        .total_length =
                 sizeof(usb_standard_configuration_descriptor_t)
                 + sizeof(std_interface_descriptor)
@@ -144 +146 @@
  * @return Error code.
  */
-int virthub_init(usbvirt_device_t *dev)
+int virthub_init(usbvirt_device_t *dev, const char* name)
 {
         if (dev == NULL) {
@@ -151 +153 @@
         dev->ops = &hub_ops;
         dev->descriptors = &descriptors;
+        dev->address = 0;
+        dev->name = str_dup(name);
+        if (!dev->name)
+                return ENOMEM;
 
         hub_t *hub = malloc(sizeof(hub_t));
         if (hub == NULL) {
+                free(dev->name);
                 return ENOMEM;
         }