Changeset fe1776c2 in mainline for uspace/lib/usb/src/recognise.c

Timestamp:

2011-02-11T12:41:11Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d81ef61c

Parents:

78d1525 (diff), 5d4193c (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 usb/development

File:

• uspace/lib/usb/src/recognise.c (modified) (4 diffs)

uspace/lib/usb/src/recognise.c

@@ -33 +33 @@
  * @brief Functions for recognising kind of attached devices.
  */
+#include <sys/types.h>
 #include <usb_iface.h>
 #include <usb/usbdrv.h>
@@ -359 +360 @@
 {
         static size_t device_name_index = 0;
+        static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
+
+        size_t this_device_name_index;
+
+        fibril_mutex_lock(&device_name_index_mutex);
+        this_device_name_index = device_name_index;
+        device_name_index++;
+        fibril_mutex_unlock(&device_name_index_mutex);
+
 
         device_t *child = NULL;
@@ -374 +384 @@
          * naming etc., something more descriptive could be created.
          */
-        rc = asprintf(&child_name, "usbdev%02zu", device_name_index);
+        rc = asprintf(&child_name, "usbdev%02zu", this_device_name_index);
         if (rc < 0) {
                 goto failure;
@@ -396 +406 @@
         }
         
-        device_name_index++;
-
         return EOK;