Changeset 1866945 in mainline for uspace/app/vuhid/virthid.h

Timestamp:

2011-05-07T13:47:48Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d20ef7

Parents:

95285378 (diff), 6fb003e (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 usb/development

File:

• uspace/app/vuhid/virthid.h (modified) (4 diffs)

uspace/app/vuhid/virthid.h

@@ -38 +38 @@
 #include <usb/usb.h>
 #include <usbvirt/device.h>
+#include <fibril_synch.h>
 
 #define VUHID_ENDPOINT_MAX USB11_ENDPOINT_MAX
@@ -43 +44 @@
 
 typedef struct vuhid_interface vuhid_interface_t;
+
+typedef struct {
+        vuhid_interface_t *in_endpoints_mapping[VUHID_ENDPOINT_MAX];
+        size_t in_endpoint_first_free;
+        vuhid_interface_t *out_endpoints_mapping[VUHID_ENDPOINT_MAX];
+        size_t out_endpoint_first_free;
+        vuhid_interface_t *interface_mapping[VUHID_INTERFACE_MAX];
+
+        fibril_mutex_t iface_count_mutex;
+        fibril_condvar_t iface_count_cv;
+        size_t iface_count;
+        size_t iface_died_count;
+} vuhid_data_t;
 
 struct vuhid_interface {
@@ -63 +77 @@
 
         void *interface_data;
+
+        vuhid_data_t *vuhid_data;
 };
-
-typedef struct {
-        vuhid_interface_t *in_endpoints_mapping[VUHID_ENDPOINT_MAX];
-        size_t in_endpoint_first_free;
-        vuhid_interface_t *out_endpoints_mapping[VUHID_ENDPOINT_MAX];
-        size_t out_endpoint_first_free;
-        vuhid_interface_t *interface_mapping[VUHID_INTERFACE_MAX];
-} vuhid_data_t;
 
 typedef struct {
@@ -84 +92 @@
 
 int add_interface_by_id(vuhid_interface_t **, const char *, usbvirt_device_t *);
+void wait_for_interfaces_death(usbvirt_device_t *);
 
 #endif