From 5e08919c8d2af52e20815cfddd6c1395c877a195 Mon Sep 17 00:00:00 2001 From: jialu Date: Fri, 24 Jan 2025 15:20:18 +0800 Subject: [PATCH] AVRCP/A2DP zephyr4.0 bug: v/52947 Signed-off-by: jialu --- zblue/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zblue/Makefile b/zblue/Makefile index 0f1fc74..3915fa1 100644 --- a/zblue/Makefile +++ b/zblue/Makefile @@ -105,16 +105,15 @@ ifeq ($(CONFIG_BT_HCI),y) CLASSICDIR = $(HOSTDIR)/classic ifeq ($(CONFIG_BT_A2DP),y) - CSRCS += $(CLASSICDIR)/a2dp.c $(CLASSICDIR)/a2dp_codec_sbc.c + CSRCS += $(CLASSICDIR)/zephyr3/a2dp.c endif ifeq ($(CONFIG_BT_AVDTP),y) - CSRCS += $(CLASSICDIR)/avdtp.c + CSRCS += $(CLASSICDIR)/zephyr3/avdtp.c + CSRCS += $(CLASSICDIR)/zephyr3/avdtp_ep.c endif ifeq ($(CONFIG_BT_AVRCP), y) - CSRCS += $(CLASSICDIR)/avrcp.c - endif - ifeq ($(CONFIG_BT_AVCTP), y) - CSRCS += $(CLASSICDIR)/avctp.c + CSRCS += $(CLASSICDIR)/zephyr3/avrcp.c + CSRCS += $(CLASSICDIR)/zephyr3/avrcp_cttg.c endif ifeq ($(CONFIG_BT_RFCOMM),y) CSRCS += $(CLASSICDIR)/rfcomm.c @@ -144,10 +143,10 @@ ifeq ($(CONFIG_BT_HCI),y) CSRCS += $(CLASSICDIR)/shell/rfcomm.c endif ifeq ($(CONFIG_BT_A2DP),y) - CSRCS += $(CLASSICDIR)/shell/a2dp.c + # CSRCS += $(CLASSICDIR)/shell/a2dp.c endif ifeq ($(CONFIG_BT_AVRCP),y) - CSRCS += $(CLASSICDIR)/shell/avrcp.c + # CSRCS += $(CLASSICDIR)/shell/avrcp.c endif endif # CONFIG_BT_SHELL endif # CONFIG_BT_CLASSIC @@ -740,6 +739,7 @@ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" zblue/port/kernel/include} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" zblue/subsys/bluetooth} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" zblue/subsys/bluetooth/audio} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" zblue/subsys/bluetooth/host} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" zblue/subsys/bluetooth/host/classic/zephyr3} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" zblue/subsys/bluetooth/mesh} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" zblue/subsys/bluetooth/services} CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" zblue/subsys/settings/include}