Bluetooth: Host: Move new bt_data functions to data.c

Move newly added `bt_data_get_len` and `bt_data_serialize` from `ead.c`
to `data.c`.

Also, removed unnecessary include of `zephyr/kernel.h`.

Signed-off-by: Théo Battrel <[email protected]>

Author: theob-pro

subsys/bluetooth/host/data.c

@@ -5,7 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/kernel.h>
+#include <zephyr/sys/check.h>
+
 #include <zephyr/bluetooth/bluetooth.h>
 
 #define LOG_LEVEL CONFIG_BT_HCI_CORE_LOG_LEVEL
@@ -43,3 +44,37 @@ void bt_data_parse(struct net_buf_simple *ad,
 		net_buf_simple_pull(ad, len - 1);
 	}
 }
+
+size_t bt_data_get_len(const struct bt_data data[], size_t data_count)
+{
+	size_t total_len = 0;
+
+	for (size_t i = 0; i < data_count; i++) {
+		total_len += sizeof(data[i].data_len) + sizeof(data[i].type) + data[i].data_len;
+	}
+
+	return total_len;
+}
+
+size_t bt_data_serialize(const struct bt_data *input, uint8_t *output)
+{
+	CHECKIF(input == NULL) {
+		LOG_DBG("input is NULL");
+		return 0;
+	}
+
+	CHECKIF(output == NULL) {
+		LOG_DBG("output is NULL");
+		return 0;
+	}
+
+	uint8_t ad_data_len = input->data_len;
+	uint8_t data_len = ad_data_len + 1;
+
+	output[0] = data_len;
+	output[1] = input->type;
+
+	memcpy(&output[2], input->data, ad_data_len);
+
+	return data_len + 1;
+}

subsys/bluetooth/lib/ead.c

@@ -75,40 +75,6 @@ static int bt_ead_generate_nonce(const uint8_t iv[BT_EAD_IV_SIZE],
 	return 0;
 }
 
-size_t bt_data_get_len(const struct bt_data data[], size_t data_count)
-{
-	size_t total_len = 0;
-
-	for (size_t i = 0; i < data_count; i++) {
-		total_len += sizeof(data[i].data_len) + sizeof(data[i].type) + data[i].data_len;
-	}
-
-	return total_len;
-}
-
-size_t bt_data_serialize(const struct bt_data *input, uint8_t *output)
-{
-	CHECKIF(input == NULL) {
-		LOG_DBG("input is NULL");
-		return 0;
-	}
-
-	CHECKIF(output == NULL) {
-		LOG_DBG("output_ad_structure is NULL");
-		return 0;
-	}
-
-	uint8_t ad_data_len = input->data_len;
-	uint8_t data_len = ad_data_len + 1;
-
-	output[0] = data_len;
-	output[1] = input->type;
-
-	memcpy(&output[2], input->data, ad_data_len);
-
-	return data_len + 1;
-}
-
 static int ead_encrypt(const uint8_t session_key[BT_EAD_KEY_SIZE], const uint8_t iv[BT_EAD_IV_SIZE],
 		       const uint8_t randomizer[BT_EAD_RANDOMIZER_SIZE], const uint8_t *payload,
 		       size_t payload_size, uint8_t *encrypted_payload)