bt_atomic: use atomic macro to replace wireless/bluetooth/bt_atomic.c

Signed-off-by: hujun5 <[email protected]>
apache · Dec 2, 2024 · e337295 · e337295
1 parent 30940d9
commit e337295
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 130 deletions.
diff --git a/wireless/bluetooth/CMakeLists.txt b/wireless/bluetooth/CMakeLists.txt
@@ -29,7 +29,6 @@ if(CONFIG_WIRELESS_BLUETOOTH)
     list(
       APPEND
       SRCS
-      bt_atomic.c
       bt_att.c
       bt_conn.c
       bt_gatt.c

diff --git a/wireless/bluetooth/Make.defs b/wireless/bluetooth/Make.defs
@@ -30,7 +30,7 @@ ifeq ($(CONFIG_WIRELESS_BLUETOOTH_HOST),y)
 
 # Host-layer
 
-CSRCS += bt_atomic.c bt_att.c  bt_conn.c bt_gatt.c
+CSRCS += bt_att.c  bt_conn.c bt_gatt.c
 CSRCS += bt_ioctl.c bt_keys.c bt_l2cap.c bt_smp.c
 CSRCS += bt_uuid.c bt_services.c
 

diff --git a/wireless/bluetooth/bt_atomic.c b/wireless/bluetooth/bt_atomic.c
diff --git a/wireless/bluetooth/bt_atomic.h b/wireless/bluetooth/bt_atomic.h
@@ -37,26 +37,20 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define bt_atomic_set(ptr, value)     (*(ptr) = (value))
-#define bt_atomic_get(ptr)            (*(ptr))
-#define bt_atomic_testbit(ptr, bitno) ((*(ptr) & (1 << (bitno))) != 0)
+#define bt_atomic_set(ptr, value)        atomic_store((ptr), (value));
+#define bt_atomic_get(ptr)               atomic_load(ptr)
+#define bt_atomic_testbit(ptr, bitno)    ((atomic_load(ptr) & (1 << (bitno))) != 0)
+#define bt_atomic_incr(ptr)              atomic_fetch_add((ptr), 1)
+#define bt_atomic_decr(ptr)              atomic_fetch_sub((ptr), 1)
+#define bt_atomic_setbit(ptr, bitno)     atomic_fetch_or((ptr), ((1 << (bitno))))
+#define bt_atomic_clrbit(ptr, bitno)     atomic_fetch_and((ptr), (~(1 << (bitno))))
+#define bt_atomic_testsetbit(ptr, bitno) ((atomic_fetch_or((ptr), (1 << (bitno))) & (1 << (bitno))) != 0)
+#define bt_atomic_testclrbit(ptr, bitno) ((atomic_fetch_and((ptr), ~(1 << (bitno))) & (1 << (bitno))) != 0)
 
 /****************************************************************************
  * Public Types
  ****************************************************************************/
 
-typedef uint8_t bt_atomic_t;
-
-/****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-bt_atomic_t bt_atomic_incr(FAR bt_atomic_t *ptr);
-bt_atomic_t bt_atomic_decr(FAR bt_atomic_t *ptr);
-bt_atomic_t bt_atomic_setbit(FAR bt_atomic_t *ptr, bt_atomic_t bitno);
-bt_atomic_t bt_atomic_clrbit(FAR bt_atomic_t *ptr, bt_atomic_t bitno);
-
-bool bt_atomic_testsetbit(FAR bt_atomic_t *ptr, bt_atomic_t bitno);
-bool bt_atomic_testclrbit(FAR bt_atomic_t *ptr, bt_atomic_t bitno);
+typedef atomic_char bt_atomic_t;
 
 #endif /* __WIRELESS_BLUETOOTH_BT_ATOMIC_H */