diff --git a/include/bluetooth/att.h b/include/bluetooth/att.h index 5a3fa605df4..f123c3bfba3 100644 --- a/include/bluetooth/att.h +++ b/include/bluetooth/att.h @@ -48,9 +48,11 @@ extern "C" { #define BT_ATT_MAX_ATTRIBUTE_LEN 512 /* Handle 0x0000 is reserved for future use */ -#define BT_ATT_FIRST_ATTTRIBUTE_HANDLE 0x0001 +#define BT_ATT_FIRST_ATTRIBUTE_HANDLE 0x0001 +#define BT_ATT_FIRST_ATTTRIBUTE_HANDLE __DEPRECATED_MACRO BT_ATT_FIRST_ATTRIBUTE_HANDLE /* 0xffff is defined as the maximum, and thus last, valid attribute handle */ -#define BT_ATT_LAST_ATTTRIBUTE_HANDLE 0xffff +#define BT_ATT_LAST_ATTRIBUTE_HANDLE 0xffff +#define BT_ATT_LAST_ATTTRIBUTE_HANDLE __DEPRECATED_MACRO BT_ATT_LAST_ATTRIBUTE_HANDLE #if defined(CONFIG_BT_TESTING) int bt_eatt_disconnect_one(struct bt_conn *conn); diff --git a/samples/bluetooth/central_hr/src/main.c b/samples/bluetooth/central_hr/src/main.c index 271e6c46527..629f6e520f6 100644 --- a/samples/bluetooth/central_hr/src/main.c +++ b/samples/bluetooth/central_hr/src/main.c @@ -205,8 +205,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) memcpy(&uuid, BT_UUID_HRS, sizeof(uuid)); discover_params.uuid = &uuid.uuid; discover_params.func = discover_func; - discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + discover_params.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; discover_params.type = BT_GATT_DISCOVER_PRIMARY; err = bt_gatt_discover(default_conn, &discover_params); diff --git a/samples/bluetooth/central_ht/src/main.c b/samples/bluetooth/central_ht/src/main.c index d1e3684e4a6..398a4a35db0 100644 --- a/samples/bluetooth/central_ht/src/main.c +++ b/samples/bluetooth/central_ht/src/main.c @@ -146,8 +146,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) memcpy(&uuid, BT_UUID_HTS, sizeof(uuid)); discover_params.uuid = &uuid.uuid; discover_params.func = discover_func; - discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + discover_params.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; discover_params.type = BT_GATT_DISCOVER_PRIMARY; err = bt_gatt_discover(default_conn, &discover_params); diff --git a/samples/boards/bbc_microbit/pong/src/ble.c b/samples/boards/bbc_microbit/pong/src/ble.c index 727ad998e39..e08e9b999a4 100644 --- a/samples/boards/bbc_microbit/pong/src/ble.c +++ b/samples/boards/bbc_microbit/pong/src/ble.c @@ -487,8 +487,8 @@ static void ble_timeout(struct k_work *work) case BLE_CONNECTED: discov_param.uuid = &pong_svc_uuid.uuid; discov_param.func = discover_func; - discov_param.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - discov_param.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + discov_param.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + discov_param.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; discov_param.type = BT_GATT_DISCOVER_PRIMARY; err = bt_gatt_discover(default_conn, &discov_param); diff --git a/subsys/bluetooth/audio/mics_client.c b/subsys/bluetooth/audio/mics_client.c index 13eb1942486..c2e43427ac3 100644 --- a/subsys/bluetooth/audio/mics_client.c +++ b/subsys/bluetooth/audio/mics_client.c @@ -416,8 +416,8 @@ int bt_mics_discover(struct bt_conn *conn, struct bt_mics **mics) mics_inst->cli.discover_params.func = primary_discover_func; mics_inst->cli.discover_params.uuid = mics_uuid; mics_inst->cli.discover_params.type = BT_GATT_DISCOVER_PRIMARY; - mics_inst->cli.discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - mics_inst->cli.discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + mics_inst->cli.discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + mics_inst->cli.discover_params.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; initialized = true; diff --git a/subsys/bluetooth/audio/vcs_client.c b/subsys/bluetooth/audio/vcs_client.c index 3ee480110b4..21b6af142f2 100644 --- a/subsys/bluetooth/audio/vcs_client.c +++ b/subsys/bluetooth/audio/vcs_client.c @@ -772,8 +772,8 @@ int bt_vcs_discover(struct bt_conn *conn, struct bt_vcs **vcs) vcs_inst->cli.discover_params.func = primary_discover_func; vcs_inst->cli.discover_params.uuid = &vcs_inst->cli.uuid.uuid; vcs_inst->cli.discover_params.type = BT_GATT_DISCOVER_PRIMARY; - vcs_inst->cli.discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - vcs_inst->cli.discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + vcs_inst->cli.discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + vcs_inst->cli.discover_params.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; err = bt_gatt_discover(conn, &vcs_inst->cli.discover_params); if (err == 0) { diff --git a/subsys/bluetooth/shell/gatt.c b/subsys/bluetooth/shell/gatt.c index f19c824ce1b..0af6a5515d5 100644 --- a/subsys/bluetooth/shell/gatt.c +++ b/subsys/bluetooth/shell/gatt.c @@ -221,8 +221,8 @@ static int cmd_discover(const struct shell *sh, size_t argc, char *argv[]) } discover_params.func = discover_func; - discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + discover_params.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; if (argc > 1) { /* Only set the UUID if the value is valid (non zero) */ @@ -368,8 +368,8 @@ static int cmd_read_uuid(const struct shell *sh, size_t argc, char *argv[]) read_params.func = read_func; read_params.handle_count = 0; - read_params.by_uuid.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - read_params.by_uuid.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + read_params.by_uuid.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + read_params.by_uuid.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; if (argc > 1) { uuid.val = strtoul(argv[1], NULL, 16); diff --git a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c index 2ca032c3ad2..8a7a447c77a 100644 --- a/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c +++ b/tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c @@ -264,8 +264,8 @@ static void params_updated(struct bt_conn *conn, uint16_t interval, memcpy(&uuid, BT_UUID_HRS, sizeof(uuid)); discover_params.uuid = &uuid.uuid; discover_params.func = discover_func; - discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + discover_params.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; discover_params.type = BT_GATT_DISCOVER_PRIMARY; err = bt_gatt_discover(conn, &discover_params); diff --git a/tests/bluetooth/tester/src/gatt.c b/tests/bluetooth/tester/src/gatt.c index 88a76e2a397..97574b981ee 100644 --- a/tests/bluetooth/tester/src/gatt.c +++ b/tests/bluetooth/tester/src/gatt.c @@ -994,8 +994,8 @@ static void disc_all_prim(uint8_t *data, uint16_t len) } discover_params.uuid = NULL; - discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + discover_params.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; discover_params.type = BT_GATT_DISCOVER_PRIMARY; discover_params.func = disc_prim_cb; @@ -1037,8 +1037,8 @@ static void disc_prim_uuid(uint8_t *data, uint16_t len) } discover_params.uuid = &uuid.uuid; - discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; - discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE; + discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; + discover_params.end_handle = BT_ATT_LAST_ATTRIBUTE_HANDLE; discover_params.type = BT_GATT_DISCOVER_PRIMARY; discover_params.func = disc_prim_cb; @@ -1742,7 +1742,7 @@ static int enable_subscription(struct bt_conn *conn, uint16_t ccc_handle, } /* Discover Characteristic Value this CCC Descriptor refers to */ - discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE; + discover_params.start_handle = BT_ATT_FIRST_ATTRIBUTE_HANDLE; discover_params.end_handle = ccc_handle; discover_params.type = BT_GATT_DISCOVER_CHARACTERISTIC; discover_params.func = discover_func;