Bluetooth: Classic: Shell: Use ZTESTABLE_STATIC instead of STATIC

Use the ZTESTABLE_STATIC macro to define symbols which need to be
accessible from ztests, instead of redefining STATIC which causes
trouble with some hals.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>

Author: aescolar

subsys/bluetooth/host/classic/shell/goep.c

@@ -27,11 +27,7 @@
 #include "common/bt_shell_private.h"
 
 #define GOEP_MOPL CONFIG_BT_GOEP_RFCOMM_MTU
-#ifdef CONFIG_ZTEST
-#define STATIC
-#else
-#define STATIC static
-#endif
+
 NET_BUF_POOL_FIXED_DEFINE(tx_pool, CONFIG_BT_MAX_CONN, BT_RFCOMM_BUF_SIZE(GOEP_MOPL),
 			  CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
 
@@ -45,17 +41,17 @@ struct bt_goep_app {
 	struct net_buf *tx_buf;
 };
 
-STATIC struct bt_goep_app goep_app;
+ZTESTABLE_STATIC struct bt_goep_app goep_app;
 
 static struct bt_goep_transport_rfcomm_server rfcomm_server;
 static struct bt_goep_transport_l2cap_server l2cap_server;
 
 #define TLV_COUNT       3
 #define TLV_BUFFER_SIZE 64
 
-STATIC struct bt_obex_tlv tlvs[TLV_COUNT];
-STATIC uint8_t tlv_buffers[TLV_COUNT][TLV_BUFFER_SIZE];
-STATIC uint8_t tlv_count;
+ZTESTABLE_STATIC struct bt_obex_tlv tlvs[TLV_COUNT];
+ZTESTABLE_STATIC uint8_t tlv_buffers[TLV_COUNT][TLV_BUFFER_SIZE];
+ZTESTABLE_STATIC uint8_t tlv_count;
 
 static struct bt_goep_app *goep_alloc(struct bt_conn *conn)
 {
@@ -184,7 +180,7 @@ static void goep_server_action(struct bt_obex_server *server, bool final, struct
 	goep_parse_headers(buf);
 }
 
-STATIC struct bt_obex_server_ops goep_server_ops = {
+ZTESTABLE_STATIC struct bt_obex_server_ops goep_server_ops = {
 	.connect = goep_server_connect,
 	.disconnect = goep_server_disconnect,
 	.put = goep_server_put,
@@ -248,7 +244,7 @@ static void goep_client_action(struct bt_obex_client *client, uint8_t rsp_code,
 	goep_parse_headers(buf);
 }
 
-STATIC struct bt_obex_client_ops goep_client_ops = {
+ZTESTABLE_STATIC struct bt_obex_client_ops goep_client_ops = {
 	.connect = goep_client_connect,
 	.disconnect = goep_client_disconnect,
 	.put = goep_client_put,

subsys/bluetooth/host/classic/shell/hfp.c

@@ -27,11 +27,7 @@
 #include "common/bt_shell_private.h"
 
 #define HELP_NONE "[none]"
-#ifdef CONFIG_ZTEST
-#define STATIC
-#else
-#define STATIC static
-#endif
+
 extern struct bt_conn *default_conn;
 
 #if defined(CONFIG_BT_HFP_HF)
@@ -316,7 +312,7 @@ void hf_query_call(struct bt_hfp_hf *hf, struct bt_hfp_hf_current_call *call)
 }
 #endif /* CONFIG_BT_HFP_HF_ECS */
 
-STATIC struct bt_hfp_hf_cb hf_cb = {
+ZTESTABLE_STATIC struct bt_hfp_hf_cb hf_cb = {
 	.connected = hf_connected,
 	.disconnected = hf_disconnected,
 	.sco_connected = hf_sco_connected,
@@ -1403,7 +1399,7 @@ void ag_hf_indicator_value(struct bt_hfp_ag *ag, enum hfp_ag_hf_indicators indic
 	bt_shell_print("indicator %d value %d", indicator, value);
 }
 
-STATIC struct bt_hfp_ag_cb ag_cb = {
+ZTESTABLE_STATIC struct bt_hfp_ag_cb ag_cb = {
 	.connected = ag_connected,
 	.disconnected = ag_disconnected,
 	.sco_connected = ag_sco_connected,