Skip to content

Commit 42da370

Browse files
Thalleycarlescufi
authored andcommitted
Bluetooth: Use ATT FIRST/LAST attribute handle defines where applicable
Change to use the BT_ATT_FIRST_ATTTRIBUTE_HANDLE and BT_ATT_LAST_ATTTRIBUTE_HANDLE instead of the literal values where applicable. Signed-off-by: Emil Gydesen <[email protected]>
1 parent 2b849f0 commit 42da370

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

samples/bluetooth/central_hr/src/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
205205
memcpy(&uuid, BT_UUID_HRS, sizeof(uuid));
206206
discover_params.uuid = &uuid.uuid;
207207
discover_params.func = discover_func;
208-
discover_params.start_handle = 0x0001;
209-
discover_params.end_handle = 0xffff;
208+
discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE;
209+
discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE;
210210
discover_params.type = BT_GATT_DISCOVER_PRIMARY;
211211

212212
err = bt_gatt_discover(default_conn, &discover_params);

samples/bluetooth/central_ht/src/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ static void connected(struct bt_conn *conn, uint8_t conn_err)
146146
memcpy(&uuid, BT_UUID_HTS, sizeof(uuid));
147147
discover_params.uuid = &uuid.uuid;
148148
discover_params.func = discover_func;
149-
discover_params.start_handle = 0x0001;
150-
discover_params.end_handle = 0xffff;
149+
discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE;
150+
discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE;
151151
discover_params.type = BT_GATT_DISCOVER_PRIMARY;
152152

153153
err = bt_gatt_discover(default_conn, &discover_params);

samples/boards/bbc_microbit/pong/src/ble.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,8 @@ static void ble_timeout(struct k_work *work)
485485
case BLE_CONNECTED:
486486
discov_param.uuid = &pong_svc_uuid.uuid;
487487
discov_param.func = discover_func;
488-
discov_param.start_handle = 0x0001;
489-
discov_param.end_handle = 0xffff;
488+
discov_param.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE;
489+
discov_param.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE;
490490
discov_param.type = BT_GATT_DISCOVER_PRIMARY;
491491

492492
err = bt_gatt_discover(default_conn, &discov_param);

subsys/bluetooth/shell/gatt.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ static int cmd_discover(const struct shell *shell, size_t argc, char *argv[])
174174
}
175175

176176
discover_params.func = discover_func;
177-
discover_params.start_handle = 0x0001;
178-
discover_params.end_handle = 0xffff;
177+
discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE;
178+
discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE;
179179

180180
if (argc > 1) {
181181
/* Only set the UUID if the value is valid (non zero) */
@@ -320,8 +320,8 @@ static int cmd_read_uuid(const struct shell *shell, size_t argc, char *argv[])
320320

321321
read_params.func = read_func;
322322
read_params.handle_count = 0;
323-
read_params.by_uuid.start_handle = 0x0001;
324-
read_params.by_uuid.end_handle = 0xffff;
323+
read_params.by_uuid.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE;
324+
read_params.by_uuid.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE;
325325

326326
if (argc > 1) {
327327
uuid.val = strtoul(argv[1], NULL, 16);

tests/bluetooth/bsim_bt/bsim_test_app/src/test_connect1.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ static void params_updated(struct bt_conn *conn, uint16_t interval,
264264
memcpy(&uuid, BT_UUID_HRS, sizeof(uuid));
265265
discover_params.uuid = &uuid.uuid;
266266
discover_params.func = discover_func;
267-
discover_params.start_handle = 0x0001;
268-
discover_params.end_handle = 0xffff;
267+
discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE;
268+
discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE;
269269
discover_params.type = BT_GATT_DISCOVER_PRIMARY;
270270

271271
err = bt_gatt_discover(conn, &discover_params);

tests/bluetooth/tester/src/gatt.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -989,8 +989,8 @@ static void disc_all_prim(uint8_t *data, uint16_t len)
989989
}
990990

991991
discover_params.uuid = NULL;
992-
discover_params.start_handle = 0x0001;
993-
discover_params.end_handle = 0xffff;
992+
discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE;
993+
discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE;
994994
discover_params.type = BT_GATT_DISCOVER_PRIMARY;
995995
discover_params.func = disc_prim_cb;
996996

@@ -1032,8 +1032,8 @@ static void disc_prim_uuid(uint8_t *data, uint16_t len)
10321032
}
10331033

10341034
discover_params.uuid = &uuid.uuid;
1035-
discover_params.start_handle = 0x0001;
1036-
discover_params.end_handle = 0xffff;
1035+
discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE;
1036+
discover_params.end_handle = BT_ATT_LAST_ATTTRIBUTE_HANDLE;
10371037
discover_params.type = BT_GATT_DISCOVER_PRIMARY;
10381038
discover_params.func = disc_prim_cb;
10391039

@@ -1736,7 +1736,7 @@ static int enable_subscription(struct bt_conn *conn, uint16_t ccc_handle,
17361736
}
17371737

17381738
/* Discover Characteristic Value this CCC Descriptor refers to */
1739-
discover_params.start_handle = 0x0001;
1739+
discover_params.start_handle = BT_ATT_FIRST_ATTTRIBUTE_HANDLE;
17401740
discover_params.end_handle = ccc_handle;
17411741
discover_params.type = BT_GATT_DISCOVER_CHARACTERISTIC;
17421742
discover_params.func = discover_func;

0 commit comments

Comments
 (0)