Bluetooth: GATT: Use BT_GATT_DESCRIPTOR() for descriptors

CEP, CUD and CPF are all characteristic descriptors, so use the
approprirate macro for them.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2018-09-17 08:04:26 +03:00 committed by Johan Hedberg
commit 6a68a66726

View file

@ -581,7 +581,7 @@ ssize_t bt_gatt_attr_read_cep(struct bt_conn *conn,
* @param _value Descriptor attribute value. * @param _value Descriptor attribute value.
*/ */
#define BT_GATT_CEP(_value) \ #define BT_GATT_CEP(_value) \
BT_GATT_ATTRIBUTE(BT_UUID_GATT_CEP, BT_GATT_PERM_READ, \ BT_GATT_DESCRIPTOR(BT_UUID_GATT_CEP, BT_GATT_PERM_READ, \
bt_gatt_attr_read_cep, NULL, _value) bt_gatt_attr_read_cep, NULL, _value)
/** @brief Read Characteristic User Description Descriptor Attribute helper /** @brief Read Characteristic User Description Descriptor Attribute helper
@ -612,8 +612,8 @@ ssize_t bt_gatt_attr_read_cud(struct bt_conn *conn,
* @param _perm Descriptor attribute access permissions. * @param _perm Descriptor attribute access permissions.
*/ */
#define BT_GATT_CUD(_value, _perm) \ #define BT_GATT_CUD(_value, _perm) \
BT_GATT_ATTRIBUTE(BT_UUID_GATT_CUD, _perm, bt_gatt_attr_read_cud, \ BT_GATT_DESCRIPTOR(BT_UUID_GATT_CUD, _perm, bt_gatt_attr_read_cud, \
NULL, _value) NULL, _value)
/** @brief Read Characteristic Presentation format Descriptor Attribute helper /** @brief Read Characteristic Presentation format Descriptor Attribute helper
* *
@ -642,8 +642,8 @@ ssize_t bt_gatt_attr_read_cpf(struct bt_conn *conn,
* @param _value Descriptor attribute value. * @param _value Descriptor attribute value.
*/ */
#define BT_GATT_CPF(_value) \ #define BT_GATT_CPF(_value) \
BT_GATT_ATTRIBUTE(BT_UUID_GATT_CPF, BT_GATT_PERM_READ, \ BT_GATT_DESCRIPTOR(BT_UUID_GATT_CPF, BT_GATT_PERM_READ, \
bt_gatt_attr_read_cpf, NULL, _value) bt_gatt_attr_read_cpf, NULL, (void * const)_value)
/** @def BT_GATT_DESCRIPTOR /** @def BT_GATT_DESCRIPTOR
* @brief Descriptor Declaration Macro. * @brief Descriptor Declaration Macro.