Bluetooth: Use bt_addr_eq

Refactor. Using `bt_addr_eq` instead of `bt_addr_cmp`.

Signed-off-by: Aleksander Wasaznik <[email protected]>

Author: alwa-nordic

drivers/bluetooth/hci/ipm_stm32wb.c

@@ -147,7 +147,7 @@ static void tryfix_event(TL_Evt_t *tev)
 	struct bt_hci_evt_le_enh_conn_complete *evt =
 			(void *)((uint8_t *)mev + (sizeof(*mev)));
 
-	if (!bt_addr_cmp(&evt->peer_addr.a, BT_ADDR_NONE)) {
+	if (bt_addr_eq(&evt->peer_addr.a, BT_ADDR_NONE)) {
 		LOG_WRN("Invalid peer addr %s", bt_addr_le_str(&evt->peer_addr));
 		bt_addr_copy(&evt->peer_addr.a, &evt->peer_rpa);
 		evt->peer_addr.type = BT_ADDR_LE_RANDOM;

subsys/bluetooth/controller/ll_sw/ull_filter.c

@@ -1493,7 +1493,7 @@ static void target_resolve(struct k_work *work)
 	idx = twork->idx;
 	search_rpa = &(twork->rpa);
 
-	if (rl[idx].taken && !bt_addr_cmp(&(rl[idx].target_rpa), search_rpa)) {
+	if (rl[idx].taken && bt_addr_eq(&(rl[idx].target_rpa), search_rpa)) {
 		j = idx;
 	} else {
 		/* No match - so not in list Need to see if we can resolve */
@@ -1618,7 +1618,7 @@ static uint8_t prpa_cache_find(bt_addr_t *rpa)
 {
 	for (uint8_t i = 0; i < CONFIG_BT_CTLR_RPA_CACHE_SIZE; i++) {
 		if (prpa_cache[i].taken &&
-		    !bt_addr_cmp(&(prpa_cache[i].rpa), rpa)) {
+		    bt_addr_eq(&(prpa_cache[i].rpa), rpa)) {
 			return i;
 		}
 	}

subsys/bluetooth/host/adv.c

@@ -2205,8 +2205,7 @@ void bt_hci_le_adv_set_terminated(struct net_buf *buf)
 			    !atomic_test_bit(adv->flags, BT_ADV_USE_IDENTITY)) {
 				/* Set Responder address unless already set */
 				conn->le.resp_addr.type = BT_ADDR_LE_RANDOM;
-				if (bt_addr_cmp(&conn->le.resp_addr.a,
-						BT_ADDR_ANY) == 0) {
+				if (bt_addr_eq(&conn->le.resp_addr.a, BT_ADDR_ANY)) {
 					bt_addr_copy(&conn->le.resp_addr.a,
 						     &adv->random_addr.a);
 				}

subsys/bluetooth/host/br.c

@@ -428,7 +428,7 @@ static struct bt_br_discovery_result *get_result_slot(const bt_addr_t *addr,
 
 	/* check if already present in results */
 	for (i = 0; i < discovery_results_count; i++) {
-		if (!bt_addr_cmp(addr, &discovery_results[i].addr)) {
+		if (bt_addr_eq(addr, &discovery_results[i].addr)) {
 			return &discovery_results[i];
 		}
 	}

subsys/bluetooth/host/conn.c

@@ -1993,7 +1993,7 @@ struct bt_conn *bt_conn_lookup_addr_sco(const bt_addr_t *peer)
 			continue;
 		}
 
-		if (bt_addr_cmp(peer, &conn->sco.acl->br.dst) != 0) {
+		if (!bt_addr_eq(peer, &conn->sco.acl->br.dst)) {
 			bt_conn_unref(conn);
 			continue;
 		}
@@ -2020,7 +2020,7 @@ struct bt_conn *bt_conn_lookup_addr_br(const bt_addr_t *peer)
 			continue;
 		}
 
-		if (bt_addr_cmp(peer, &conn->br.dst) != 0) {
+		if (!bt_addr_eq(peer, &conn->br.dst)) {
 			bt_conn_unref(conn);
 			continue;
 		}

subsys/bluetooth/host/hci_core.c

@@ -1358,8 +1358,7 @@ void bt_hci_le_enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
 			if (IS_ENABLED(CONFIG_BT_PRIVACY) &&
 			    !atomic_test_bit(adv->flags, BT_ADV_USE_IDENTITY)) {
 				conn->le.resp_addr.type = BT_ADDR_LE_RANDOM;
-				if (bt_addr_cmp(&evt->local_rpa,
-						BT_ADDR_ANY) != 0) {
+				if (!bt_addr_eq(&evt->local_rpa, BT_ADDR_ANY)) {
 					bt_addr_copy(&conn->le.resp_addr.a,
 						     &evt->local_rpa);
 				} else {
@@ -1404,7 +1403,7 @@ void bt_hci_le_enh_conn_complete(struct bt_hci_evt_le_enh_conn_complete *evt)
 
 		if (IS_ENABLED(CONFIG_BT_PRIVACY)) {
 			conn->le.init_addr.type = BT_ADDR_LE_RANDOM;
-			if (bt_addr_cmp(&evt->local_rpa, BT_ADDR_ANY) != 0) {
+			if (!bt_addr_eq(&evt->local_rpa, BT_ADDR_ANY)) {
 				bt_addr_copy(&conn->le.init_addr.a,
 					     &evt->local_rpa);
 			} else {

subsys/bluetooth/host/id.c

@@ -128,7 +128,7 @@ static int set_random_address(const bt_addr_t *addr)
 	LOG_DBG("%s", bt_addr_str(addr));
 
 	/* Do nothing if we already have the right address */
-	if (!bt_addr_cmp(addr, &bt_dev.random_addr.a)) {
+	if (bt_addr_eq(addr, &bt_dev.random_addr.a)) {
 		return 0;
 	}
 
@@ -1434,8 +1434,8 @@ uint8_t bt_id_read_public_addr(bt_addr_le_t *addr)
 
 	rp = (void *)rsp->data;
 
-	if (!bt_addr_cmp(&rp->bdaddr, BT_ADDR_ANY) ||
-	    !bt_addr_cmp(&rp->bdaddr, BT_ADDR_NONE)) {
+	if (bt_addr_eq(&rp->bdaddr, BT_ADDR_ANY) ||
+	    bt_addr_eq(&rp->bdaddr, BT_ADDR_NONE)) {
 		LOG_DBG("Controller has no public address");
 		net_buf_unref(rsp);
 		return 0U;

subsys/bluetooth/host/keys.c

@@ -244,7 +244,7 @@ struct bt_keys *bt_keys_find_irk(uint8_t id, const bt_addr_le_t *addr)
 		}
 
 		if (key_pool[i].id == id &&
-		    !bt_addr_cmp(&addr->a, &key_pool[i].irk.rpa)) {
+		    bt_addr_eq(&addr->a, &key_pool[i].irk.rpa)) {
 			LOG_DBG("cached RPA %s for %s", bt_addr_str(&key_pool[i].irk.rpa),
 				bt_addr_le_str(&key_pool[i].addr));
 			return &key_pool[i];

subsys/bluetooth/host/keys_br.c

@@ -43,7 +43,7 @@ struct bt_keys_link_key *bt_keys_find_link_key(const bt_addr_t *addr)
 	for (i = 0; i < ARRAY_SIZE(key_pool); i++) {
 		key = &key_pool[i];
 
-		if (!bt_addr_cmp(&key->addr, addr)) {
+		if (bt_addr_eq(&key->addr, addr)) {
 			return key;
 		}
 	}

tests/bluetooth/host/keys/bt_keys_find_irk/src/main.c

@@ -68,7 +68,7 @@ static bool bt_rpa_irk_matches_unreachable_custom_fake(const uint8_t irk[16], co
 
 static bool bt_rpa_irk_matches_custom_fake(const uint8_t irk[16], const bt_addr_t *addr)
 {
-	if (irk[0] != (params_it) && !bt_addr_cmp(&current_params_vector->addr->a, addr)) {
+	if (irk[0] != (params_it) && bt_addr_eq(&current_params_vector->addr->a, addr)) {
 		return false;
 	}