Skip to content

Commit

Permalink
Bluetooth: ATT: Fix typo in defines
Browse files Browse the repository at this point in the history 
Fix typo in ATT first/last attribute defines.

Signed-off-by: Jacob Siverskog <[email protected]>
  • Loading branch information
@jsiverskog @nashif
jsiverskog authored and nashif committed Oct 24, 2021
1 parent 074bd00 commit 046f29a
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 23 deletions.
6 changes: 4 additions & 2 deletions include/bluetooth/att.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions samples/bluetooth/central_hr/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions samples/bluetooth/central_ht/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions samples/boards/bbc_microbit/pong/src/ble.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions subsys/bluetooth/audio/mics_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions subsys/bluetooth/audio/vcs_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions subsys/bluetooth/shell/gatt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) */
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions tests/bluetooth/tester/src/gatt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 046f29a

Please sign in to comment.