Changes in uspace/drv/vhc/hub.c [4b4c797:1e32a63] in mainline

File:

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

uspace/drv/vhc/hub.c

@@ -37 +37 @@
 #include <usbvirt/device.h>
 #include <errno.h>
+#include <str_error.h>
 #include <stdlib.h>
+#include <driver.h>
 
 #include "vhcd.h"
 #include "hub.h"
 #include "hubintern.h"
+#include "conn.h"
 
 
@@ -141 +144 @@
         .ops = &hub_ops,
         .descriptors = &descriptors,
-        .lib_debug_level = 4,
+        .lib_debug_level = 0,
         .lib_debug_enabled_tags = USBVIRT_DEBUGTAG_ALL
 };
@@ -148 +151 @@
 hub_device_t hub_dev;
 
+static usb_address_t hub_set_address(usbvirt_device_t *hub)
+{
+        usb_address_t new_address;
+        int rc = vhc_iface.request_address(NULL, &new_address);
+        if (rc != EOK) {
+                return rc;
+        }
+        
+        usb_device_request_setup_packet_t setup_packet = {
+                .request_type = 0,
+                .request = USB_DEVREQ_SET_ADDRESS,
+                .index = 0,
+                .length = 0,
+        };
+        setup_packet.value = new_address;
+
+        hub->transaction_setup(hub, 0, &setup_packet, sizeof(setup_packet));
+        hub->transaction_in(hub, 0, NULL, 0, NULL);
+        
+        return new_address;
+}
+
 /** Initialize virtual hub. */
-void hub_init(void)
-{
-        size_t i;
+void hub_init(device_t *hc_dev)
+{
+        size_t i;
+        
         for (i = 0; i < HUB_PORT_COUNT; i++) {
                 hub_port_t *port = &hub_dev.ports[i];
                 
+                port->index = (int) i + 1;
                 port->device = NULL;
                 port->state = HUB_PORT_STATE_NOT_CONFIGURED;
                 port->status_change = 0;
+                fibril_mutex_initialize(&port->guard);
         }
         
@@ -163 +191 @@
         
         dprintf(1, "virtual hub (%d ports) created", HUB_PORT_COUNT);
+
+        usb_address_t hub_address = hub_set_address(&virthub_dev);
+        if (hub_address < 0) {
+                dprintf(1, "problem changing hub address (%s)",
+                    str_error(hub_address));
+        }
+
+        dprintf(2, "virtual hub address changed to %d", hub_address);
+
+        char *id;
+        int rc = asprintf(&id, "usb&hub");
+        if (rc <= 0) {
+                return;
+        }
+        devman_handle_t hub_handle;
+        rc = child_device_register_wrapper(hc_dev, "hub", id, 10, &hub_handle);
+        if (rc != EOK) {
+                free(id);
+        }
+
+        vhc_iface.bind_address(NULL, hub_address, hub_handle);  
+
+        dprintf(2, "virtual hub has devman handle %d", (int) hub_handle);
 }
 
@@ -175 +226 @@
         for (i = 0; i < HUB_PORT_COUNT; i++) {
                 hub_port_t *port = &hub_dev.ports[i];
+                fibril_mutex_lock(&port->guard);
                 
                 if (port->device != NULL) {
+                        fibril_mutex_unlock(&port->guard);
                         continue;
                 }
@@ -191 +244 @@
                 //if (port->state == HUB_PORT_STATE_DISCONNECTED) {
                         port->state = HUB_PORT_STATE_DISABLED;
-                        set_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION);
+                        set_port_status_change_nl(port, HUB_STATUS_C_PORT_CONNECTION);
                 //}
                 
+                fibril_mutex_unlock(&port->guard);
+
                 return i;
         }