mirror of
https://github.com/espressif/esp-nimble.git
synced 2026-10-24 14:33:31 +00:00
nimble/host: Make BLE_UUIDxx_INIT macros C++ compatible
Allows to use `ble_uuid.h` with C++ by changing the BLE_UUIDy_INIT macros. Build environment: ninja 1.9.0 cmake 3.16 xtensa-esp32-elf-gcc.exe (crosstool-NG esp-2021r2-patch3) 8.4.0 (based on GCC 8.4.0)
This commit is contained in:
committed by
Rahul Tank
parent
6c86f7d2b7
commit
5e74787bf7
@@ -130,16 +130,6 @@ typedef union {
|
||||
.value = (uuid32), \
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Macro for initializing a 128-bit UUID.
|
||||
*
|
||||
* This macro initializes a 128-bit UUID with the provided value.
|
||||
*
|
||||
* @param ... A sequence of values in little-endian order representing
|
||||
* the 128-bit UUID.
|
||||
*
|
||||
* @return The initialized 128-bit UUID structure.
|
||||
*/
|
||||
#define BLE_UUID128_INIT(uuid128 ...) \
|
||||
{ \
|
||||
.u = { \
|
||||
@@ -149,8 +139,7 @@ typedef union {
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Macro for declaring a pointer to a 16-bit UUID structure initialized
|
||||
* with a specific 16-bit UUID value.
|
||||
* @brief Macro for declaring a pointer to a 16-bit UUID structure initialized with a specific 16-bit UUID value.
|
||||
*
|
||||
* @param uuid16 The 16-bit UUID value to initialize the structure with.
|
||||
*
|
||||
@@ -160,8 +149,7 @@ typedef union {
|
||||
((ble_uuid_t *) (&(ble_uuid16_t) BLE_UUID16_INIT(uuid16)))
|
||||
|
||||
/**
|
||||
* @brief Macro for declaring a pointer to a 32-bit UUID structure initialized
|
||||
* with a specific 32-bit UUID value.
|
||||
* @brief Macro for declaring a pointer to a 32-bit UUID structure initialized with a specific 32-bit UUID value.
|
||||
*
|
||||
* @param uuid32 The 32-bit UUID value to initialize the structure with.
|
||||
*
|
||||
@@ -171,8 +159,7 @@ typedef union {
|
||||
((ble_uuid_t *) (&(ble_uuid32_t) BLE_UUID32_INIT(uuid32)))
|
||||
|
||||
/**
|
||||
* @brief Macro for declaring a pointer to a 128-bit UUID structure initialized
|
||||
* with specific 128-bit UUID values.
|
||||
* @brief Macro for declaring a pointer to a 128-bit UUID structure initialized with specific 128-bit UUID values.
|
||||
*
|
||||
* @param uuid128 The 128-bit UUID value to initialize the structure with.
|
||||
*
|
||||
@@ -182,8 +169,7 @@ typedef union {
|
||||
((ble_uuid_t *) (&(ble_uuid128_t) BLE_UUID128_INIT(uuid128)))
|
||||
|
||||
/**
|
||||
* @brief Macro for casting a pointer to a `ble_uuid_t` structure to a pointer
|
||||
* to 16-bit UUID structure.
|
||||
* @brief Macro for casting a pointer to a `ble_uuid_t` structure to a pointer to 16-bit UUID structure.
|
||||
*
|
||||
* @param u Pointer to a `ble_uuid_t` structure.
|
||||
*
|
||||
@@ -193,8 +179,7 @@ typedef union {
|
||||
((ble_uuid16_t *) (u))
|
||||
|
||||
/**
|
||||
* @brief Macro for casting a pointer to a `ble_uuid_t` structure to a pointer
|
||||
* to 32-bit UUID structure.
|
||||
* @brief Macro for casting a pointer to a `ble_uuid_t` structure to a pointer to 32-bit UUID structure.
|
||||
*
|
||||
* @param u Pointer to a `ble_uuid_t` structure.
|
||||
*
|
||||
@@ -204,8 +189,7 @@ typedef union {
|
||||
((ble_uuid32_t *) (u))
|
||||
|
||||
/**
|
||||
* @brief Macro for casting a pointer to a `ble_uuid_t` structure to a pointer
|
||||
* to 128-bit UUID structure.
|
||||
* @brief Macro for casting a pointer to a `ble_uuid_t` structure to a pointer to 128-bit UUID structure.
|
||||
*
|
||||
* @param u Pointer to a `ble_uuid_t` structure.
|
||||
*
|
||||
@@ -225,8 +209,8 @@ typedef union {
|
||||
* @param buf The source buffer to parse.
|
||||
* @param len The size of the buffer, in bytes.
|
||||
*
|
||||
* @return 0 on success;
|
||||
* BLE_HS_EINVAL if the source buffer does not contain a valid UUID.
|
||||
* @return 0 on success, BLE_HS_EINVAL if the source buffer does not contain
|
||||
* a valid UUID.
|
||||
*/
|
||||
int ble_uuid_init_from_buf(ble_uuid_any_t *uuid, const void *buf, size_t len);
|
||||
|
||||
@@ -235,8 +219,7 @@ int ble_uuid_init_from_buf(ble_uuid_any_t *uuid, const void *buf, size_t len);
|
||||
* @param uuid1 The first UUID to compare.
|
||||
* @param uuid2 The second UUID to compare.
|
||||
*
|
||||
* @return 0 if the two UUIDs are equal;
|
||||
* nonzero if the UUIDs differ.
|
||||
* @return 0 if the two UUIDs are equal, nonzero if the UUIDs differ.
|
||||
*/
|
||||
int ble_uuid_cmp(const ble_uuid_t *uuid1, const ble_uuid_t *uuid2);
|
||||
|
||||
@@ -297,4 +280,4 @@ uint16_t ble_uuid_u16(const ble_uuid_t *uuid);
|
||||
* @}
|
||||
*/
|
||||
|
||||
#endif /* H_BLE_UUID_ */
|
||||
#endif /* _BLE_HOST_UUID_H */
|
||||
|
||||
Reference in New Issue
Block a user