Changeset 3819ce5 in mainline for uspace/lib/usbdev/src/recognise.c

Timestamp:

2011-12-25T10:05:28Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ecf823a

Parents:

1440eae (diff), 7e1b130 (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 mainline

File:

• uspace/lib/usbdev/src/recognise.c (modified) (2 diffs)

uspace/lib/usbdev/src/recognise.c

@@ -45 +45 @@
 #include <errno.h>
 #include <assert.h>
-
-/** Index to append after device name for uniqueness. */
-static size_t device_name_index = 0;
-/** Mutex guard for device_name_index. */
-static FIBRIL_MUTEX_INITIALIZE(device_name_index_mutex);
 
 /** DDF operations of child devices. */
@@ -329 +324 @@
         }
 
-        fibril_mutex_lock(&device_name_index_mutex);
-        const size_t this_device_name_index = device_name_index++;
-        fibril_mutex_unlock(&device_name_index_mutex);
+        /** Index to append after device name for uniqueness. */
+        static atomic_t device_name_index = {0};
+        const size_t this_device_name_index =
+            (size_t) atomic_preinc(&device_name_index);
 
         ddf_fun_t *child = NULL;