Changeset 37f7cfe in mainline for uspace/drv/vhc/hub.c

Timestamp:

2010-12-13T01:11:27Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

75732da, a9b6bec

Parents:

682b697 (diff), f9a0cef (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 vojtechhorky/ - hub driver and VHC fixes

The hub driver shall be working by now. At least a bit.

File:

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

uspace/drv/vhc/hub.c

@@ -144 +144 @@
         .ops = &hub_ops,
         .descriptors = &descriptors,
-        .lib_debug_level = 1,
+        .lib_debug_level = 0,
         .lib_debug_enabled_tags = USBVIRT_DEBUGTAG_ALL
 };
@@ -181 +181 @@
                 hub_port_t *port = &hub_dev.ports[i];
                 
-                port->index = (int) 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);
         }
         
@@ -225 +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;
                 }
@@ -241 +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;
         }