diff --git a/doc/manual/update_apis.py b/doc/manual/update_apis.py index 814d9d737..5a0495dee 100755 --- a/doc/manual/update_apis.py +++ b/doc/manual/update_apis.py @@ -25,7 +25,7 @@ apis = [ ["src/classic/pan.h", "PAN", "pan"], ["src/classic/rfcomm.h", "RFCOMM", "rfcomm"], ["src/classic/sdp_client.h", "SDP Client", "sdpClient"], - ["src/classic/sdp_query_rfcomm.h", "SDP RFCOMM Query", "sdpQueries"], + ["src/classic/sdp_client_query_rfcomm.h", "SDP RFCOMM Query", "sdpQueries"], ["src/classic/sdp_server.h", "SDP Server", "sdpSrv"], ["src/classic/sdp_util.h","SDP Utils", "sdpUtil"], diff --git a/example/Makefile.inc b/example/Makefile.inc index b6c134230..970d70092 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -29,7 +29,7 @@ COMMON += \ SDP_CLIENT += \ sdp_client.o \ - sdp_query_rfcomm.o \ + sdp_client_query_rfcomm.o \ ATT += \ att_dispatch.c \ diff --git a/example/sdp_general_query.c b/example/sdp_general_query.c index 324b8a768..2923e708d 100644 --- a/example/sdp_general_query.c +++ b/example/sdp_general_query.c @@ -137,7 +137,7 @@ static void assertBuffer(int size){ * see Listing HandleSDPQUeryResult. * * To save memory, it's also possible to process these chunks directly by a custom stream parser, - * similar to the way XML files are parsed by a SAX parser. Have a look at *src/sdp_query_rfcomm.c* + * similar to the way XML files are parsed by a SAX parser. Have a look at *src/sdp_client_query_rfcomm.c* * which retrieves the RFCOMM channel number and the service name. */ diff --git a/example/sdp_rfcomm_query.c b/example/sdp_rfcomm_query.c index deab8efcd..978868f72 100644 --- a/example/sdp_rfcomm_query.c +++ b/example/sdp_rfcomm_query.c @@ -56,7 +56,7 @@ #include "btstack_memory.h" #include "hci_dump.h" #include "l2cap.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "btstack_event.h" static void handle_query_rfcomm_event(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size); diff --git a/example/spp_streamer.c b/example/spp_streamer.c index 8cf161492..9b27840bb 100644 --- a/example/spp_streamer.c +++ b/example/spp_streamer.c @@ -56,7 +56,7 @@ #include "btstack_memory.h" #include "hci_dump.h" #include "l2cap.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/rfcomm.h" #include "btstack_event.h" diff --git a/platform/daemon/src/daemon.c b/platform/daemon/src/daemon.c index 5fcd4fead..f14f19740 100644 --- a/platform/daemon/src/daemon.c +++ b/platform/daemon/src/daemon.c @@ -68,7 +68,7 @@ #include "classic/rfcomm.h" #include "classic/sdp_server.h" #include "classic/sdp_client.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "hci.h" #include "hci_cmd.h" #include "hci_dump.h" diff --git a/port/daemon/src/Makefile.in b/port/daemon/src/Makefile.in index 770d41024..878e511b6 100644 --- a/port/daemon/src/Makefile.in +++ b/port/daemon/src/Makefile.in @@ -50,7 +50,7 @@ BTdaemon_SOURCES = \ bnep.c \ sdp_server.c \ sdp_client.c \ - sdp_query_rfcomm.c \ + sdp_client_query_rfcomm.c \ att_dispatch.c \ gatt_client.c \ att_db.c \ diff --git a/port/ez430-rf2560/Makefile b/port/ez430-rf2560/Makefile index ce27fb7cb..702fd7f46 100644 --- a/port/ez430-rf2560/Makefile +++ b/port/ez430-rf2560/Makefile @@ -65,7 +65,7 @@ SPP = \ SDP_CLIENT += \ sdp_client.o \ - sdp_query_rfcomm.o \ + sdp_client_query_rfcomm.o \ BLE = \ att_db.c \ diff --git a/port/ios/src/Makefile b/port/ios/src/Makefile index e48af9545..ce5fcd12e 100644 --- a/port/ios/src/Makefile +++ b/port/ios/src/Makefile @@ -50,7 +50,7 @@ BTdaemon_FILES = \ SpringBoardAccess.c \ rfcomm_service_db_cocoa.m \ sdp_client.c \ - sdp_query_rfcomm.c \ + sdp_client_query_rfcomm.c \ BTdaemon_CFLAGS = \ -I$(BTSTACK_ROOT)/src \ diff --git a/port/msp-exp430f5438-cc2564b/Makefile b/port/msp-exp430f5438-cc2564b/Makefile index 8ebf418b9..355037266 100644 --- a/port/msp-exp430f5438-cc2564b/Makefile +++ b/port/msp-exp430f5438-cc2564b/Makefile @@ -65,7 +65,7 @@ SPP = \ SDP_CLIENT += \ sdp_client.o \ - sdp_query_rfcomm.o \ + sdp_client_query_rfcomm.o \ BLE = \ att_db.c \ diff --git a/port/msp430f5229lp-cc2564b/Makefile b/port/msp430f5229lp-cc2564b/Makefile index b3268555e..b78521b4d 100644 --- a/port/msp430f5229lp-cc2564b/Makefile +++ b/port/msp430f5229lp-cc2564b/Makefile @@ -67,7 +67,7 @@ SPP = \ SDP_CLIENT += \ sdp_client.o \ - sdp_query_rfcomm.o \ + sdp_client_query_rfcomm.o \ BLE = \ att_db.c \ diff --git a/port/mtk/Makefile b/port/mtk/Makefile index 3d685fadf..462d71269 100644 --- a/port/mtk/Makefile +++ b/port/mtk/Makefile @@ -55,7 +55,7 @@ BTdaemon_OBJS = $(libBTstack_OBJS) \ att_db.o \ att_server.o \ sdp_client.o \ - sdp_query_rfcomm.o \ + sdp_client_query_rfcomm.o \ all: $(TOOLCHAIN) version BTstackDaemon libBTstack.so BTstackDaemonRespawn inquiry le_scan rfcomm_echo dist diff --git a/port/pic32-harmony/app.X/nbproject/Makefile-default.mk b/port/pic32-harmony/app.X/nbproject/Makefile-default.mk index 07d82c2f0..e8a8f941d 100644 --- a/port/pic32-harmony/app.X/nbproject/Makefile-default.mk +++ b/port/pic32-harmony/app.X/nbproject/Makefile-default.mk @@ -45,17 +45,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE} # Source Files Quoted if spaced -SOURCEFILES_QUOTED_IF_SPACED=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../example/spp_and_le_counter.c ../../../src/ble/ad_parser.c ../../../src/ble/att_db.c ../../../src/ble/att_dispatch.c ../../../src/ble/att_server.c ../../../src/ble/le_device_db_memory.c ../../../src/ble/sm.c ../../../chipset/csr/btstack_chipset_csr.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/btstack_linked_list.c ../../../src/btstack_memory_pool.c ../../../src/classic/btstack_link_key_db_memory.c ../../../src/classic/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/classic/sdp_server.c ../../../src/classic/sdp_client.c ../../../src/classic/sdp_query_rfcomm.c ../../../src/classic/sdp_util.c ../../../src/btstack_util.c ../../../platform/embedded/btstack_run_loop_embedded.c ../../../platform/embedded/hci_transport_h4_embedded.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c +SOURCEFILES_QUOTED_IF_SPACED=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../example/spp_and_le_counter.c ../../../src/ble/ad_parser.c ../../../src/ble/att_db.c ../../../src/ble/att_dispatch.c ../../../src/ble/att_server.c ../../../src/ble/le_device_db_memory.c ../../../src/ble/sm.c ../../../chipset/csr/btstack_chipset_csr.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/btstack_linked_list.c ../../../src/btstack_memory_pool.c ../../../src/classic/btstack_link_key_db_memory.c ../../../src/classic/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/classic/sdp_server.c ../../../src/classic/sdp_client.c ../../../src/classic/sdp_client_query_rfcomm.c ../../../src/classic/sdp_util.c ../../../src/btstack_util.c ../../../platform/embedded/btstack_run_loop_embedded.c ../../../platform/embedded/hci_transport_h4_embedded.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c # Object Files Quoted if spaced -OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/97075643/spp_and_le_counter.o ${OBJECTDIR}/_ext/534563071/ad_parser.o ${OBJECTDIR}/_ext/534563071/att_db.o ${OBJECTDIR}/_ext/534563071/att_dispatch.o ${OBJECTDIR}/_ext/534563071/att_server.o ${OBJECTDIR}/_ext/534563071/le_device_db_memory.o ${OBJECTDIR}/_ext/534563071/sm.o ${OBJECTDIR}/_ext/1768064806/btstack_chipset_csr.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmd.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/btstack_linked_list.o ${OBJECTDIR}/_ext/1386528437/btstack_memory_pool.o ${OBJECTDIR}/_ext/1386327864/btstack_link_key_db_memory.o ${OBJECTDIR}/_ext/1386327864/rfcomm.o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop.o ${OBJECTDIR}/_ext/1386327864/sdp_server.o ${OBJECTDIR}/_ext/1386327864/sdp_client.o ${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o ${OBJECTDIR}/_ext/1386327864/sdp_util.o ${OBJECTDIR}/_ext/1386528437/btstack_util.o ${OBJECTDIR}/_ext/993942601/btstack_run_loop_embedded.o ${OBJECTDIR}/_ext/993942601/hci_transport_h4_embedded.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o -POSSIBLE_DEPFILES=${OBJECTDIR}/_ext/2048875307/system_init.o.d ${OBJECTDIR}/_ext/2048875307/system_tasks.o.d ${OBJECTDIR}/_ext/1360937237/btstack_port.o.d ${OBJECTDIR}/_ext/1360937237/app_debug.o.d ${OBJECTDIR}/_ext/1360937237/app.o.d ${OBJECTDIR}/_ext/1360937237/main.o.d ${OBJECTDIR}/_ext/97075643/spp_and_le_counter.o.d ${OBJECTDIR}/_ext/534563071/ad_parser.o.d ${OBJECTDIR}/_ext/534563071/att_db.o.d ${OBJECTDIR}/_ext/534563071/att_dispatch.o.d ${OBJECTDIR}/_ext/534563071/att_server.o.d ${OBJECTDIR}/_ext/534563071/le_device_db_memory.o.d ${OBJECTDIR}/_ext/534563071/sm.o.d ${OBJECTDIR}/_ext/1768064806/btstack_chipset_csr.o.d ${OBJECTDIR}/_ext/1386528437/btstack_memory.o.d ${OBJECTDIR}/_ext/1386528437/hci.o.d ${OBJECTDIR}/_ext/1386528437/hci_cmd.o.d ${OBJECTDIR}/_ext/1386528437/hci_dump.o.d ${OBJECTDIR}/_ext/1386528437/l2cap.o.d ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o.d ${OBJECTDIR}/_ext/1386528437/btstack_linked_list.o.d ${OBJECTDIR}/_ext/1386528437/btstack_memory_pool.o.d ${OBJECTDIR}/_ext/1386327864/btstack_link_key_db_memory.o.d ${OBJECTDIR}/_ext/1386327864/rfcomm.o.d ${OBJECTDIR}/_ext/1386528437/btstack_run_loop.o.d ${OBJECTDIR}/_ext/1386327864/sdp_server.o.d ${OBJECTDIR}/_ext/1386327864/sdp_client.o.d ${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o.d ${OBJECTDIR}/_ext/1386327864/sdp_util.o.d ${OBJECTDIR}/_ext/1386528437/btstack_util.o.d ${OBJECTDIR}/_ext/993942601/btstack_run_loop_embedded.o.d ${OBJECTDIR}/_ext/993942601/hci_transport_h4_embedded.o.d ${OBJECTDIR}/_ext/1880736137/drv_tmr.o.d ${OBJECTDIR}/_ext/1112166103/sys_clk.o.d ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o.d ${OBJECTDIR}/_ext/1510368962/sys_devcon.o.d ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o.d ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o.d ${OBJECTDIR}/_ext/2147153351/sys_ports.o.d +OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/97075643/spp_and_le_counter.o ${OBJECTDIR}/_ext/534563071/ad_parser.o ${OBJECTDIR}/_ext/534563071/att_db.o ${OBJECTDIR}/_ext/534563071/att_dispatch.o ${OBJECTDIR}/_ext/534563071/att_server.o ${OBJECTDIR}/_ext/534563071/le_device_db_memory.o ${OBJECTDIR}/_ext/534563071/sm.o ${OBJECTDIR}/_ext/1768064806/btstack_chipset_csr.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmd.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/btstack_linked_list.o ${OBJECTDIR}/_ext/1386528437/btstack_memory_pool.o ${OBJECTDIR}/_ext/1386327864/btstack_link_key_db_memory.o ${OBJECTDIR}/_ext/1386327864/rfcomm.o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop.o ${OBJECTDIR}/_ext/1386327864/sdp_server.o ${OBJECTDIR}/_ext/1386327864/sdp_client.o ${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o ${OBJECTDIR}/_ext/1386327864/sdp_util.o ${OBJECTDIR}/_ext/1386528437/btstack_util.o ${OBJECTDIR}/_ext/993942601/btstack_run_loop_embedded.o ${OBJECTDIR}/_ext/993942601/hci_transport_h4_embedded.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o +POSSIBLE_DEPFILES=${OBJECTDIR}/_ext/2048875307/system_init.o.d ${OBJECTDIR}/_ext/2048875307/system_tasks.o.d ${OBJECTDIR}/_ext/1360937237/btstack_port.o.d ${OBJECTDIR}/_ext/1360937237/app_debug.o.d ${OBJECTDIR}/_ext/1360937237/app.o.d ${OBJECTDIR}/_ext/1360937237/main.o.d ${OBJECTDIR}/_ext/97075643/spp_and_le_counter.o.d ${OBJECTDIR}/_ext/534563071/ad_parser.o.d ${OBJECTDIR}/_ext/534563071/att_db.o.d ${OBJECTDIR}/_ext/534563071/att_dispatch.o.d ${OBJECTDIR}/_ext/534563071/att_server.o.d ${OBJECTDIR}/_ext/534563071/le_device_db_memory.o.d ${OBJECTDIR}/_ext/534563071/sm.o.d ${OBJECTDIR}/_ext/1768064806/btstack_chipset_csr.o.d ${OBJECTDIR}/_ext/1386528437/btstack_memory.o.d ${OBJECTDIR}/_ext/1386528437/hci.o.d ${OBJECTDIR}/_ext/1386528437/hci_cmd.o.d ${OBJECTDIR}/_ext/1386528437/hci_dump.o.d ${OBJECTDIR}/_ext/1386528437/l2cap.o.d ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o.d ${OBJECTDIR}/_ext/1386528437/btstack_linked_list.o.d ${OBJECTDIR}/_ext/1386528437/btstack_memory_pool.o.d ${OBJECTDIR}/_ext/1386327864/btstack_link_key_db_memory.o.d ${OBJECTDIR}/_ext/1386327864/rfcomm.o.d ${OBJECTDIR}/_ext/1386528437/btstack_run_loop.o.d ${OBJECTDIR}/_ext/1386327864/sdp_server.o.d ${OBJECTDIR}/_ext/1386327864/sdp_client.o.d ${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o.d ${OBJECTDIR}/_ext/1386327864/sdp_util.o.d ${OBJECTDIR}/_ext/1386528437/btstack_util.o.d ${OBJECTDIR}/_ext/993942601/btstack_run_loop_embedded.o.d ${OBJECTDIR}/_ext/993942601/hci_transport_h4_embedded.o.d ${OBJECTDIR}/_ext/1880736137/drv_tmr.o.d ${OBJECTDIR}/_ext/1112166103/sys_clk.o.d ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o.d ${OBJECTDIR}/_ext/1510368962/sys_devcon.o.d ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o.d ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o.d ${OBJECTDIR}/_ext/2147153351/sys_ports.o.d # Object Files -OBJECTFILES=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/97075643/spp_and_le_counter.o ${OBJECTDIR}/_ext/534563071/ad_parser.o ${OBJECTDIR}/_ext/534563071/att_db.o ${OBJECTDIR}/_ext/534563071/att_dispatch.o ${OBJECTDIR}/_ext/534563071/att_server.o ${OBJECTDIR}/_ext/534563071/le_device_db_memory.o ${OBJECTDIR}/_ext/534563071/sm.o ${OBJECTDIR}/_ext/1768064806/btstack_chipset_csr.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmd.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/btstack_linked_list.o ${OBJECTDIR}/_ext/1386528437/btstack_memory_pool.o ${OBJECTDIR}/_ext/1386327864/btstack_link_key_db_memory.o ${OBJECTDIR}/_ext/1386327864/rfcomm.o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop.o ${OBJECTDIR}/_ext/1386327864/sdp_server.o ${OBJECTDIR}/_ext/1386327864/sdp_client.o ${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o ${OBJECTDIR}/_ext/1386327864/sdp_util.o ${OBJECTDIR}/_ext/1386528437/btstack_util.o ${OBJECTDIR}/_ext/993942601/btstack_run_loop_embedded.o ${OBJECTDIR}/_ext/993942601/hci_transport_h4_embedded.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o +OBJECTFILES=${OBJECTDIR}/_ext/2048875307/system_init.o ${OBJECTDIR}/_ext/2048875307/system_tasks.o ${OBJECTDIR}/_ext/1360937237/btstack_port.o ${OBJECTDIR}/_ext/1360937237/app_debug.o ${OBJECTDIR}/_ext/1360937237/app.o ${OBJECTDIR}/_ext/1360937237/main.o ${OBJECTDIR}/_ext/97075643/spp_and_le_counter.o ${OBJECTDIR}/_ext/534563071/ad_parser.o ${OBJECTDIR}/_ext/534563071/att_db.o ${OBJECTDIR}/_ext/534563071/att_dispatch.o ${OBJECTDIR}/_ext/534563071/att_server.o ${OBJECTDIR}/_ext/534563071/le_device_db_memory.o ${OBJECTDIR}/_ext/534563071/sm.o ${OBJECTDIR}/_ext/1768064806/btstack_chipset_csr.o ${OBJECTDIR}/_ext/1386528437/btstack_memory.o ${OBJECTDIR}/_ext/1386528437/hci.o ${OBJECTDIR}/_ext/1386528437/hci_cmd.o ${OBJECTDIR}/_ext/1386528437/hci_dump.o ${OBJECTDIR}/_ext/1386528437/l2cap.o ${OBJECTDIR}/_ext/1386528437/l2cap_signaling.o ${OBJECTDIR}/_ext/1386528437/btstack_linked_list.o ${OBJECTDIR}/_ext/1386528437/btstack_memory_pool.o ${OBJECTDIR}/_ext/1386327864/btstack_link_key_db_memory.o ${OBJECTDIR}/_ext/1386327864/rfcomm.o ${OBJECTDIR}/_ext/1386528437/btstack_run_loop.o ${OBJECTDIR}/_ext/1386327864/sdp_server.o ${OBJECTDIR}/_ext/1386327864/sdp_client.o ${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o ${OBJECTDIR}/_ext/1386327864/sdp_util.o ${OBJECTDIR}/_ext/1386528437/btstack_util.o ${OBJECTDIR}/_ext/993942601/btstack_run_loop_embedded.o ${OBJECTDIR}/_ext/993942601/hci_transport_h4_embedded.o ${OBJECTDIR}/_ext/1880736137/drv_tmr.o ${OBJECTDIR}/_ext/1112166103/sys_clk.o ${OBJECTDIR}/_ext/1112166103/sys_clk_pic32mx.o ${OBJECTDIR}/_ext/1510368962/sys_devcon.o ${OBJECTDIR}/_ext/1510368962/sys_devcon_pic32mx.o ${OBJECTDIR}/_ext/2087176412/sys_int_pic32.o ${OBJECTDIR}/_ext/2147153351/sys_ports.o # Source Files -SOURCEFILES=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../example/spp_and_le_counter.c ../../../src/ble/ad_parser.c ../../../src/ble/att_db.c ../../../src/ble/att_dispatch.c ../../../src/ble/att_server.c ../../../src/ble/le_device_db_memory.c ../../../src/ble/sm.c ../../../chipset/csr/btstack_chipset_csr.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/btstack_linked_list.c ../../../src/btstack_memory_pool.c ../../../src/classic/btstack_link_key_db_memory.c ../../../src/classic/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/classic/sdp_server.c ../../../src/classic/sdp_client.c ../../../src/classic/sdp_query_rfcomm.c ../../../src/classic/sdp_util.c ../../../src/btstack_util.c ../../../platform/embedded/btstack_run_loop_embedded.c ../../../platform/embedded/hci_transport_h4_embedded.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c +SOURCEFILES=../src/system_config/bk-audio-dk/system_init.c ../src/system_config/bk-audio-dk/system_tasks.c ../src/btstack_port.c ../src/app_debug.c ../src/app.c ../src/main.c ../../../example/spp_and_le_counter.c ../../../src/ble/ad_parser.c ../../../src/ble/att_db.c ../../../src/ble/att_dispatch.c ../../../src/ble/att_server.c ../../../src/ble/le_device_db_memory.c ../../../src/ble/sm.c ../../../chipset/csr/btstack_chipset_csr.c ../../../src/btstack_memory.c ../../../src/hci.c ../../../src/hci_cmd.c ../../../src/hci_dump.c ../../../src/l2cap.c ../../../src/l2cap_signaling.c ../../../src/btstack_linked_list.c ../../../src/btstack_memory_pool.c ../../../src/classic/btstack_link_key_db_memory.c ../../../src/classic/rfcomm.c ../../../src/btstack_run_loop.c ../../../src/classic/sdp_server.c ../../../src/classic/sdp_client.c ../../../src/classic/sdp_client_query_rfcomm.c ../../../src/classic/sdp_util.c ../../../src/btstack_util.c ../../../platform/embedded/btstack_run_loop_embedded.c ../../../platform/embedded/hci_transport_h4_embedded.c ../../../../driver/tmr/src/dynamic/drv_tmr.c ../../../../system/clk/src/sys_clk.c ../../../../system/clk/src/sys_clk_pic32mx.c ../../../../system/devcon/src/sys_devcon.c ../../../../system/devcon/src/sys_devcon_pic32mx.c ../../../../system/int/src/sys_int_pic32.c ../../../../system/ports/src/sys_ports.c CFLAGS= @@ -256,11 +256,11 @@ ${OBJECTDIR}/_ext/1386327864/sdp_client.o: ../../../src/classic/sdp_client.c nb @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client.o @${FIXDEPS} "${OBJECTDIR}/_ext/1386327864/sdp_client.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -I"../../../platform/embedded" -MMD -MF "${OBJECTDIR}/_ext/1386327864/sdp_client.o.d" -o ${OBJECTDIR}/_ext/1386327864/sdp_client.o ../../../src/classic/sdp_client.c -${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o: ../../../src/classic/sdp_query_rfcomm.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o: ../../../src/classic/sdp_client_query_rfcomm.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/1386327864" - @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o.d - @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o - @${FIXDEPS} "${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -I"../../../platform/embedded" -MMD -MF "${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o.d" -o ${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o ../../../src/classic/sdp_query_rfcomm.c + @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o.d + @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o + @${FIXDEPS} "${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -fframe-base-loclist -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -I"../../../platform/embedded" -MMD -MF "${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o.d" -o ${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o ../../../src/classic/sdp_client_query_rfcomm.c ${OBJECTDIR}/_ext/1386327864/sdp_util.o: ../../../src/classic/sdp_util.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/1386327864" @@ -491,11 +491,11 @@ ${OBJECTDIR}/_ext/1386327864/sdp_client.o: ../../../src/classic/sdp_client.c nb @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client.o @${FIXDEPS} "${OBJECTDIR}/_ext/1386327864/sdp_client.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -I"../../../platform/embedded" -MMD -MF "${OBJECTDIR}/_ext/1386327864/sdp_client.o.d" -o ${OBJECTDIR}/_ext/1386327864/sdp_client.o ../../../src/classic/sdp_client.c -${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o: ../../../src/classic/sdp_query_rfcomm.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o: ../../../src/classic/sdp_client_query_rfcomm.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/1386327864" - @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o.d - @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o - @${FIXDEPS} "${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -I"../../../platform/embedded" -MMD -MF "${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o.d" -o ${OBJECTDIR}/_ext/1386327864/sdp_query_rfcomm.o ../../../src/classic/sdp_query_rfcomm.c + @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o.d + @${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o + @${FIXDEPS} "${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -x c -c -mprocessor=$(MP_PROCESSOR_OPTION) -Os -I"." -I"../../../.." -I"../src" -I"../src/system_config/bk-audio-dk" -I"../../../include" -I"../../../src" -I"../../../ble" -I"../../../chipset/csr" -I"../../../platform/embedded" -MMD -MF "${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o.d" -o ${OBJECTDIR}/_ext/1386327864/sdp_client_query_rfcomm.o ../../../src/classic/sdp_client_query_rfcomm.c ${OBJECTDIR}/_ext/1386327864/sdp_util.o: ../../../src/classic/sdp_util.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}/_ext/1386327864" diff --git a/port/pic32-harmony/app.X/nbproject/configurations.xml b/port/pic32-harmony/app.X/nbproject/configurations.xml index a76748a63..680766f8e 100644 --- a/port/pic32-harmony/app.X/nbproject/configurations.xml +++ b/port/pic32-harmony/app.X/nbproject/configurations.xml @@ -34,7 +34,7 @@ ../../../src/classic/rfcomm.h ../../../src/classic/sdp_server.h ../../../src/classic/sdp_client.h - ../../../src/classic/sdp_query_rfcomm.h + ../../../src/classic/sdp_client_query_rfcomm.h ../../../platform/embedded/hal_cpu.h @@ -130,7 +130,7 @@ ../../../src/btstack_run_loop.c ../../../src/classic/sdp_server.c ../../../src/classic/sdp_client.c - ../../../src/classic/sdp_query_rfcomm.c + ../../../src/classic/sdp_client_query_rfcomm.c ../../../src/classic/sdp_util.c ../../../src/btstack_util.c ../../../platform/embedded/btstack_run_loop_embedded.c diff --git a/port/stm32-f103rb-nucleo/Makefile b/port/stm32-f103rb-nucleo/Makefile index e56afc4b1..4220c5c42 100644 --- a/port/stm32-f103rb-nucleo/Makefile +++ b/port/stm32-f103rb-nucleo/Makefile @@ -28,7 +28,7 @@ COMMON = \ btstack_chipset_cc256x.c \ btstack_link_key_db_memory.c \ rfcomm.c \ - sdp_query_rfcomm.c \ + sdp_client_query_rfcomm.c \ btstack_util.c \ hci.c \ hci_cmd.c \ diff --git a/port/wiced/wiced.mk b/port/wiced/wiced.mk index 42d453935..cd69da575 100644 --- a/port/wiced/wiced.mk +++ b/port/wiced/wiced.mk @@ -22,7 +22,7 @@ $(NAME)_SOURCES += \ ../../src/classic/rfcomm.c \ ../../src/classic/sdp_server.c \ ../../src/classic/sdp_client.c \ - ../../src/classic/sdp_query_rfcomm.c \ + ../../src/classic/sdp_client_query_rfcomm.c \ ../../src/classic/sdp_util.c \ ../../src/btstack_linked_list.c \ ../../src/btstack_memory.c \ diff --git a/src/btstack.h b/src/btstack.h index 704c472fc..85cbd46c6 100644 --- a/src/btstack.h +++ b/src/btstack.h @@ -89,7 +89,7 @@ #include "classic/rfcomm.h" #include "classic/sdp_server.h" #include "classic/sdp_client.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/sdp_util.h" // #endif diff --git a/src/classic/hfp.c b/src/classic/hfp.c index 8b98555ca..eac8606b0 100644 --- a/src/classic/hfp.c +++ b/src/classic/hfp.c @@ -57,7 +57,7 @@ #include "hci_dump.h" #include "l2cap.h" #include "btstack_debug.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/sdp_server.h" #include "classic/sdp_util.h" #include "btstack_event.h" diff --git a/src/classic/hfp.h b/src/classic/hfp.h index 4cc03004e..88dfce7f6 100644 --- a/src/classic/hfp.h +++ b/src/classic/hfp.h @@ -46,7 +46,7 @@ #define __BTSTACK_HFP_H #include "hci.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #if defined __cplusplus extern "C" { diff --git a/src/classic/hfp_ag.c b/src/classic/hfp_ag.c index cd5f89dce..e09cadfa9 100644 --- a/src/classic/hfp_ag.c +++ b/src/classic/hfp_ag.c @@ -59,7 +59,7 @@ #include "classic/hfp.h" #include "classic/hfp_ag.h" #include "classic/hfp_gsm_model.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/sdp_server.h" #include "classic/sdp_util.h" diff --git a/src/classic/hfp_ag.h b/src/classic/hfp_ag.h index 82e522d6e..1115b3b5e 100644 --- a/src/classic/hfp_ag.h +++ b/src/classic/hfp_ag.h @@ -46,7 +46,7 @@ #define btstack_hfp_ag_h #include "hci.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/hfp.h" #include "classic/hfp_gsm_model.h" diff --git a/src/classic/hfp_gsm_model.c b/src/classic/hfp_gsm_model.c index 53169610e..746d1b79c 100644 --- a/src/classic/hfp_gsm_model.c +++ b/src/classic/hfp_gsm_model.c @@ -52,7 +52,7 @@ #include "classic/hfp.h" #include "classic/hfp_gsm_model.h" #include "classic/sdp_server.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "btstack_debug.h" #include "hci.h" #include "hci_cmd.h" diff --git a/src/classic/hfp_gsm_model.h b/src/classic/hfp_gsm_model.h index f66d67831..7c8711f30 100644 --- a/src/classic/hfp_gsm_model.h +++ b/src/classic/hfp_gsm_model.h @@ -46,7 +46,7 @@ #define BTSTACK_HFP_GSM_MODEL_H #include "hci.h" -#include "sdp_query_rfcomm.h" +#include "sdp_client_query_rfcomm.h" #include "hfp.h" #if defined __cplusplus diff --git a/src/classic/hfp_hf.c b/src/classic/hfp_hf.c index e563ae260..c45e9ed4b 100644 --- a/src/classic/hfp_hf.c +++ b/src/classic/hfp_hf.c @@ -55,7 +55,7 @@ #include "btstack_memory.h" #include "hci_dump.h" #include "l2cap.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/sdp_server.h" #include "classic/sdp_util.h" #include "btstack_debug.h" diff --git a/src/classic/hfp_hf.h b/src/classic/hfp_hf.h index 57aac148c..7d1d4dc61 100644 --- a/src/classic/hfp_hf.h +++ b/src/classic/hfp_hf.h @@ -46,7 +46,7 @@ #define __BTSTACK_HFP_HF_H #include "hci.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/hfp.h" #if defined __cplusplus diff --git a/src/classic/hsp_ag.c b/src/classic/hsp_ag.c index 765f1583f..0f572e108 100644 --- a/src/classic/hsp_ag.c +++ b/src/classic/hsp_ag.c @@ -53,7 +53,7 @@ #include "btstack_memory.h" #include "btstack_run_loop.h" #include "classic/sdp_server.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/sdp_util.h" #include "hci.h" #include "hci_cmd.h" diff --git a/src/classic/hsp_ag.h b/src/classic/hsp_ag.h index 1609a7219..e3e7def29 100644 --- a/src/classic/hsp_ag.h +++ b/src/classic/hsp_ag.h @@ -46,7 +46,7 @@ #define btstack_hsp_ag_h #include "hci.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #if defined __cplusplus extern "C" { diff --git a/src/classic/hsp_hs.c b/src/classic/hsp_hs.c index 021f8e989..003cac2df 100644 --- a/src/classic/hsp_hs.c +++ b/src/classic/hsp_hs.c @@ -53,7 +53,7 @@ #include "btstack_memory.h" #include "btstack_run_loop.h" #include "classic/sdp_server.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/sdp_util.h" #include "hci.h" #include "hci_cmd.h" diff --git a/src/classic/hsp_hs.h b/src/classic/hsp_hs.h index a77399da8..6660759de 100644 --- a/src/classic/hsp_hs.h +++ b/src/classic/hsp_hs.h @@ -46,7 +46,7 @@ #define btstack_hsp_hs_h #include "hci.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #if defined __cplusplus extern "C" { diff --git a/src/classic/sdp_query_rfcomm.c b/src/classic/sdp_client_query_rfcomm.c similarity index 99% rename from src/classic/sdp_query_rfcomm.c rename to src/classic/sdp_client_query_rfcomm.c index 673bac7e5..97845d953 100644 --- a/src/classic/sdp_query_rfcomm.c +++ b/src/classic/sdp_client_query_rfcomm.c @@ -47,7 +47,7 @@ #include "btstack_debug.h" #include "btstack_event.h" #include "classic/sdp_client.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/sdp_util.h" #include "hci_cmd.h" diff --git a/src/classic/sdp_query_rfcomm.h b/src/classic/sdp_client_query_rfcomm.h similarity index 100% rename from src/classic/sdp_query_rfcomm.h rename to src/classic/sdp_client_query_rfcomm.h diff --git a/test/hfp/Makefile b/test/hfp/Makefile index 2ba2758d1..503ed0fa6 100644 --- a/test/hfp/Makefile +++ b/test/hfp/Makefile @@ -9,7 +9,7 @@ include ${BTSTACK_ROOT}/example/Makefile.inc COMMON = \ sdp_server.c \ - sdp_query_rfcomm.c \ + sdp_client_query_rfcomm.c \ btstack_link_key_db_memory.c \ btstack_linked_list.c \ btstack_memory.c \ diff --git a/test/hfp/mock.c b/test/hfp/mock.c index f2fc36ea1..db11f2880 100644 --- a/test/hfp/mock.c +++ b/test/hfp/mock.c @@ -48,7 +48,7 @@ #include "hci.h" #include "hci_dump.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/rfcomm.h" #include "classic/hfp_hf.h" diff --git a/test/pts/classic_test.c b/test/pts/classic_test.c index e5a0fab96..3cf69dea8 100644 --- a/test/pts/classic_test.c +++ b/test/pts/classic_test.c @@ -60,7 +60,7 @@ #include "l2cap.h" #include "classic/rfcomm.h" #include "classic/sdp_server.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "ble/sm.h" #include "stdin_support.h" diff --git a/test/pts/hfp_test.c b/test/pts/hfp_test.c index 87608cca8..bb71765e4 100644 --- a/test/pts/hfp_test.c +++ b/test/pts/hfp_test.c @@ -56,7 +56,7 @@ #include "btstack_memory.h" #include "hci_dump.h" #include "l2cap.h" -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" // static bd_addr_t remote = {0x04,0x0C,0xCE,0xE4,0x85,0xD3}; static bd_addr_t remote = {0x00, 0x21, 0x3C, 0xAC, 0xF7, 0x38}; diff --git a/test/sdp_client/Makefile b/test/sdp_client/Makefile index de64423e0..dc62cec90 100644 --- a/test/sdp_client/Makefile +++ b/test/sdp_client/Makefile @@ -24,7 +24,7 @@ COMMON_OBJ = $(COMMON:.c=.o) all: sdp_rfcomm_query general_sdp_query service_attribute_search_query service_search_query -sdp_rfcomm_query: ${COMMON_OBJ} sdp_query_rfcomm.c sdp_rfcomm_query.c +sdp_rfcomm_query: ${COMMON_OBJ} sdp_client_query_rfcomm.c sdp_rfcomm_query.c ${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@ general_sdp_query: ${COMMON_OBJ} general_sdp_query.c diff --git a/test/sdp_client/sdp_rfcomm_query.c b/test/sdp_client/sdp_rfcomm_query.c index e3441deef..66fd5e45e 100644 --- a/test/sdp_client/sdp_rfcomm_query.c +++ b/test/sdp_client/sdp_rfcomm_query.c @@ -12,7 +12,7 @@ #include #include -#include "classic/sdp_query_rfcomm.h" +#include "classic/sdp_client_query_rfcomm.h" #include "classic/sdp_util.h" #include "hci_cmd.h" #include "btstack_run_loop.h" diff --git a/tool/migration_to_v1.0/migration.sed b/tool/migration_to_v1.0/migration.sed index 873a76d30..f42fe547d 100644 --- a/tool/migration_to_v1.0/migration.sed +++ b/tool/migration_to_v1.0/migration.sed @@ -115,7 +115,7 @@ s|"rfcomm.h"|"classic/rfcomm.h"|g s|"sdp.h"|"classic/sdp_server.h"|g s|#include "sdp_client.h"|#include "classic/sdp_client.h"|g s|"sdp_parser.h"|"classic/sdp_client.h"|g -s|"sdp_query_rfcomm.h"|"classic/sdp_query_rfcomm.h"|g +s|"sdp_client_query_rfcomm.h"|"classic/sdp_client_query_rfcomm.h"|g s|#include "sdp_query_util.h"|// sdp_query_util doens not exist anymore|g s||"hal_led.h"|g s||"hci_cmd.h"|g