mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-29 21:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

sdp_util: extract sdp_create_spp_service into spp_server and use spp_create_sdp_record

Browse Source
This commit is contained in:
Matthias Ringwald 2016-03-17 11:24:38 +01:00
parent 03f88d00fa
commit efda0b48f9
53 changed files with 83 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manual/docs/profiles.md
View File

@ -194,7 +194,7 @@ specific RFCOMM channel number as explained in section on
[RFCOMM service](protocols/#sec:rfcommServiceProtocols). Then, you need to create
an SDP record for it and publish it with the SDP server by calling
*sdp_register_service*. BTstack provides the
*sdp_create_spp_service* function in that requires an empty buffer of
*spp_create_sdp_record* function in that requires an empty buffer of
approximately 200 bytes, the service channel number, and a service name.
Have a look at the [SPP Counter example](examples/generated/#sec:sppcounterExample].

2
doc/manual/docs/protocols.md
View File

@ -596,7 +596,7 @@ that are stored in a Data Element Sequence (DES). The Attribute ID is a
strings or can itselff contain other DES.
To create an SDP record for an SPP service, you can call
*sdp_create_spp_service* from with a pointer to a buffer to store the
*spp_create_sdp_record* from with a pointer to a buffer to store the
record, the server channel number, and a record name.
For other types of records, you can use the other functions in , using

2
doc/manual/update_apis.py
View File

@ -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_client_query_rfcomm.h", "SDP RFCOMM Query", "sdpQueries"],
["src/classic/sdp_client_rfcomm.h", "SDP RFCOMM Query", "sdpQueries"],
["src/classic/sdp_server.h", "SDP Server", "sdpSrv"],
["src/classic/sdp_util.h","SDP Utils", "sdpUtil"],

3
example/Makefile.inc
View File

@ -23,13 +23,14 @@ COMMON += \
l2cap_signaling.c \
btstack_link_key_db_memory.c \
sdp_util.c \
spp_server.c \
rfcomm.c \
bnep.c \
sdp_server.c \
SDP_CLIENT += \
sdp_client.o \
sdp_client_query_rfcomm.o \
sdp_client_rfcomm.o \
ATT += \
att_dispatch.c \

2
example/sdp_general_query.c
View File

@ -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_client_query_rfcomm.c*
* similar to the way XML files are parsed by a SAX parser. Have a look at *src/sdp_client_rfcomm.c*
* which retrieves the RFCOMM channel number and the service name.
*/

2
example/sdp_rfcomm_query.c
View File

@ -56,7 +56,7 @@
#include "btstack_memory.h"
#include "hci_dump.h"
#include "l2cap.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_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);

2
example/spp_and_le_counter.c
View File

@ -257,7 +257,7 @@ int btstack_main(void)
// init SDP, create record for SPP and register with SDP
sdp_init();
memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
sdp_create_spp_service(spp_service_buffer, 0x10001, RFCOMM_SERVER_CHANNEL, "SPP Counter");
spp_create_sdp_record(spp_service_buffer, 0x10001, RFCOMM_SERVER_CHANNEL, "SPP Counter");
sdp_register_service(spp_service_buffer);
printf("SDP service record size: %u\n", de_get_len(spp_service_buffer));

4
example/spp_counter.c
View File

@ -69,7 +69,7 @@ static btstack_packet_callback_registration_t hci_event_callback_registration;
* RFCOMM_SERVER_CHANNEL, an SDP record is created and registered with the SDP server.
* Example code for SPP service setup is
* provided in Listing SPPSetup. The SDP record created by function
* sdp_create_spp_service consists of a basic SPP definition that uses the provided
* spp_create_sdp_record consists of a basic SPP definition that uses the provided
* RFCOMM channel ID and service name. For more details, please have a look at it
* in \path{src/sdp_util.c}.
* The SDP record is created on the fly in RAM and is deterministic.
@ -91,7 +91,7 @@ static void spp_service_setup(void){
// init SDP, create record for SPP and register with SDP
sdp_init();
memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
sdp_create_spp_service(spp_service_buffer, 0x10001, RFCOMM_SERVER_CHANNEL, "SPP Counter");
spp_create_sdp_record(spp_service_buffer, 0x10001, RFCOMM_SERVER_CHANNEL, "SPP Counter");
sdp_register_service(spp_service_buffer);
printf("SDP service record size: %u\n", de_get_len(spp_service_buffer));
}

2
example/spp_flowcontrol.c
View File

@ -88,7 +88,7 @@ static void spp_service_setup(void){
// init SDP, create record for SPP and register with SDP
sdp_init();
memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
sdp_create_spp_service(spp_service_buffer, 0x10001, 1, "SPP Counter");
spp_create_sdp_record(spp_service_buffer, 0x10001, 1, "SPP Counter");
sdp_register_service(spp_service_buffer);
printf("SDP service buffer size: %u\n\r", (uint16_t) de_get_len(spp_service_buffer));
}

2
example/spp_streamer.c
View File

@ -56,7 +56,7 @@
#include "btstack_memory.h"
#include "hci_dump.h"
#include "l2cap.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/rfcomm.h"
#include "btstack_event.h"

2
platform/daemon/example/rfcomm_echo.c
View File

@ -102,7 +102,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
case RFCOMM_EVENT_SERVICE_REGISTERED:
printf("RFCOMM_EVENT_SERVICE_REGISTERED channel: %u, status: 0x%02x\n", packet[3], packet[2]);
// register SDP for our SPP
sdp_create_spp_service((uint8_t*)service_buffer, 0x10001, rfcomm_channel_nr, "SPP ECHO");
spp_create_sdp_record((uint8_t*)service_buffer, 0x10001, rfcomm_channel_nr, "SPP ECHO");
bt_send_cmd(&sdp_register_service_record_cmd, service_buffer);
bt_send_cmd(&btstack_set_discoverable, 1);
break;

2
platform/daemon/example/rfcomm_test.c
View File

@ -118,7 +118,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
printf("RFCOMM_EVENT_SERVICE_REGISTERED\n");
rfcomm_channel_nr = packet[3];
// register SDP for our SPP
sdp_create_spp_service((uint8_t*) spp_service_buffer, 0x10001, rfcomm_channel_nr, "RFCOMM Test");
spp_create_sdp_record((uint8_t*) spp_service_buffer, 0x10001, rfcomm_channel_nr, "RFCOMM Test");
bt_send_cmd(&sdp_register_service_record_cmd, spp_service_buffer);
bt_send_cmd(&btstack_set_discoverable, 1);
break;

2
platform/daemon/src/daemon.c
View File

@ -68,7 +68,7 @@
#include "classic/rfcomm.h"
#include "classic/sdp_server.h"
#include "classic/sdp_client.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "hci.h"
#include "hci_cmd.h"
#include "hci_dump.h"

2
port/daemon/src/Makefile.in
View File

@ -50,7 +50,7 @@ BTdaemon_SOURCES = \
bnep.c \
sdp_server.c \
sdp_client.c \
sdp_client_query_rfcomm.c \
sdp_client_rfcomm.c \
att_dispatch.c \
gatt_client.c \
att_db.c \

2
port/ez430-rf2560/Makefile
View File

@ -65,7 +65,7 @@ SPP = \
SDP_CLIENT += \
sdp_client.o \
sdp_client_query_rfcomm.o \
sdp_client_rfcomm.o \
BLE = \
att_db.c \

2
port/ez430-rf2560/example/ant_test.c
View File

@ -232,7 +232,7 @@ int btstack_main(int argc, const char * argv[]){
// init SDP, create record for SPP and register with SDP
sdp_init();
memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
sdp_create_spp_service( (uint8_t*) spp_service_buffer, 1, "SPP Counter");
spp_create_sdp_record( (uint8_t*) spp_service_buffer, 1, "SPP Counter");
printf("SDP service buffer size: %u\n\r", (uint16_t) (de_get_len((uint8_t*) spp_service_buffer)));
sdp_register_service(service_record_item);

2
port/ez430-rf2560/example/spp_accel.c
View File

@ -219,7 +219,7 @@ int btstack_main(int argc, const char * argv[]){
// init SDP, create record for SPP and register with SDP
sdp_init();
memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
sdp_create_spp_service((uint8_t*) spp_service_buffer, 1, "SPP Accel");
spp_create_sdp_record((uint8_t*) spp_service_buffer, 1, "SPP Accel");
printf("SDP service buffer size: %u\n\r", (uint16_t) de_get_len((uint8_t*) spp_service_buffer));
sdp_register_service((uint8_t*) spp_service_buffer);

2
port/ios/src/Makefile
View File

@ -50,7 +50,7 @@ BTdaemon_FILES = \
SpringBoardAccess.c \
rfcomm_service_db_cocoa.m \
sdp_client.c \
sdp_client_query_rfcomm.c \
sdp_client_rfcomm.c \
BTdaemon_CFLAGS = \
-I$(BTSTACK_ROOT)/src \

2
port/msp-exp430f5438-cc2564b/Makefile
View File

@ -65,7 +65,7 @@ SPP = \
SDP_CLIENT += \
sdp_client.o \
sdp_client_query_rfcomm.o \
sdp_client_rfcomm.o \
BLE = \
att_db.c \

2
port/msp-exp430f5438-cc2564b/example/ant_test.c
View File

@ -231,7 +231,7 @@ int btstack_main(int argc, const char * argv[]){
// init SDP, create record for SPP and register with SDP
sdp_init();
memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
sdp_create_spp_service( (uint8_t*) spp_service_buffer, 0x10001, 1, "SPP Counter");
spp_create_sdp_record( (uint8_t*) spp_service_buffer, 0x10001, 1, "SPP Counter");
printf("SDP service buffer size: %u\n\r", (uint16_t) de_get_len((uint8_t*) spp_service_buffer));
sdp_register_service(spp_service_buffer);

2
port/msp-exp430f5438-cc2564b/example/spp_accel.c
View File

@ -220,7 +220,7 @@ int btstack_main(int argc, const char * argv[]){
// init SDP, create record for SPP and register with SDP
sdp_init();
memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
sdp_create_spp_service( (uint8_t*) spp_service_buffer, 0x10001, 1, "SPP Accel");
spp_create_sdp_record( (uint8_t*) spp_service_buffer, 0x10001, 1, "SPP Accel");
printf("SDP service buffer size: %u\n\r", (uint16_t) de_get_len((uint8_t*) spp_service_buffer));
sdp_register_service(spp_service_buffer);

2
port/msp430f5229lp-cc2564b/Makefile
View File

@ -67,7 +67,7 @@ SPP = \
SDP_CLIENT += \
sdp_client.o \
sdp_client_query_rfcomm.o \
sdp_client_rfcomm.o \
BLE = \
att_db.c \

2
port/mtk/Makefile
View File

@ -55,7 +55,7 @@ BTdaemon_OBJS = $(libBTstack_OBJS) \
att_db.o \
att_server.o \
sdp_client.o \
sdp_client_query_rfcomm.o \
sdp_client_rfcomm.o \
all: $(TOOLCHAIN) version BTstackDaemon libBTstack.so BTstackDaemonRespawn inquiry le_scan rfcomm_echo dist

26
port/pic32-harmony/app.X/nbproject/Makefile-default.mk
View File

@ -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_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
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_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_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
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_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_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_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
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_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_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
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_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_client_query_rfcomm.o: ../../../src/classic/sdp_client_query_rfcomm.c nbproject/Makefile-${CND_CONF}.mk
${OBJECTDIR}/_ext/1386327864/sdp_client_rfcomm.o: ../../../src/classic/sdp_client_rfcomm.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1386327864"
@${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
@${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client_rfcomm.o.d
@${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client_rfcomm.o
@${FIXDEPS} "${OBJECTDIR}/_ext/1386327864/sdp_client_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_rfcomm.o.d" -o ${OBJECTDIR}/_ext/1386327864/sdp_client_rfcomm.o ../../../src/classic/sdp_client_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_client_query_rfcomm.o: ../../../src/classic/sdp_client_query_rfcomm.c nbproject/Makefile-${CND_CONF}.mk
${OBJECTDIR}/_ext/1386327864/sdp_client_rfcomm.o: ../../../src/classic/sdp_client_rfcomm.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1386327864"
@${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
@${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client_rfcomm.o.d
@${RM} ${OBJECTDIR}/_ext/1386327864/sdp_client_rfcomm.o
@${FIXDEPS} "${OBJECTDIR}/_ext/1386327864/sdp_client_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_rfcomm.o.d" -o ${OBJECTDIR}/_ext/1386327864/sdp_client_rfcomm.o ../../../src/classic/sdp_client_rfcomm.c
${OBJECTDIR}/_ext/1386327864/sdp_util.o: ../../../src/classic/sdp_util.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/_ext/1386327864"

4
port/pic32-harmony/app.X/nbproject/configurations.xml
View File

@ -34,7 +34,7 @@
<itemPath>../../../src/classic/rfcomm.h</itemPath>
<itemPath>../../../src/classic/sdp_server.h</itemPath>
<itemPath>../../../src/classic/sdp_client.h</itemPath>
<itemPath>../../../src/classic/sdp_client_query_rfcomm.h</itemPath>
<itemPath>../../../src/classic/sdp_client_rfcomm.h</itemPath>
</logicalFolder>
<logicalFolder name="embedded" displayName="embedded" projectFiles="true">
<itemPath>../../../platform/embedded/hal_cpu.h</itemPath>
@ -130,7 +130,7 @@
<itemPath>../../../src/btstack_run_loop.c</itemPath>
<itemPath>../../../src/classic/sdp_server.c</itemPath>
<itemPath>../../../src/classic/sdp_client.c</itemPath>
<itemPath>../../../src/classic/sdp_client_query_rfcomm.c</itemPath>
<itemPath>../../../src/classic/sdp_client_rfcomm.c</itemPath>
<itemPath>../../../src/classic/sdp_util.c</itemPath>
<itemPath>../../../src/btstack_util.c</itemPath>
<itemPath>../../../platform/embedded/btstack_run_loop_embedded.c</itemPath>

2
port/stm32-f103rb-nucleo/Makefile
View File

@ -28,7 +28,7 @@ COMMON = \
btstack_chipset_cc256x.c \
btstack_link_key_db_memory.c \
rfcomm.c \
sdp_client_query_rfcomm.c \
sdp_client_rfcomm.c \
btstack_util.c \
hci.c \
hci_cmd.c \

2
port/wiced/wiced.mk
View File

@ -22,7 +22,7 @@ $(NAME)_SOURCES += \
../../src/classic/rfcomm.c \
../../src/classic/sdp_server.c \
../../src/classic/sdp_client.c \
../../src/classic/sdp_client_query_rfcomm.c \
../../src/classic/sdp_client_rfcomm.c \
../../src/classic/sdp_util.c \
../../src/btstack_linked_list.c \
../../src/btstack_memory.c \

7
src/btstack.h
View File

@ -79,18 +79,19 @@
// #ifdef HAVE_CLASSIC
#include "classic/bnep.h"
#include "classic/btstack_link_key_db.h"
#include "classic/hfp.h"
#include "classic/hfp_ag.h"
#include "classic/hfp_hf.h"
#include "classic/hsp_ag.h"
#include "classic/hsp_hs.h"
#include "classic/pan.h"
#include "classic/btstack_link_key_db.h"
#include "classic/rfcomm.h"
#include "classic/sdp_server.h"
#include "classic/sdp_client.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/sdp_server.h"
#include "classic/sdp_util.h"
#include "classic/spp_server.h"
// #endif
#endif // __BTSTACK_H

2
src/classic/hfp.c
View File

@ -57,7 +57,7 @@
#include "hci_dump.h"
#include "l2cap.h"
#include "btstack_debug.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/sdp_server.h"
#include "classic/sdp_util.h"
#include "btstack_event.h"

2
src/classic/hfp.h
View File

@ -46,7 +46,7 @@
#define __BTSTACK_HFP_H
#include "hci.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#if defined __cplusplus
extern "C" {

2
src/classic/hfp_ag.c
View File

@ -59,7 +59,7 @@
#include "classic/hfp.h"
#include "classic/hfp_ag.h"
#include "classic/hfp_gsm_model.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/sdp_server.h"
#include "classic/sdp_util.h"

2
src/classic/hfp_ag.h
View File

@ -46,7 +46,7 @@
#define btstack_hfp_ag_h
#include "hci.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/hfp.h"
#include "classic/hfp_gsm_model.h"

2
src/classic/hfp_gsm_model.c
View File

@ -52,7 +52,7 @@
#include "classic/hfp.h"
#include "classic/hfp_gsm_model.h"
#include "classic/sdp_server.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "btstack_debug.h"
#include "hci.h"
#include "hci_cmd.h"

2
src/classic/hfp_gsm_model.h
View File

@ -46,7 +46,7 @@
#define BTSTACK_HFP_GSM_MODEL_H
#include "hci.h"
#include "sdp_client_query_rfcomm.h"
#include "sdp_client_rfcomm.h"
#include "hfp.h"
#if defined __cplusplus

2
src/classic/hfp_hf.c
View File

@ -55,7 +55,7 @@
#include "btstack_memory.h"
#include "hci_dump.h"
#include "l2cap.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/sdp_server.h"
#include "classic/sdp_util.h"
#include "btstack_debug.h"

2
src/classic/hfp_hf.h
View File

@ -46,7 +46,7 @@
#define __BTSTACK_HFP_HF_H
#include "hci.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/hfp.h"
#if defined __cplusplus

2
src/classic/hsp_ag.c
View File

@ -53,7 +53,7 @@
#include "btstack_memory.h"
#include "btstack_run_loop.h"
#include "classic/sdp_server.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/sdp_util.h"
#include "hci.h"
#include "hci_cmd.h"

2
src/classic/hsp_ag.h
View File

@ -46,7 +46,7 @@
#define btstack_hsp_ag_h
#include "hci.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#if defined __cplusplus
extern "C" {

2
src/classic/hsp_hs.c
View File

@ -53,7 +53,7 @@
#include "btstack_memory.h"
#include "btstack_run_loop.h"
#include "classic/sdp_server.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/sdp_util.h"
#include "hci.h"
#include "hci_cmd.h"

2
src/classic/hsp_hs.h
View File

@ -46,7 +46,7 @@
#define btstack_hsp_hs_h
#include "hci.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#if defined __cplusplus
extern "C" {

8
src/classic/sdp_client_query_rfcomm.c → src/classic/sdp_client_rfcomm.c
View File

@ -47,7 +47,7 @@
#include "btstack_debug.h"
#include "btstack_event.h"
#include "classic/sdp_client.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/sdp_util.h"
#include "hci_cmd.h"
@ -99,7 +99,7 @@ static void sdp_rfcomm_query_emit_service(void){
}
static void sdp_client_query_rfcomm_emit_busy(btstack_packet_handler_t callback){
log_error("sdp_query_rfcomm initiated when not ready");
log_error("sdp_client_query_rfcomm started when not ready");
uint8_t event[] = { SDP_EVENT_QUERY_COMPLETE, 1, SDP_QUERY_BUSY};
(*callback)(HCI_EVENT_PACKET, 0, event, sizeof(event));
}
@ -303,7 +303,7 @@ void sdp_client_query_rfcomm_init(void){
// Public API
void sdp_client_query_rfcomm_channel_and_name_for_search_pattern(btstack_packet_handler_t callback, bd_addr_t remote, uint8_t * serviceSearchPattern){
if (!sdp_client_query_rfcomm_ready()){
if (!sdp_client_ready()){
sdp_client_query_rfcomm_emit_busy(callback);
return;
}
@ -313,7 +313,7 @@ void sdp_client_query_rfcomm_channel_and_name_for_search_pattern(btstack_packet_
}
void sdp_client_query_rfcomm_channel_and_name_for_uuid(btstack_packet_handler_t callback, bd_addr_t remote, uint16_t uuid){
if (!sdp_client_query_rfcomm_ready()){
if (!sdp_client_ready()){
sdp_client_query_rfcomm_emit_busy(callback);
return;
}

0
src/classic/sdp_client_query_rfcomm.h → src/classic/sdp_client_rfcomm.h
View File

72
src/classic/sdp_util.c
View File

@ -681,78 +681,6 @@ void de_dump_data_element(const uint8_t * record){
#endif
}
void sdp_create_spp_service(uint8_t *service, uint32_t service_record_handle, int service_id, const char *name){
uint8_t* attribute;
de_create_sequence(service);
// 0x0000 "Service Record Handle"
de_add_number(service, DE_UINT, DE_SIZE_16, SDP_ServiceRecordHandle);
de_add_number(service, DE_UINT, DE_SIZE_32, service_record_handle);
// 0x0001 "Service Class ID List"
de_add_number(service, DE_UINT, DE_SIZE_16, SDP_ServiceClassIDList);
attribute = de_push_sequence(service);
{
de_add_number(attribute, DE_UUID, DE_SIZE_16, 0x1101 );
}
de_pop_sequence(service, attribute);
// 0x0004 "Protocol Descriptor List"
de_add_number(service, DE_UINT, DE_SIZE_16, SDP_ProtocolDescriptorList);
attribute = de_push_sequence(service);
{
uint8_t* l2cpProtocol = de_push_sequence(attribute);
{
de_add_number(l2cpProtocol, DE_UUID, DE_SIZE_16, SDP_L2CAPProtocol);
}
de_pop_sequence(attribute, l2cpProtocol);
uint8_t* rfcomm = de_push_sequence(attribute);
{
de_add_number(rfcomm, DE_UUID, DE_SIZE_16, SDP_RFCOMMProtocol); // rfcomm_service
de_add_number(rfcomm, DE_UINT, DE_SIZE_8, service_id); // rfcomm channel
}
de_pop_sequence(attribute, rfcomm);
}
de_pop_sequence(service, attribute);
// 0x0005 "Public Browse Group"
de_add_number(service, DE_UINT, DE_SIZE_16, SDP_BrowseGroupList); // public browse group
attribute = de_push_sequence(service);
{
de_add_number(attribute, DE_UUID, DE_SIZE_16, 0x1002 );
}
de_pop_sequence(service, attribute);
// 0x0006
de_add_number(service, DE_UINT, DE_SIZE_16, SDP_LanguageBaseAttributeIDList);
attribute = de_push_sequence(service);
{
de_add_number(attribute, DE_UINT, DE_SIZE_16, 0x656e);
de_add_number(attribute, DE_UINT, DE_SIZE_16, 0x006a);
de_add_number(attribute, DE_UINT, DE_SIZE_16, 0x0100);
}
de_pop_sequence(service, attribute);
// 0x0009 "Bluetooth Profile Descriptor List"
de_add_number(service, DE_UINT, DE_SIZE_16, SDP_BluetoothProfileDescriptorList);
attribute = de_push_sequence(service);
{
uint8_t *sppProfile = de_push_sequence(attribute);
{
de_add_number(sppProfile, DE_UUID, DE_SIZE_16, 0x1101);
de_add_number(sppProfile, DE_UINT, DE_SIZE_16, 0x0102);
}
de_pop_sequence(attribute, sppProfile);
}
de_pop_sequence(service, attribute);
// 0x0100 "ServiceName"
de_add_number(service, DE_UINT, DE_SIZE_16, 0x0100);
de_add_data(service, DE_STRING, strlen(name), (uint8_t *) name);
}
uint8_t* sdp_service_search_pattern_for_uuid16(uint16_t uuid16){
big_endian_store_16(des_serviceSearchPattern, 3, uuid16);
return (uint8_t*)des_serviceSearchPattern;

2
src/classic/sdp_util.h
View File

@ -117,8 +117,6 @@ int sdp_filter_attributes_in_attributeIDList(uint8_t *record, uint8_t *att
int sdp_attribute_list_constains_id(uint8_t *attributeIDList, uint16_t attributeID);
int sdp_traversal_match_pattern(uint8_t * element, de_type_t attributeType, de_size_t size, void *my_context);
void sdp_create_spp_service(uint8_t *service, uint32_t service_record_handle, int service_id, const char *name);
/*
* @brief Returns service search pattern for given UUID-16
* @note Uses fixed buffer

2
test/hfp/Makefile
View File

@ -9,7 +9,7 @@ include ${BTSTACK_ROOT}/example/Makefile.inc
COMMON = \
sdp_server.c \
sdp_client_query_rfcomm.c \
sdp_client_rfcomm.c \
btstack_link_key_db_memory.c \
btstack_linked_list.c \
btstack_memory.c \

2
test/hfp/mock.c
View File

@ -48,7 +48,7 @@
#include "hci.h"
#include "hci_dump.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/rfcomm.h"
#include "classic/hfp_hf.h"

4
test/pts/classic_test.c
View File

@ -60,7 +60,7 @@
#include "l2cap.h"
#include "classic/rfcomm.h"
#include "classic/sdp_server.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "ble/sm.h"
#include "stdin_support.h"
@ -781,7 +781,7 @@ int btstack_main(int argc, const char * argv[]){
// init SDP, create record for SPP and register with SDP
sdp_init();
memset(spp_service_buffer, 0, sizeof(spp_service_buffer));
sdp_create_spp_service((uint8_t*) spp_service_buffer, 0x10001, RFCOMM_SERVER_CHANNEL, "SPP Counter");
spp_create_sdp_record((uint8_t*) spp_service_buffer, 0x10001, RFCOMM_SERVER_CHANNEL, "SPP Counter");
de_dump_data_element((uint8_t*) spp_service_buffer);
printf("SDP service record size: %u\n\r", de_get_len((uint8_t*)spp_service_buffer));
sdp_register_service((uint8_t*)spp_service_buffer);

2
test/pts/hfp_test.c
View File

@ -56,7 +56,7 @@
#include "btstack_memory.h"
#include "hci_dump.h"
#include "l2cap.h"
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
// static bd_addr_t remote = {0x04,0x0C,0xCE,0xE4,0x85,0xD3};
static bd_addr_t remote = {0x00, 0x21, 0x3C, 0xAC, 0xF7, 0x38};

2
test/pts/iopt.c
View File

@ -96,7 +96,7 @@ int btstack_main(int argc, const char * argv[]){
// Create and register SDP records
sdp_create_spp_service((uint8_t*) spp_service_buffer, 0x10001, 1, "SPP");
spp_create_sdp_record((uint8_t*) spp_service_buffer, 0x10001, 1, "SPP");
sdp_register_service((uint8_t*)spp_service_buffer);
uint16_t network_packet_types[] = { NETWORK_TYPE_IPv4, NETWORK_TYPE_ARP, 0}; // 0 as end of list

2
test/sdp_client/Makefile
View File

@ -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_client_query_rfcomm.c sdp_rfcomm_query.c
sdp_rfcomm_query: ${COMMON_OBJ} sdp_client_rfcomm.c sdp_rfcomm_query.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
general_sdp_query: ${COMMON_OBJ} general_sdp_query.c

4
test/sdp_client/sdp_rfcomm_query.c
View File

@ -12,7 +12,7 @@
#include <stdlib.h>
#include <string.h>
#include "classic/sdp_client_query_rfcomm.h"
#include "classic/sdp_client_rfcomm.h"
#include "classic/sdp_util.h"
#include "hci_cmd.h"
#include "btstack_run_loop.h"
@ -125,7 +125,7 @@ TEST(SDPClient, QueryRFCOMMWithSyntheticData){
de_create_sequence(spp_buffer);
for (i=0; i<record_nr; i++){
uint8_t * record_start = de_push_sequence(spp_buffer);
sdp_create_spp_service(record_start, 0x10001, expected_channel[i], expected_name[i]);
spp_create_sdp_record(record_start, 0x10001, expected_channel[i], expected_name[i]);
de_pop_sequence(spp_buffer, record_start);
}

4
tool/migration_to_v1.0/migration.cocci
View File

@ -202,9 +202,9 @@ type T;
@@
expression E1, E2, E3;
@@
- sdp_create_spp_service(E1, E2, E3)
- spp_create_sdp_record(E1, E2, E3)
+ // MIGRATION: using 0x10001 as Service Record Handle. Please fix if using multiple services
+ sdp_create_spp_service(E1, 0x10001, E2, E3)
+ spp_create_sdp_record(E1, 0x10001, E2, E3)
// SDP Server
@@

18
tool/migration_to_v1.0/migration.sed
View File

@ -71,6 +71,7 @@ s/bt_store_16/little_endian_store_16/g
s/bt_store_24/little_endian_store_24/g
s/bt_store_32/little_endian_store_32/g
s/hci_discoverable_control/gap_discoverable_control/g
s/hci_ssp_set_io_capability/gap_ssp_set_io_capability/g
s/le_central_connect/gap_connect/g
s/le_central_connect_cancel/gap_connect_cancel/g
s/le_central_set_scan_parameters/gap_set_scan_parameters/g
@ -88,11 +89,12 @@ s/READ_NET_32/big_endian_read_32/g
s/run_loop_add_timer/btstack_run_loop_add_timer/g
s/run_loop_get_time_ms/btstack_run_loop_get_time_ms/g
s/run_loop_set_timer/btstack_run_loop_set_timer/g
s/sdp_client_query_rfcomm_ready/sdp_client_ready/g
s/spp_create_sdp_record/spp_create_sdp_record/g
s/swap128/reverse_128/g
s/swap32/reverse_32/g
s/swap48/reverse_48/g
s/swap64/reverse_64/g
s/swap128/reverse_128/g
s/hci_ssp_set_io_capability/gap_ssp_set_io_capability/g
# Folder structure
s|/example/embedded|/example|g
@ -115,7 +117,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_client_query_rfcomm.h"|"classic/sdp_client_query_rfcomm.h"|g
s|"sdp_client_rfcomm.h"|"classic/sdp_client_rfcomm.h"|g
s|#include "sdp_query_util.h"|// sdp_query_util doens not exist anymore|g
s|<btstack/hal_led.h>|"hal_led.h"|g
s|<btstack/hci_cmds.h>|"hci_cmd.h"|g
@ -130,20 +132,20 @@ s|le_characteristic_t|gatt_client_characteristic_t|g
s|le_characteristic_descriptor_t|gatt_client_characteristic_descriptor_t|g
# File renames
s|debug.h|btstack_debug.h|g
s|ancs_client_lib|ancs_client|g
s|att\.c|att_db\.c|g
s|btstack-config.h|btstack_config.h|g
s|debug.h|btstack_debug.h|g
s|hci_cmds\.c|hci_cmd\.c|g
s|linked_list|btstack_linked_list|g
s|memory_pool|btstack_memory_pool|g
s|remote_device_db_memory|btstack_link_key_db_memory|g
s|run_loop\.c|btstack_run_loop\.c|g
s|timer_source_t|btstack_timer_source_t|g
s|sdp\.c|sdp_server\.c|g
s|utils|btstack_util|g
s|att\.c|att_db\.c|g
s|ancs_client_lib|ancs_client|g
s|sdp_parser.[c|o]||g
s|sdp_query_util.[c|o]||g
s|timer_source_t|btstack_timer_source_t|g
s|utils|btstack_util|g
# Makefile hacks: fix path to src/ble
s|/ble|/src/ble|g