zephyr: fix compiling issues.

bug: v/45540 Signed-off-by: Zihao Gao <[email protected]>
open-vela · Jan 5, 2025 · 6bf0867 · 6bf0867
1 parent 5b610ed
commit 6bf0867
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -402,8 +402,6 @@ if(CONFIG_BLUETOOTH)
 
   list(APPEND INCDIR ${BLUETOOTH_DIR}/service/vendor)
 
-  list(APPEND INCDIR ${BLUETOOTH_DIR}/service/stacks/include)
-
   if(CONFIG_BLUETOOTH_SERVICE)
     if(CONFIG_BLUETOOTH_STACK_BREDR_BLUELET
        OR CONFIG_BLUETOOTH_STACK_LE_BLUELET)

diff --git a/Kconfig b/Kconfig
@@ -199,7 +199,6 @@ if BLUETOOTH_A2DP
 config BLUETOOTH_A2DP_AAC_CODEC
 	bool "Bluetooth A2dp AAC codec support"
 	default n
-	select AAC_ENABLED
 
 config BLUETOOTH_A2DP_MAX_CONNECTIONS
 	int "Maximum A2dp connections"

diff --git a/Makefile b/Makefile
@@ -281,7 +281,6 @@ CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/frameworks/connectivity/bluetooth/service/pr
 CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/frameworks/connectivity/bluetooth/service/stacks
 CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/frameworks/connectivity/bluetooth/service/stacks/include
 CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/frameworks/connectivity/bluetooth/service/vendor
-CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/frameworks/connectivity/bluetooth/service/stacks/include
 
 ifeq ($(CONFIG_BLUETOOTH_SERVICE), y)
 ifneq ($(CONFIG_BLUETOOTH_STACK_BREDR_BLUELET)$(CONFIG_BLUETOOTH_STACK_LE_BLUELET),)

diff --git a/framework/include/bt_utils.h b/framework/include/bt_utils.h
@@ -21,7 +21,9 @@
 extern "C" {
 #endif
 
+#ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
 
 #define CASE_RETURN_STR(const) \
     case const:                \

diff --git a/service/profiles/a2dp/sink/a2dp_sink_service.c b/service/profiles/a2dp/sink/a2dp_sink_service.c
@@ -23,6 +23,8 @@
 #include <kvdb.h>
 #endif
 
+#include "a2dp_audio.h"
+#include "a2dp_device.h"
 #include "a2dp_sink_service.h"
 #include "adapter_internel.h"
 #include "bt_addr.h"

diff --git a/service/profiles/a2dp/source/a2dp_source_audio.c b/service/profiles/a2dp/source/a2dp_source_audio.c
@@ -36,6 +36,7 @@
 #include <nuttx/circbuf.h>
 
 #include "sal_a2dp_source_interface.h"
+#include "sal_interface.h"
 
 #include "a2dp_codec.h"
 #include "a2dp_control.h"

diff --git a/service/profiles/a2dp/source/a2dp_source_service.c b/service/profiles/a2dp/source/a2dp_source_service.c
@@ -23,6 +23,8 @@
 #include <kvdb.h>
 #endif
 
+#include "a2dp_audio.h"
+#include "a2dp_device.h"
 #include "a2dp_source_service.h"
 #include "adapter_internel.h"
 #include "bt_a2dp_source.h"

diff --git a/service/profiles/avrcp/control/avrcp_control_service.c b/service/profiles/avrcp/control/avrcp_control_service.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 
 #include "adapter_internel.h"
+#include "avrcp_msg.h"
 #include "avrcp_control_service.h"
 #include "bt_addr.h"
 #include "bt_list.h"

diff --git a/service/profiles/avrcp/target/avrcp_target_service.c b/service/profiles/avrcp/target/avrcp_target_service.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 
 #include "adapter_internel.h"
+#include "avrcp_msg.h"
 #include "avrcp_target_service.h"
 #include "bt_addr.h"
 #include "bt_list.h"

diff --git a/service/profiles/system/bt_player.c b/service/profiles/system/bt_player.c
@@ -336,6 +336,9 @@ bt_status_t bt_media_player_set_status(bt_media_player_t* player, bt_media_statu
 {
     int event;
 
+    if (!player)
+        return BT_STATUS_PARM_INVALID;
+
     if (player->play_status == status)
         return BT_STATUS_SUCCESS;
 

diff --git a/service/src/adapter_service.c b/service/src/adapter_service.c
@@ -41,7 +41,6 @@
 #include "bt_device.h"
 #include "bt_list.h"
 #include "bt_profile.h"
-#include "bt_utils.h"
 #include "bt_uuid.h"
 #include "btservice.h"
 #include "callbacks_list.h"
@@ -54,6 +53,8 @@
 #include "state_machine.h"
 #include "storage.h"
 #define LOG_TAG "adapter-svc"
+
+#include "bt_utils.h"
 #include "utils/log.h"
 
 #define CALLBACK_FOREACH(_list, _struct, _cback, ...) BT_CALLBACK_FOREACH(_list, _struct, _cback, ##__VA_ARGS__)

diff --git a/service/stacks/include/sal_a2dp_sink_interface.h b/service/stacks/include/sal_a2dp_sink_interface.h
@@ -1,4 +1,3 @@
-
 /****************************************************************************
  *  Copyright (C) 2024 Xiaomi Corporation
  *
@@ -17,6 +16,8 @@
 #ifndef __SAL_A2DP_SINK_INTERFACE_H__
 #define __SAL_A2DP_SINK_INTERFACE_H__
 
+#ifdef CONFIG_BLUETOOTH_A2DP
+
 #include "a2dp_event.h"
 #include "bt_device.h"
 
@@ -28,4 +29,5 @@ bt_status_t bt_sal_a2dp_sink_start_stream(bt_controller_id_t id, bt_address_t* a
 
 void bt_sal_a2dp_sink_event_callback(a2dp_event_t* event);
 
+#endif /* CONFIG_BLUETOOTH_A2DP */
 #endif /* __SAL_A2DP_SINK_INTERFACE_H__ */
diff --git a/service/stacks/include/sal_a2dp_source_interface.h b/service/stacks/include/sal_a2dp_source_interface.h
@@ -1,4 +1,3 @@
-
 /****************************************************************************
  *  Copyright (C) 2024 Xiaomi Corporation
  *
@@ -17,6 +16,8 @@
 #ifndef __SAL_A2DP_SOURCE_INTERFACE_H__
 #define __SAL_A2DP_SOURCE_INTERFACE_H__
 
+#ifdef CONFIG_BLUETOOTH_A2DP
+
 #include "a2dp_event.h"
 #include "bt_device.h"
 
@@ -31,4 +32,5 @@ bt_status_t bt_sal_a2dp_source_send_data(bt_controller_id_t id, bt_address_t* re
 
 void bt_sal_a2dp_source_event_callback(a2dp_event_t* event);
 
+#endif /* CONFIG_BLUETOOTH_A2DP */
 #endif /* __SAL_A2DP_SOURCE_INTERFACE_H__ */
diff --git a/service/stacks/include/sal_avrcp_control_interface.h b/service/stacks/include/sal_avrcp_control_interface.h
@@ -16,6 +16,9 @@
 #ifndef __SAL_AVRCP_CONTROL_INTERFACE_H__
 #define __SAL_AVRCP_CONTROL_INTERFACE_H__
 
+#if defined(CONFIG_BLUETOOTH_AVRCP_CONTROL) || defined(CONFIG_BLUETOOTH_AVRCP_TARGET)
+
+#include "avrcp_msg.h"
 #include "bt_avrcp.h"
 #include "bt_device.h"
 
@@ -35,4 +38,7 @@ bt_status_t bt_sal_avrcp_control_register_notification(bt_controller_id_t id,
 bt_status_t bt_sal_avrcp_control_get_element_attributes(bt_controller_id_t id,
     bt_address_t* bd_addr, uint8_t attrs_count, avrcp_media_attr_type_t* types);
 
+void bt_sal_avrcp_control_event_callback(avrcp_msg_t* msg);
+
+#endif /* CONFIG_BLUETOOTH_AVRCP_CONTROL || CONFIG_BLUETOOTH_AVRCP_TARGET */
 #endif /* __SAL_AVRCP_CONTROL_INTERFACE_H__ */
diff --git a/service/stacks/include/sal_avrcp_target_interface.h b/service/stacks/include/sal_avrcp_target_interface.h
@@ -16,6 +16,9 @@
 #ifndef __SAL_AVRCP_TARGET_INTERFACE_H__
 #define __SAL_AVRCP_TARGET_INTERFACE_H__
 
+#if defined(CONFIG_BLUETOOTH_AVRCP_CONTROL) || defined(CONFIG_BLUETOOTH_AVRCP_TARGET)
+
+#include "avrcp_msg.h"
 #include "bt_avrcp.h"
 #include "bt_device.h"
 
@@ -33,4 +36,7 @@ bt_status_t bt_sal_avrcp_target_notify_play_position_changed(bt_controller_id_t
     bt_address_t* addr, uint32_t position);
 bt_status_t bt_sal_avrcp_target_register_volume_changed(bt_controller_id_t id, bt_address_t* addr);
 
+void bt_sal_avrcp_target_event_callback(avrcp_msg_t* msg);
+
+#endif /* CONFIG_BLUETOOTH_AVRCP_CONTROL || CONFIG_BLUETOOTH_AVRCP_TARGET */
 #endif /* __SAL_AVRCP_TARGET_INTERFACE_H__ */
diff --git a/service/stacks/include/sal_interface.h b/service/stacks/include/sal_interface.h
@@ -34,6 +34,9 @@
 #include "sal_adapter_interface.h"
 #include "sal_bluelet.h"
 #endif
+#if defined(CONFIG_BLUETOOTH_STACK_BREDR_ZBLUE) || defined(CONFIG_BLUETOOTH_STACK_LE_ZBLUE)
+#include "sal_zblue.h"
+#endif
 
 typedef struct bt_stack_info {
     char name[32];

diff --git a/service/stacks/zephyr/include/sal_zblue.h b/service/stacks/zephyr/include/sal_zblue.h
@@ -1,4 +1,3 @@
-
 /****************************************************************************
  *  Copyright (C) 2024 Xiaomi Corporation
  *

diff --git a/service/stacks/zephyr/sal_a2dp_interface.c b/service/stacks/zephyr/sal_a2dp_interface.c
@@ -320,7 +320,6 @@ static void zblue_on_seted_codec(struct bt_conn* conn, struct bt_a2dp_media_code
 #endif /* CONFIG_BLUETOOTH_A2DP_SINK */
     }
 }
-#endif /* CONFIG_BLUETOOTH_A2DP */
 
 #ifdef CONFIG_BLUETOOTH_A2DP_SOURCE
 static const uint8_t a2dp_sbc_src_codec[] = {
@@ -583,3 +582,5 @@ bt_status_t bt_sal_a2dp_sink_start_stream(bt_controller_id_t id, bt_address_t* a
     return BT_STATUS_NOT_SUPPORTED;
 #endif /* CONFIG_BLUETOOTH_A2DP_SINK */
 }
+
+#endif /* CONFIG_BLUETOOTH_A2DP */
diff --git a/service/stacks/zephyr/sal_avrcp_interface.c b/service/stacks/zephyr/sal_avrcp_interface.c
@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "avrcp_msg.h"
 #include "bluetooth.h"
 #include "bt_addr.h"
 #include "sal_a2dp_sink_interface.h"
@@ -37,6 +36,7 @@
 #include "utils/log.h"
 
 #if defined(CONFIG_BLUETOOTH_AVRCP_CONTROL) || defined(CONFIG_BLUETOOTH_AVRCP_TARGET)
+
 static void zblue_on_connected(struct bt_conn* conn);
 static void zblue_on_disconnected(struct bt_conn* conn);
 static void zblue_on_notify(struct bt_conn* conn, uint8_t event_id, uint8_t status);
@@ -204,7 +204,7 @@ static void zblue_on_notify(struct bt_conn* conn, uint8_t event_id, uint8_t stat
 #ifdef CONFIG_BLUETOOTH_AVRCP_CONTROL
             /* Note: This callback can be triggered when a set absolute volume command is received */
             msg = avrcp_msg_new(AVRC_SET_ABSOLUTE_VOLUME, &bd_addr);
-            msg->data.absvol.volume = volume;
+            msg->data.absvol.volume = status;
             bt_sal_avrcp_control_event_callback(msg);
 #endif /* CONFIG_BLUETOOTH_AVRCP_CONTROL */
         }
@@ -336,7 +336,6 @@ static void zblue_on_playback_pos(struct bt_conn* conn, uint32_t pos)
     bt_sal_avrcp_control_event_callback(msg);
 #endif /* CONFIG_BLUETOOTH_AVRCP_CONTROL */
 }
-#endif
 
 bt_status_t bt_sal_avrcp_control_init(void)
 {
@@ -549,3 +548,5 @@ bt_status_t bt_sal_avrcp_control_get_element_attributes(bt_controller_id_t id,
     return BT_STATUS_NOT_SUPPORTED;
 #endif
 }
+
+#endif /* CONFIG_BLUETOOTH_AVRCP_CONTROL || CONFIG_BLUETOOTH_AVRCP_TARGET */