Changeset a81a1d09 in mainline for uspace/app/vuhid/device.c

Timestamp:

2011-05-11T16:49:28Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

19387b61

Parents:

e1dbcbc (diff), 9212f8a (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 development/ changes

File:

• uspace/app/vuhid/device.c (modified) (5 diffs)

uspace/app/vuhid/device.c

@@ -77 +77 @@
 {
         vuhid_interface_t *iface = arg;
+        vuhid_data_t *hid_data = iface->vuhid_data;
 
         if (iface->live != NULL) {
                 iface->live(iface);
         }
+
+        fibril_mutex_lock(&hid_data->iface_count_mutex);
+        hid_data->iface_died_count++;
+        fibril_condvar_broadcast(&hid_data->iface_count_cv);
+        fibril_mutex_unlock(&hid_data->iface_count_mutex);
 
         return EOK;
@@ -110 +116 @@
         if ((iface->in_data_size == 0) && (iface->out_data_size == 0)) {
                 return EEMPTY;
+        }
+
+        // FIXME - we shall set vuhid_data to NULL in the main() rather
+        // than to depend on individual interfaces
+        /* Already used interface. */
+        if (iface->vuhid_data != NULL) {
+                return EEXISTS;
         }
 
@@ -252 +265 @@
 
         /* Launch the "life" fibril. */
+        iface->vuhid_data = hid_data;
         fid_t life_fibril = fibril_create(interface_life_fibril, iface);
         if (life_fibril == 0) {
@@ -310 +324 @@
             += total_descr_size;
 
+        hid_data->iface_count++;
         fibril_add_ready(life_fibril);
 
@@ -331 +346 @@
 }
 
+void wait_for_interfaces_death(usbvirt_device_t *dev)
+{
+        vuhid_data_t *hid_data = dev->device_data;
+
+        fibril_mutex_lock(&hid_data->iface_count_mutex);
+        while (hid_data->iface_died_count < hid_data->iface_count) {
+                fibril_condvar_wait(&hid_data->iface_count_cv,
+                    &hid_data->iface_count_mutex);
+        }
+        fibril_mutex_unlock(&hid_data->iface_count_mutex);
+}
 
 /** @}