Changeset 9e195e2c in mainline for uspace/app/vuhid/main.c

Timestamp:

2011-05-12T09:03:00Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

d59d0bb

Parents:

456aea3 (diff), c372e03 (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 development

File:

• uspace/app/vuhid/main.c (modified) (3 diffs)

uspace/app/vuhid/main.c

@@ -132 +132 @@
         .in_endpoint_first_free = 1,
         .out_endpoints_mapping = { NULL },
-        .out_endpoint_first_free = 1
-};
+        .out_endpoint_first_free = 1,
+
+        .iface_count = 0,
+        .iface_died_count = 0
+        // mutex and CV must be initialized elsewhere
+};
+
 
 /** Keyboard device.
@@ -151 +156 @@
 
         usb_log_enable(USB_LOG_LEVEL_DEBUG2, "vusbhid");
+
+        fibril_mutex_initialize(&vuhid_data.iface_count_mutex);
+        fibril_condvar_initialize(&vuhid_data.iface_count_cv);
 
         /* Determine which interfaces to initialize. */
@@ -182 +190 @@
         printf("Connected to VHCD...\n");
 
-        while (true) {
-                async_usleep(10 * 1000 * 1000);
-        }
+        wait_for_interfaces_death(&hid_dev);
         
         printf("Terminating...\n");
         
+        usbvirt_device_unplug(&hid_dev);
+
         return 0;
 }