Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Dec 4, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion wireless/bluetooth/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ if(CONFIG_WIRELESS_BLUETOOTH)
list(
APPEND
SRCS
bt_atomic.c
bt_att.c
bt_conn.c
bt_gatt.c
Expand Down
2 changes: 1 addition & 1 deletion wireless/bluetooth/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
112 changes: 0 additions & 112 deletions wireless/bluetooth/bt_atomic.c
View file
Open in desktop

This file was deleted.

26 changes: 10 additions & 16 deletions wireless/bluetooth/bt_atomic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Loading