Changeset 54d71e1 in mainline for uspace/drv/vhc/hub/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/hub.c (modified) (9 diffs)

uspace/drv/vhc/hub/hub.c

@@ -34 +34 @@
  */
 #include <usb/classes/classes.h>
-#include <usbvirt/hub.h>
 #include <usbvirt/device.h>
 #include <errno.h>
@@ -41 +40 @@
 #include <stdlib.h>
 #include <ddf/driver.h>
+#include <usb/debug.h>
 
 #include "hub.h"
@@ -96 +96 @@
  * @param index Port index (one based).
  */
-static void hub_init_port(hub_port_t *port, size_t index)
+static void hub_init_port(hub_port_t *port, hub_t *hub, size_t index)
 {
         port->connected_device = NULL;
@@ -102 +102 @@
         port->state = HUB_PORT_STATE_NOT_CONFIGURED;
         port->status_change = 0;
+        port->hub = hub;
 }
 
@@ -112 +113 @@
         size_t i;
         for (i = 0; i < HUB_PORT_COUNT; i++) {
-                hub_init_port(&hub->ports[i], i + 1);
+                hub_init_port(&hub->ports[i], hub, i + 1);
         }
         hub->custom_data = NULL;
+        hub->signal_changes = true;
         fibril_mutex_initialize(&hub->guard);
 }
@@ -229 +231 @@
         }
 
+        usb_log_debug("Setting port %zu to state %d.\n", port_index, state);
+
         switch (state) {
                 case HUB_PORT_STATE_POWERED_OFF:
@@ -236 +240 @@
                         break;
                 case HUB_PORT_STATE_RESUMING:
+                        port->state = state;
                         set_port_state_delayed(hub, port_index,
                             10, state, HUB_PORT_STATE_ENABLED);
                         break;
                 case HUB_PORT_STATE_RESETTING:
+                        port->state = state;
                         set_port_state_delayed(hub, port_index,
                             10, state, HUB_PORT_STATE_ENABLED);
@@ -415 +421 @@
 {
         assert(port != NULL);
+        uint16_t old_value = port->status_change;
         port->status_change |= change;
+        usb_log_debug("Changing status change on %zu: %04x => %04x\n",
+            port->index,
+            (unsigned int) old_value, (unsigned int) port->status_change);
+        port->hub->signal_changes = true;
 }
 
@@ -428 +439 @@
         assert(port != NULL);
         port->status_change &= (~change);
+        port->hub->signal_changes = true;
 }