bluetooth: correct bt_le_scan_param scan type

JordanYates · aescolar · commit cf870e8350dd · 2024-06-28T11:34:36.000+02:00
The `type` parameter of `struct bt_le_scan_param` is documented as
taking a `BT_LE_SCAN_TYPE_*` value, not a `BT_HCI_LE_SCAN_*` value.

In practice this makes no difference as the values are defined as the
same integer, but does result in `&lt;zephyr/bluetooth/hci.h&gt;` not needing
to be included.

Signed-off-by: Jordan Yates &lt;jordan@embeint.com&gt;
diff --git a/samples/bluetooth/central_multilink/src/central_multilink.c b/samples/bluetooth/central_multilink/src/central_multilink.c
@@ -90,7 +90,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
 static void start_scan(void)
 {
 	struct bt_le_scan_param scan_param = {
-		.type       = BT_HCI_LE_SCAN_PASSIVE,
+		.type       = BT_LE_SCAN_TYPE_PASSIVE,
 		.options    = BT_LE_SCAN_OPT_NONE,
 		.interval   = SCAN_INTERVAL,
 		.window     = SCAN_WINDOW,
diff --git a/samples/bluetooth/scan_adv/src/main.c b/samples/bluetooth/scan_adv/src/main.c
@@ -12,7 +12,6 @@
 #include <zephyr/sys/util.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/hci.h>
 
 static uint8_t mfg_data[] = { 0xff, 0xff, 0x00 };
 
@@ -29,7 +28,7 @@ static void scan_cb(const bt_addr_le_t *addr, int8_t rssi, uint8_t adv_type,
 int main(void)
 {
 	struct bt_le_scan_param scan_param = {
-		.type       = BT_HCI_LE_SCAN_PASSIVE,
+		.type       = BT_LE_SCAN_TYPE_PASSIVE,
 		.options    = BT_LE_SCAN_OPT_NONE,
 		.interval   = 0x0010,
 		.window     = 0x0010,
diff --git a/subsys/bluetooth/host/scan.c b/subsys/bluetooth/host/scan.c
@@ -1461,8 +1461,8 @@ void bt_hci_le_adv_report(struct net_buf *buf)
 
 static bool valid_le_scan_param(const struct bt_le_scan_param *param)
 {
-	if (param->type != BT_HCI_LE_SCAN_PASSIVE &&
-	    param->type != BT_HCI_LE_SCAN_ACTIVE) {
+	if (param->type != BT_LE_SCAN_TYPE_PASSIVE &&
+	    param->type != BT_LE_SCAN_TYPE_ACTIVE) {
 		return false;
 	}
 
diff --git a/subsys/bluetooth/mesh/adv.c b/subsys/bluetooth/mesh/adv.c
@@ -378,8 +378,8 @@ int bt_mesh_scan_active_set(bool active)
 int bt_mesh_scan_enable(void)
 {
 	struct bt_le_scan_param scan_param = {
-		.type = active_scanning ? BT_HCI_LE_SCAN_ACTIVE :
-					  BT_HCI_LE_SCAN_PASSIVE,
+		.type = active_scanning ? BT_LE_SCAN_TYPE_ACTIVE :
+					  BT_LE_SCAN_TYPE_PASSIVE,
 		.interval = MESH_SCAN_INTERVAL,
 		.window = MESH_SCAN_WINDOW
 	};
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_expired.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_expired.c
@@ -108,7 +108,7 @@ void start_rpa_scanning(void)
 {
 	/* Start passive scanning */
 	struct bt_le_scan_param scan_param = {
-		.type       = BT_HCI_LE_SCAN_PASSIVE,
+		.type       = BT_LE_SCAN_TYPE_PASSIVE,
 		.options    = BT_LE_SCAN_OPT_FILTER_DUPLICATE,
 		.interval   = 0x0040,
 		.window     = 0x0020,
diff --git a/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_rotation.c b/tests/bsim/bluetooth/host/privacy/peripheral/src/tester_rpa_rotation.c
@@ -122,7 +122,7 @@ void start_scanning(void)
 {
 	/* Start passive scanning */
 	struct bt_le_scan_param scan_param = {
-		.type       = BT_HCI_LE_SCAN_PASSIVE,
+		.type       = BT_LE_SCAN_TYPE_PASSIVE,
 		.options    = BT_LE_SCAN_OPT_FILTER_DUPLICATE,
 		.interval   = 0x0040,
 		.window     = 0x0020,
diff --git a/tests/bsim/bluetooth/ll/advx/src/main.c b/tests/bsim/bluetooth/ll/advx/src/main.c
@@ -1300,7 +1300,7 @@ static struct bt_le_per_adv_sync_cb sync_cb = {
 static void test_scanx_main(void)
 {
 	struct bt_le_scan_param scan_param = {
-		.type       = BT_HCI_LE_SCAN_ACTIVE,
+		.type       = BT_LE_SCAN_TYPE_ACTIVE,
 		.options    = BT_LE_SCAN_OPT_NONE,
 		.interval   = 0x0004,
 		.window     = 0x0004,
diff --git a/tests/bsim/bluetooth/ll/bis/src/main.c b/tests/bsim/bluetooth/ll/bis/src/main.c
@@ -753,7 +753,7 @@ static struct bt_le_scan_cb scan_callbacks = {
 static void test_iso_recv_main(void)
 {
 	struct bt_le_scan_param scan_param = {
-		.type       = BT_HCI_LE_SCAN_ACTIVE,
+		.type       = BT_LE_SCAN_TYPE_ACTIVE,
 		.options    = BT_LE_SCAN_OPT_NONE,
 		.interval   = 0x0004,
 		.window     = 0x0004,
@@ -1028,7 +1028,7 @@ static void test_iso_recv_main(void)
 static void test_iso_recv_vs_dp_main(void)
 {
 	struct bt_le_scan_param scan_param = {
-		.type       = BT_HCI_LE_SCAN_ACTIVE,
+		.type       = BT_LE_SCAN_TYPE_ACTIVE,
 		.options    = BT_LE_SCAN_OPT_NONE,
 		.interval   = 0x0004,
 		.window     = 0x0004,
diff --git a/tests/bsim/bluetooth/mesh/src/mesh_test.c b/tests/bsim/bluetooth/mesh/src/mesh_test.c
@@ -569,7 +569,7 @@ void bt_mesh_test_send_over_adv(void *data, size_t len)
 int bt_mesh_test_wait_for_packet(bt_le_scan_cb_t scan_cb, struct k_sem *observer_sem, uint16_t wait)
 {
 	struct bt_le_scan_param scan_param = {
-		.type       = BT_HCI_LE_SCAN_PASSIVE,
+		.type       = BT_LE_SCAN_TYPE_PASSIVE,
 		.options    = BT_LE_SCAN_OPT_NONE,
 		.interval   = BT_MESH_ADV_SCAN_UNIT(1000),
 		.window     = BT_MESH_ADV_SCAN_UNIT(1000)

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ static void device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,`
`90`	`90`	`static void start_scan(void)`
`91`	`91`	`{`
`92`	`92`	`struct bt_le_scan_param scan_param = {`
`93`		`- .type = BT_HCI_LE_SCAN_PASSIVE,`
	`93`	`+ .type = BT_LE_SCAN_TYPE_PASSIVE,`
`94`	`94`	`.options = BT_LE_SCAN_OPT_NONE,`
`95`	`95`	`.interval = SCAN_INTERVAL,`
`96`	`96`	`.window = SCAN_WINDOW,`
Original file line number	Diff line number	Diff line change
`@@ -1461,8 +1461,8 @@ void bt_hci_le_adv_report(struct net_buf *buf)`
`1461`	`1461`
`1462`	`1462`	`static bool valid_le_scan_param(const struct bt_le_scan_param *param)`
`1463`	`1463`	`{`
`1464`		`- if (param->type != BT_HCI_LE_SCAN_PASSIVE &&`
`1465`		`- param->type != BT_HCI_LE_SCAN_ACTIVE) {`
	`1464`	`+ if (param->type != BT_LE_SCAN_TYPE_PASSIVE &&`
	`1465`	`+ param->type != BT_LE_SCAN_TYPE_ACTIVE) {`
`1466`	`1466`	`return false;`
`1467`	`1467`	`}`
`1468`	`1468`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ void start_rpa_scanning(void)`
`108`	`108`	`{`
`109`	`109`	`/* Start passive scanning */`
`110`	`110`	`struct bt_le_scan_param scan_param = {`
`111`		`- .type = BT_HCI_LE_SCAN_PASSIVE,`
	`111`	`+ .type = BT_LE_SCAN_TYPE_PASSIVE,`
`112`	`112`	`.options = BT_LE_SCAN_OPT_FILTER_DUPLICATE,`
`113`	`113`	`.interval = 0x0040,`
`114`	`114`	`.window = 0x0020,`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ void start_scanning(void)`
`122`	`122`	`{`
`123`	`123`	`/* Start passive scanning */`
`124`	`124`	`struct bt_le_scan_param scan_param = {`
`125`		`- .type = BT_HCI_LE_SCAN_PASSIVE,`
	`125`	`+ .type = BT_LE_SCAN_TYPE_PASSIVE,`
`126`	`126`	`.options = BT_LE_SCAN_OPT_FILTER_DUPLICATE,`
`127`	`127`	`.interval = 0x0040,`
`128`	`128`	`.window = 0x0020,`
Original file line number	Diff line number	Diff line change
`@@ -1300,7 +1300,7 @@ static struct bt_le_per_adv_sync_cb sync_cb = {`
`1300`	`1300`	`static void test_scanx_main(void)`
`1301`	`1301`	`{`
`1302`	`1302`	`struct bt_le_scan_param scan_param = {`
`1303`		`- .type = BT_HCI_LE_SCAN_ACTIVE,`
	`1303`	`+ .type = BT_LE_SCAN_TYPE_ACTIVE,`
`1304`	`1304`	`.options = BT_LE_SCAN_OPT_NONE,`
`1305`	`1305`	`.interval = 0x0004,`
`1306`	`1306`	`.window = 0x0004,`
Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ void bt_mesh_test_send_over_adv(void *data, size_t len)`
`569`	`569`	`int bt_mesh_test_wait_for_packet(bt_le_scan_cb_t scan_cb, struct k_sem *observer_sem, uint16_t wait)`
`570`	`570`	`{`
`571`	`571`	`struct bt_le_scan_param scan_param = {`
`572`		`- .type = BT_HCI_LE_SCAN_PASSIVE,`
	`572`	`+ .type = BT_LE_SCAN_TYPE_PASSIVE,`
`573`	`573`	`.options = BT_LE_SCAN_OPT_NONE,`
`574`	`574`	`.interval = BT_MESH_ADV_SCAN_UNIT(1000),`
`575`	`575`	`.window = BT_MESH_ADV_SCAN_UNIT(1000)`