Changeset 498ced1 in mainline for uspace/lib/usbhost

Timestamp:

2018-08-11T02:43:32Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

05882233

Parents:

b13d80b

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-11 02:29:02)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-11 02:43:32)

Message:

Unify reference counting and remove some unnecessary instances of <atomic.h>

Location:

uspace/lib/usbhost

Files:

• include/usb/host/endpoint.h (modified) (2 diffs)
• include/usb/host/usb_transfer_batch.h (modified) (1 diff)
• src/endpoint.c (modified) (4 diffs)

uspace/lib/usbhost/include/usb/host/endpoint.h

@@ -42 +42 @@
 
 #include <adt/list.h>
-#include <atomic.h>
 #include <fibril_synch.h>
+#include <refcount.h>
 #include <stdbool.h>
 #include <sys/time.h>
@@ -78 +78 @@
         device_t *device;
         /** Reference count. */
-        atomic_t refcnt;
+        atomic_refcount_t refcnt;
 
         /** An inherited guard */

uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h

@@ -38 +38 @@
 #define LIBUSBHOST_HOST_USB_TRANSFER_BATCH_H
 
-#include <atomic.h>
 #include <errno.h>
+#include <refcount.h>
 #include <stddef.h>
 #include <stdint.h>

uspace/lib/usbhost/src/endpoint.c

@@ -36 +36 @@
 
 #include <assert.h>
-#include <atomic.h>
 #include <mem.h>
 #include <stdlib.h>
@@ -60 +59 @@
         ep->device = dev;
 
-        atomic_set(&ep->refcnt, 0);
+        refcount_init(&ep->refcnt);
         fibril_condvar_initialize(&ep->avail);
 
@@ -91 +90 @@
 void endpoint_add_ref(endpoint_t *ep)
 {
-        atomic_inc(&ep->refcnt);
+        refcount_up(&ep->refcnt);
 }
 
@@ -115 +114 @@
 void endpoint_del_ref(endpoint_t *ep)
 {
-        if (atomic_predec(&ep->refcnt) == 0) {
+        if (refcount_down(&ep->refcnt))
                 endpoint_destroy(ep);
-        }
 }