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

fix paths after source reorg

Browse Source
This commit is contained in:
Matthias Ringwald 2015-11-13 15:04:41 +01:00
parent 40276177c4
commit 3edc84c5b6
154 changed files with 531 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binding/java/build.xml
View File

@ -17,7 +17,7 @@
<target name="generate"> <target name="generate">
<mkdir dir="${gen.dir}"/> <mkdir dir="${gen.dir}"/>
<exec executable="./../tools/generate.py"/> <exec executable="../../tool/generate.py"/>
</target> </target>
<target name="compile" depends="generate"> <target name="compile" depends="generate">

2
chipset/cc256x/ant_cmds.c
View File

@ -41,7 +41,7 @@
#include <string.h> #include <string.h>
#include "ant_cmds.h" #include "ant_cmds.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "btstack-config.h" #include "btstack-config.h"
#include "hci.h" #include "hci.h"

2
example/daemon/Makefile.in
View File

@ -1,7 +1,7 @@
BTSTACK_ROOT=../.. BTSTACK_ROOT=../..
CC = @CC@ CC = @CC@
LDFLAGS = @LDFLAGS@ -lBTstack -L../../src LDFLAGS = @LDFLAGS@ -lBTstack -L../../src
CFLAGS = @CFLAGS@ -I$(BTSTACK_ROOT)/platforms/daemon -I$(BTSTACK_ROOT)/include CFLAGS = @CFLAGS@ -I$(BTSTACK_ROOT)/platform/daemon -I$(BTSTACK_ROOT)/platform/daemon/src
prefix = @prefix@ prefix = @prefix@
all: test rfcomm-cat rfcomm-echo rfcomm-test inquiry l2cap-server l2cap-throughput le_scan all: test rfcomm-cat rfcomm-echo rfcomm-test inquiry l2cap-server l2cap-throughput le_scan

2
example/daemon/l2cap-server.c
View File

@ -48,7 +48,7 @@
#include "btstack.h" #include "btstack.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
int l2cap_reg_fail = 0; int l2cap_reg_fail = 0;

2
example/daemon/rfcomm-cat.c
View File

@ -54,7 +54,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "btstack.h" #include "btstack.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
// input from command line arguments // input from command line arguments
bd_addr_t addr = { }; bd_addr_t addr = { };

2
example/daemon/rfcomm-echo.c
View File

@ -50,7 +50,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "btstack.h" #include "btstack.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
// input from command line arguments // input from command line arguments
bd_addr_t addr = { }; bd_addr_t addr = { };

2
example/daemon/rfcomm-test.c
View File

@ -50,7 +50,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "btstack.h" #include "btstack.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#define NUM_ROWS 25 #define NUM_ROWS 25
#define NUM_COLS 80 #define NUM_COLS 80

24
example/embedded/Makefile.inc
View File

@ -1,11 +1,11 @@
VPATH += ${BTSTACK_ROOT}/src VPATH += ${BTSTACK_ROOT}/src
VPATH += ${BTSTACK_ROOT}/ble VPATH += ${BTSTACK_ROOT}/src/ble
VPATH += ${BTSTACK_ROOT}/src/classic
VPATH += ${BTSTACK_ROOT}/example/embedded VPATH += ${BTSTACK_ROOT}/example/embedded
CFLAGS += -I. CFLAGS += -I.
CFLAGS += -I${BTSTACK_ROOT}/ble CFLAGS += -I${BTSTACK_ROOT}/src/ble
CFLAGS += -I${BTSTACK_ROOT}/include CFLAGS += -I${BTSTACK_ROOT}/src/classic
CFLAGS += -I${BTSTACK_ROOT}/src CFLAGS += -I${BTSTACK_ROOT}/src
CORE += \ CORE += \
@ -95,19 +95,19 @@ PAN_OBJ = $(PAN:.c=.o)
default_target: all default_target: all
${BTSTACK_ROOT}/src/version.h: ${BTSTACK_ROOT}/src/version.h:
${BTSTACK_ROOT}/tools/get_version.sh ${BTSTACK_ROOT}/tool/get_version.sh
# compile .gatt descriptions # compile .gatt descriptions
profile.h: profile.gatt profile.h: profile.gatt
python ${BTSTACK_ROOT}/ble/compile-gatt.py $< $@ python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@
ancs_client.h: ancs_client.gatt ancs_client.h: ancs_client.gatt
python ${BTSTACK_ROOT}/ble/compile-gatt.py $< $@ python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@
spp_and_le_counter.h: spp_and_le_counter.gatt spp_and_le_counter.h: spp_and_le_counter.gatt
python ${BTSTACK_ROOT}/ble/compile-gatt.py $< $@ python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@
le_counter.h: le_counter.gatt le_counter.h: le_counter.gatt
python ${BTSTACK_ROOT}/ble/compile-gatt.py $< $@ python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@
le_streamer.h: le_streamer.gatt le_streamer.h: le_streamer.gatt
python ${BTSTACK_ROOT}/ble/compile-gatt.py $< $@ python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@
# examples # examples
sdp_rfcomm_query: ${CORE_OBJ} ${COMMON_OBJ} ${PAN_OBJ} ${SDP_CLIENT} sdp_rfcomm_query.c sdp_rfcomm_query: ${CORE_OBJ} ${COMMON_OBJ} ${PAN_OBJ} ${SDP_CLIENT} sdp_rfcomm_query.c
@ -155,7 +155,7 @@ gatt_browser: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_CLIENT_OBJ} ${SM_REAL_
gatt_battery_query: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_CLIENT_OBJ} ${SM_REAL_OBJ} gatt_battery_query.c gatt_battery_query: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_CLIENT_OBJ} ${SM_REAL_OBJ} gatt_battery_query.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@ ${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
ancs_client: ancs_client.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${GATT_CLIENT_OBJ} ${SM_REAL_OBJ} ${BTSTACK_ROOT}/ble/ancs_client_lib.c ancs_client.c ancs_client: ancs_client.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_SERVER_OBJ} ${GATT_CLIENT_OBJ} ${SM_REAL_OBJ} ancs_client_lib.c ancs_client.c
${CC} $(filter-out ancs_client.h,$^) ${CFLAGS} ${LDFLAGS} -o $@ ${CC} $(filter-out ancs_client.h,$^) ${CFLAGS} ${LDFLAGS} -o $@
led_counter: ${CORE_OBJ} ${COMMON_OBJ} led_counter.c led_counter: ${CORE_OBJ} ${COMMON_OBJ} led_counter.c
@ -173,6 +173,6 @@ clean:
rm -rf *.dSYM rm -rf *.dSYM
rm -rf ${BTSTACK_ROOT}/ble/*.o rm -rf ${BTSTACK_ROOT}/ble/*.o
rm -rf ${BTSTACK_ROOT}/src/*.o rm -rf ${BTSTACK_ROOT}/src/*.o
rm -rf ${BTSTACK_ROOT}/platforms/posix/src/*.o rm -rf ${BTSTACK_ROOT}/platform/posix/src/*.o

16
example/embedded/ancs_client.c
View File

@ -56,19 +56,17 @@
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci.h" #include "hci.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "att.h" #include "ble/ancs_client_lib.h"
#include "att_server.h" #include "ble/att.h"
#include "le_device_db.h" #include "ble/att_server.h"
#include "gap_le.h" #include "ble/gap_le.h"
#include "gatt_client.h" #include "ble/gatt_client.h"
#include "sm.h" #include "ble/le_device_db.h"
#include "ancs_client_lib.h" #include "ble/sm.h"
// ancs client profile // ancs client profile
#include "ancs_client.h" #include "ancs_client.h"

3
example/embedded/gap_inquiry.c
View File

@ -56,13 +56,14 @@
#include "btstack-config.h" #include "btstack-config.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h"
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci.h" #include "hci.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "classic/sdp_util.h"
#define MAX_DEVICES 10 #define MAX_DEVICES 10
enum DEVICE_STATE { REMOTE_NAME_REQUEST, REMOTE_NAME_INQUIRED, REMOTE_NAME_FETCHED }; enum DEVICE_STATE { REMOTE_NAME_REQUEST, REMOTE_NAME_INQUIRED, REMOTE_NAME_FETCHED };
struct device { struct device {

3
example/embedded/gap_inquiry_and_bond.c
View File

@ -49,7 +49,6 @@
#include "btstack-config.h" #include "btstack-config.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h"
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
@ -57,6 +56,8 @@
#include "hci_dump.h" #include "hci_dump.h"
#include "gap.h" #include "gap.h"
#include "classic/sdp_util.h"
#define MAX_DEVICES 10 #define MAX_DEVICES 10
enum DEVICE_STATE { BONDING_REQUEST, BONDING_REQUESTED, BONDING_COMPLETED }; enum DEVICE_STATE { BONDING_REQUEST, BONDING_REQUESTED, BONDING_COMPLETED };

2
example/embedded/gap_le_advertisements.c
View File

@ -54,7 +54,7 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci.h" #include "hci.h"
#include "ad_parser.h" #include "ble/ad_parser.h"
/* @section GAP LE setup for receiving advertisements /* @section GAP LE setup for receiving advertisements
* *

12
example/embedded/gatt_battery_query.c
View File

@ -48,20 +48,18 @@
#include "run_loop.h" #include "run_loop.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "utils.h" #include "utils.h"
#include "sdp_util.h"
#include "btstack-config.h" #include "btstack-config.h"
#include "ad_parser.h"
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci.h" #include "hci.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "att.h"
#include "gatt_client.h" #include "ble/att.h"
#include "sm.h" #include "ble/gatt_client.h"
#include "ble/ad_parser.h"
#include "ble/sm.h"
typedef struct advertising_report { typedef struct advertising_report {
uint8_t type; uint8_t type;

9
example/embedded/gatt_browser.c
View File

@ -58,20 +58,19 @@
#include "run_loop.h" #include "run_loop.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "utils.h" #include "utils.h"
#include "sdp_util.h"
#include "btstack-config.h" #include "btstack-config.h"
#include "ad_parser.h"
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci.h" #include "hci.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "att.h" #include "ble/att.h"
#include "gatt_client.h" #include "ble/gatt_client.h"
#include "sm.h" #include "ble/ad_parser.h"
#include "ble/sm.h"
typedef struct advertising_report { typedef struct advertising_report {
uint8_t type; uint8_t type;

12
example/embedded/le_counter.c
View File

@ -53,7 +53,7 @@
#include "btstack-config.h" #include "btstack-config.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
@ -64,11 +64,11 @@
#include "le_counter.h" #include "le_counter.h"
#include "att.h" #include "ble/att.h"
#include "att_server.h" #include "ble/att_server.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
#include "gap_le.h" #include "ble/gap_le.h"
#include "sm.h" #include "ble/sm.h"
#define HEARTBEAT_PERIOD_MS 1000 #define HEARTBEAT_PERIOD_MS 1000

12
example/embedded/le_streamer.c
View File

@ -57,7 +57,7 @@
#include "btstack-config.h" #include "btstack-config.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
@ -68,11 +68,11 @@
#include "le_streamer.h" #include "le_streamer.h"
#include "att.h" #include "ble/att.h"
#include "att_server.h" #include "ble/att_server.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
#include "gap_le.h" #include "ble/gap_le.h"
#include "sm.h" #include "ble/sm.h"
static int le_notification_enabled; static int le_notification_enabled;
static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size); static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);

8
example/embedded/panu_demo.c
View File

@ -83,15 +83,15 @@
#include "hci_cmds.h" #include "hci_cmds.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "hci.h" #include "hci.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_parser.h" #include "classic/sdp_parser.h"
#include "sdp_client.h" #include "classic/sdp_client.h"
#include "sdp_query_util.h" #include "classic/sdp_query_util.h"
#include "pan.h" #include "pan.h"
static int record_id = -1; static int record_id = -1;

8
example/embedded/sdp_bnep_query.c
View File

@ -53,15 +53,15 @@
#include "hci_cmds.h" #include "hci_cmds.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "hci.h" #include "hci.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_parser.h" #include "classic/sdp_parser.h"
#include "sdp_client.h" #include "classic/sdp_client.h"
#include "sdp_query_util.h" #include "classic/sdp_query_util.h"
#include "pan.h" #include "pan.h"
int record_id = -1; int record_id = -1;

8
example/embedded/sdp_general_query.c
View File

@ -50,9 +50,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "sdp_parser.h" #include "classic/sdp_parser.h"
#include "sdp_client.h" #include "classic/sdp_client.h"
#include "sdp_query_util.h" #include "classic/sdp_query_util.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "run_loop.h" #include "run_loop.h"
@ -61,7 +61,7 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_parser.h" #include "classic/sdp_parser.h"
int record_id = -1; int record_id = -1;
int attribute_id = -1; int attribute_id = -1;

2
example/embedded/sdp_rfcomm_query.c
View File

@ -56,7 +56,7 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
// static bd_addr_t remote = {0x04,0x0C,0xCE,0xE4,0x85,0xD3}; // static bd_addr_t remote = {0x04,0x0C,0xCE,0xE4,0x85,0xD3};
static bd_addr_t remote = {0x84, 0x38, 0x35, 0x65, 0xD1, 0x15}; static bd_addr_t remote = {0x84, 0x38, 0x35, 0x65, 0xD1, 0x15};

16
example/embedded/spp_and_le_counter.c
View File

@ -55,7 +55,7 @@
#include "btstack-config.h" #include "btstack-config.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
@ -64,16 +64,16 @@
#include "l2cap.h" #include "l2cap.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "spp_and_le_counter.h" #include "spp_and_le_counter.h"
#include "att.h" #include "ble/att.h"
#include "att_server.h" #include "ble/att_server.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
#include "gap_le.h" #include "ble/gap_le.h"
#include "sm.h" #include "ble/sm.h"
#define RFCOMM_SERVER_CHANNEL 1 #define RFCOMM_SERVER_CHANNEL 1
#define HEARTBEAT_PERIOD_MS 1000 #define HEARTBEAT_PERIOD_MS 1000

6
example/embedded/spp_counter.c
View File

@ -52,7 +52,7 @@
#include "btstack-config.h" #include "btstack-config.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
@ -61,9 +61,9 @@
#include "l2cap.h" #include "l2cap.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#define RFCOMM_SERVER_CHANNEL 1 #define RFCOMM_SERVER_CHANNEL 1
#define HEARTBEAT_PERIOD_MS 1000 #define HEARTBEAT_PERIOD_MS 1000

6
example/embedded/spp_flowcontrol.c
View File

@ -51,13 +51,13 @@
#include "hci_cmds.h" #include "hci_cmds.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "hci.h" #include "hci.h"
#include "l2cap.h" #include "l2cap.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "btstack-config.h" #include "btstack-config.h"
#define HEARTBEAT_PERIOD_MS 500 #define HEARTBEAT_PERIOD_MS 500

4
example/embedded/spp_streamer.c
View File

@ -56,8 +56,8 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
#define NUM_ROWS 25 #define NUM_ROWS 25
#define NUM_COLS 40 #define NUM_COLS 40

2
platform/cocoa/remote_device_db_cocoa.m
View File

@ -33,7 +33,7 @@
* Please inquire about commercial licensing options at btstack@ringwald.ch * Please inquire about commercial licensing options at btstack@ringwald.ch
* *
*/ */
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "debug.h" #include "debug.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>

2
platform/cocoa/run_loop_cocoa.m
View File

@ -40,8 +40,6 @@
* Created by Matthias Ringwald on 8/2/09. * Created by Matthias Ringwald on 8/2/09.
*/ */
#include "btstack.h"
#include "run_loop.h" #include "run_loop.h"
#include "run_loop_private.h" #include "run_loop_private.h"
#include "debug.h" #include "debug.h"

3
platform/posix/src/btstack.h → platform/daemon/src/btstack.h
View File

@ -69,9 +69,6 @@ extern "C" {
#define BTSTACK_UNIX "/tmp/BTstack" #define BTSTACK_UNIX "/tmp/BTstack"
#endif #endif
// packet handler
typedef void (*btstack_packet_handler_t) (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
// optional: if called before bt_open, TCP socket is used instead of local unix socket // optional: if called before bt_open, TCP socket is used instead of local unix socket
// note: address is not copied and must be valid during bt_open // note: address is not copied and must be valid during bt_open
void bt_use_tcp(const char * address, uint16_t port); void bt_use_tcp(const char * address, uint16_t port);

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

@ -66,30 +66,30 @@
#include "hci_dump.h" #include "hci_dump.h"
#include "hci_transport.h" #include "hci_transport.h"
#include "l2cap.h" #include "l2cap.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "sdp_parser.h" #include "classic/sdp_parser.h"
#include "sdp_client.h" #include "classic/sdp_client.h"
#include "sdp_query_util.h" #include "classic/sdp_query_util.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
#include "socket_connection.h" #include "socket_connection.h"
#ifdef HAVE_BLE #ifdef HAVE_BLE
#include "gatt_client.h" #include "ble/gatt_client.h"
#include "att_server.h" #include "ble/att_server.h"
#include "att.h" #include "ble/att.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
#include "sm.h" #include "ble/sm.h"
#endif #endif
#ifdef USE_BLUETOOL #ifdef USE_BLUETOOL
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include "../platforms/ios/src/bt_control_iphone.h" #include "../port/ios/src/bt_control_iphone.h"
#include <notify.h> #include <notify.h>
#endif #endif
#ifdef USE_SPRINGBOARD #ifdef USE_SPRINGBOARD
#include "../platforms/ios/src/platform_iphone.h" #include "../port/ios/src/platform_iphone.h"
#endif #endif
#ifndef BTSTACK_LOG_FILE #ifndef BTSTACK_LOG_FILE

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

@ -85,7 +85,7 @@ struct sockaddr_un {
#endif #endif
#ifdef USE_LAUNCHD #ifdef USE_LAUNCHD
#include "../platforms/ios/3rdparty/launch.h" #include "../port/ios/3rdparty/launch.h"
#endif #endif
#define MAX_PENDING_CONNECTIONS 10 #define MAX_PENDING_CONNECTIONS 10

2
platform/posix/src/remote_device_db_fs.c
View File

@ -40,7 +40,7 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "debug.h" #include "debug.h"
#include "utils.h" #include "utils.h"

8
platform/Makefile → port/Makefile
View File

@ -1,5 +1,6 @@
# Makefile to build example code for all platforms but iOS (iOS requires double Xcode installation) # Makefile to build example code for all platforms but
# - iOS (iOS requires double Xcode installation)
# Intended for Continous Integration # Intended for Continous Integration
# #
# Requires: # Requires:
@ -11,18 +12,17 @@
SUBDIRS = \ SUBDIRS = \
arduino \ arduino \
daemon \
ez430-rf2560 \ ez430-rf2560 \
libusb \ libusb \
msp-exp430f5438-cc2564b \ msp-exp430f5438-cc2564b \
msp430f5229lp-cc2564b \ msp430f5229lp-cc2564b \
mtk \ mtk \
pic32-harmony/app.X \
posix-stlc2500d \ posix-stlc2500d \
posix-wl183x \ posix-wl183x \
stm32-f103rb-nucleo \ stm32-f103rb-nucleo \
EXCLUDED = \ EXCLUDED = \
pic32-harmony/app.X \
ios \ ios \
subdirs: subdirs:
@ -30,3 +30,5 @@ subdirs:
for dir in $(SUBDIRS); do \ for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir; \ $(MAKE) -C $$dir; \
done done
echo Building daemon
cd daemon ; ./bootstrap.sh ; make

14
port/arduino/BTstack.cpp
View File

@ -21,19 +21,19 @@
#include "hci_cmds.h" #include "hci_cmds.h"
#include "utils.h" #include "utils.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "bt_control_em9301.h" #include "bt_control_em9301.h"
#include "hci.h" #include "hci.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "ad_parser.h" #include "ble/ad_parser.h"
#include "att.h" #include "ble/att.h"
#include "att_server.h" #include "ble/att_server.h"
#include "att_db_util.h" #include "att_db_util.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
#include "sm.h" #include "ble/sm.h"
#include "gap_le.h" #include "ble/gap_le.h"
#include "debug.h" #include "debug.h"
// Pin 13 has an LED connected on most Arduino boards. // Pin 13 has an LED connected on most Arduino boards.

4
port/arduino/BTstack.h
View File

@ -3,9 +3,9 @@
*/ */
#pragma once #pragma once
#include "att.h" #include "ble/att.h"
#include "utils.h" #include "utils.h"
#include "gatt_client.h" #include "ble/gatt_client.h"
#include "hci.h" #include "hci.h"
#include <stdint.h> #include <stdint.h>

18
port/arduino/Makefile
View File

@ -9,19 +9,21 @@ VERSION=`sed -n -e 's/^.*BTSTACK_VERSION \"\(.*\)\"/\1/p' ${BTSTACK_ROOT}/src/ve
BTSTACK_PACKAGE=/tmp/btstack BTSTACK_PACKAGE=/tmp/btstack
ARCHIVE=btstack-arduino-${VERSION}.zip ARCHIVE=btstack-arduino-${VERSION}.zip
SRC_FILES =btstack_memory.c linked_list.c memory_pool.c run_loop.c run_loop_embedded.c SRC_FILES = btstack_memory.c linked_list.c memory_pool.c run_loop.c
SRC_FILES +=hci_dump.c hci.c hci_cmds.c hci_transport_h4_dma.c sdp_util.c utils.c SRC_FILES += hci_dump.c hci.c hci_cmds.c utils.c l2cap.c
BLE_FILES = ad_parser.c att.c att_server.c att_dispatch.c att_db_util.c le_device_db_memory.c gatt_client.c BLE_FILES = ad_parser.c att.c att_server.c att_dispatch.c att_db_util.c le_device_db_memory.c gatt_client.c
BLE_FILES += sm.c l2cap_le.c ancs_client_lib.h ancs_client_lib.c BLE_FILES += sm.c ancs_client_lib.h ancs_client_lib.c
PORT_FILES = btstack-config.h bsp_arduino_em9301.cpp BTstack.cpp BTstack.h PORT_FILES = btstack-config.h bsp_arduino_em9301.cpp BTstack.cpp BTstack.h
EMBEDDED_FILES = run_loop_embedded.c hci_transport_h4_dma.c
PATHS = $(addprefix ${BTSTACK_ROOT}/src/, ${SRC_FILES}) PATHS = $(addprefix ${BTSTACK_ROOT}/src/, ${SRC_FILES})
PATHS += $(wildcard ${BTSTACK_ROOT}/src/*.h) PATHS += $(wildcard ${BTSTACK_ROOT}/src/*.h)
PATHS += $(addprefix ${BTSTACK_ROOT}/ble/, ${BLE_FILES}) PATHS += $(addprefix ${BTSTACK_ROOT}/src/ble/, ${BLE_FILES})
PATHS += $(wildcard ${BTSTACK_ROOT}/ble/*.h) PATHS += $(wildcard ${BTSTACK_ROOT}/src/ble/*.h)
PATHS += $(addprefix ${BTSTACK_ROOT}/platform/embedded/, ${EMBEDDED_FILES})
PATHS += $(wildcard ${BTSTACK_ROOT}/platform/embedded/*.h)
PATHS += $(wildcard ${BTSTACK_ROOT}/chipset/em9301/*) PATHS += $(wildcard ${BTSTACK_ROOT}/chipset/em9301/*)
PATHS += ${BTSTACK_ROOT}/include/btstack PATHS += ${BTSTACK_ROOT}/port/arduino/examples
PATHS += ${BTSTACK_ROOT}/platforms/arduino/examples
PATHS += $(addprefix ${DIR}/, ${PORT_FILES}) PATHS += $(addprefix ${DIR}/, ${PORT_FILES})
ARDUINO_LIBS=~/Documents/arduino/libraries/BTstack ARDUINO_LIBS=~/Documents/arduino/libraries/BTstack
@ -32,7 +34,7 @@ clean:
rm -rf ${BTSTACK_PACKAGE} rm -rf ${BTSTACK_PACKAGE}
update_version: update_version:
${BTSTACK_ROOT}/tools/get_version.sh ${BTSTACK_ROOT}/tool/get_version.sh
install: update_version install: update_version
rm -rf ${ARDUINO_LIBS} rm -rf ${ARDUINO_LIBS}

6
port/arduino/examples/ANCS/ANCS.ino
View File

@ -1,9 +1,9 @@
#include <BTstack.h> #include <BTstack.h>
#include <stdio.h> #include <stdio.h>
#include "att_server.h" #include "ble/att_server.h"
#include "gatt_client.h" #include "ble/gatt_client.h"
#include "ancs_client_lib.h" #include "ancs_client_lib.h"
#include "sm.h" #include "ble/sm.h"
#include <SPI.h> #include <SPI.h>
/* /*

0
platform/daemon/.gitignore → port/daemon/.gitignore vendored
View File

0
platform/daemon/Makefile.am → port/daemon/Makefile.am
View File

0
platform/daemon/bootstrap.sh → port/daemon/bootstrap.sh
View File

0
platform/daemon/configure.ac → port/daemon/configure.ac
View File

0
platform/daemon/example/.gitignore → port/daemon/example/.gitignore vendored
View File

5
platform/daemon/example/Makefile.in → port/daemon/example/Makefile.in
View File

@ -2,7 +2,10 @@ BTSTACK_ROOT=../../..
CC = @CC@ CC = @CC@
LDFLAGS = @LDFLAGS@ -lBTstack -L../src LDFLAGS = @LDFLAGS@ -lBTstack -L../src
CFLAGS = @CFLAGS@ -I$(BTSTACK_ROOT)/platforms/daemon -I$(BTSTACK_ROOT)/include CFLAGS = @CFLAGS@ \
-I$(BTSTACK_ROOT)/platform/daemon/src \
-I$(BTSTACK_ROOT)/src \
-I..
prefix = @prefix@ prefix = @prefix@
VPATH += ${BTSTACK_ROOT}/example/daemon VPATH += ${BTSTACK_ROOT}/example/daemon

0
platform/daemon/m4/pkg.m4 → port/daemon/m4/pkg.m4
View File

16
platform/daemon/src/Makefile.in → port/daemon/src/Makefile.in
View File

@ -4,17 +4,21 @@ prefix = @prefix@
CC = @CC@ CC = @CC@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
CFLAGS = @CFLAGS@ -I.. -I $(BTSTACK_ROOT)/include -I$(BTSTACK_ROOT)/platforms/src/daemon -I $(BTSTACK_ROOT)/ble -I $(BTSTACK_ROOT)/src -I $(BTSTACK_ROOT) CFLAGS = @CFLAGS@ \
-I $(BTSTACK_ROOT)/platform/src/daemon \
-I $(BTSTACK_ROOT)/src \
-I..
BTSTACK_LIB_LDFLAGS = @BTSTACK_LIB_LDFLAGS@ BTSTACK_LIB_LDFLAGS = @BTSTACK_LIB_LDFLAGS@
BTSTACK_LIB_EXTENSION = @BTSTACK_LIB_EXTENSION@ BTSTACK_LIB_EXTENSION = @BTSTACK_LIB_EXTENSION@
LIBUSB_CFLAGS = @LIBUSB_CFLAGS@ LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@ LIBUSB_LDFLAGS = @LIBUSB_LDFLAGS@
VPATH += ${BTSTACK_ROOT}/platforms/daemon/src VPATH += ${BTSTACK_ROOT}/platform/daemon/src
VPATH += ${BTSTACK_ROOT}/platforms/posix/src VPATH += ${BTSTACK_ROOT}/platform/posix/src
VPATH += ${BTSTACK_ROOT}/platforms/cocoa VPATH += ${BTSTACK_ROOT}/platform/cocoa
VPATH += ${BTSTACK_ROOT}/src VPATH += ${BTSTACK_ROOT}/src
VPATH += ${BTSTACK_ROOT}/ble VPATH += ${BTSTACK_ROOT}/src/ble
VPATH += ${BTSTACK_ROOT}/src/classic
remote_device_db_sources = @REMOTE_DEVICE_DB_SOURCES@ remote_device_db_sources = @REMOTE_DEVICE_DB_SOURCES@
run_loop_sources = @RUN_LOOP_SOURCES@ run_loop_sources = @RUN_LOOP_SOURCES@
@ -64,7 +68,7 @@ BTdaemon_SOURCES = \
all: libBTstack.$(BTSTACK_LIB_EXTENSION) BTdaemon all: libBTstack.$(BTSTACK_LIB_EXTENSION) BTdaemon
libBTstack.$(BTSTACK_LIB_EXTENSION): $(libBTstack_SOURCES) libBTstack.$(BTSTACK_LIB_EXTENSION): $(libBTstack_SOURCES)
$(BTSTACK_ROOT)/tools/get_version.sh $(BTSTACK_ROOT)/tool/get_version.sh
$(CC) $(CFLAGS) $(BTSTACK_LIB_LDFLAGS) -o $@ $^ $(LDFLAGS) $(CC) $(CFLAGS) $(BTSTACK_LIB_LDFLAGS) -o $@ $^ $(LDFLAGS)
# libBTstack.a: $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURCES:.m=.o) # libBTstack.a: $(libBTstack_SOURCES:.c=.o) $(libBTstack_SOURCES:.m=.o)

19
port/ez430-rf2560/Makefile
View File

@ -12,11 +12,13 @@ BTSTACK_ROOT = ../..
VPATH += example VPATH += example
VPATH += firmware VPATH += firmware
VPATH += src VPATH += src
VPATH += ${BTSTACK_ROOT}/platforms/msp430 VPATH += ${BTSTACK_ROOT}/platform/msp430
VPATH += $(BTSTACK_ROOT)/ble
VPATH += $(BTSTACK_ROOT)/chipset/cc256x
VPATH += $(BTSTACK_ROOT)/example/embedded
VPATH += $(BTSTACK_ROOT)/src VPATH += $(BTSTACK_ROOT)/src
VPATH += $(BTSTACK_ROOT)/src/ble
VPATH += $(BTSTACK_ROOT)/src/classic
VPATH += $(BTSTACK_ROOT)/chipset/cc256x
VPATH += $(BTSTACK_ROOT)/platform/embedded
VPATH += $(BTSTACK_ROOT)/example/embedded
CC = msp430-gcc CC = msp430-gcc
CFLAGS = -mmcu=msp430f5438a -Os -Wall -fno-toplevel-reorder CFLAGS = -mmcu=msp430f5438a -Os -Wall -fno-toplevel-reorder
@ -24,11 +26,10 @@ CFLAGS += \
-I. \ -I. \
-I src \ -I src \
-I firmware \ -I firmware \
-I$(BTSTACK_ROOT)/include \
-I$(BTSTACK_ROOT)/src \ -I$(BTSTACK_ROOT)/src \
-I$(BTSTACK_ROOT)/ble \
-I$(BTSTACK_ROOT)/chipset/cc256x \ -I$(BTSTACK_ROOT)/chipset/cc256x \
-I${BTSTACK_ROOT}/platforms/msp430 \ -I$(BTSTACK_ROOT)/platform/embedded \
-I${BTSTACK_ROOT}/platform/msp430 \
LDFLAGS = -mmcu=msp430f5438a LDFLAGS = -mmcu=msp430f5438a
@ -74,7 +75,7 @@ BLE = \
le_device_db_memory.c \ le_device_db_memory.c \
sm.c \ sm.c \
att_dispatch.c \ att_dispatch.c \
l2cap_le.c \ l2cap.c \
${CC2564B} \ ${CC2564B} \
# gatt_client.c \ # gatt_client.c \
@ -107,7 +108,7 @@ include ${BTSTACK_ROOT}/chipset/cc256x/Makefile.inc
# compile GATT database # compile GATT database
%.h: %.gatt %.h: %.gatt
python ${BTSTACK_ROOT}/ble/compile-gatt.py $< $@ python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@
led_counter.out: ${CORE_OBJ} ${COMMON_OBJ} ${CC2560B} led_counter.o led_counter.out: ${CORE_OBJ} ${COMMON_OBJ} ${CC2560B} led_counter.o

8
port/ez430-rf2560/example/ant-test.c
View File

@ -59,15 +59,15 @@
#include "ant_cmds.h" #include "ant_cmds.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "utils.h" #include "utils.h"
#include "hci.h" #include "hci.h"
#include "l2cap.h" #include "l2cap.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "btstack-config.h" #include "btstack-config.h"
#define HEARTBEAT_PERIOD_MS 1000 #define HEARTBEAT_PERIOD_MS 1000

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

@ -56,14 +56,14 @@
#include "hci_cmds.h" #include "hci_cmds.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "hci.h" #include "hci.h"
#include "l2cap.h" #include "l2cap.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "btstack-config.h" #include "btstack-config.h"
#define HEARTBEAT_PERIOD_MS 1000 #define HEARTBEAT_PERIOD_MS 1000

2
port/ez430-rf2560/src/main.c
View File

@ -60,7 +60,7 @@
#include "hci.h" #include "hci.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "btstack-config.h" #include "btstack-config.h"
int btstack_main(int argc, const char * argv[]); int btstack_main(int argc, const char * argv[]);

3
port/ios/PrefsBundle/Makefile
View File

@ -5,12 +5,13 @@ SDKVERSION_armv6 = 5.1
TARGET_IPHONEOS_DEPLOYMENT_VERSION = 3.0 TARGET_IPHONEOS_DEPLOYMENT_VERSION = 3.0
TARGET_IPHONEOS_DEPLOYMENT_VERSION_arm64 = 7.0 TARGET_IPHONEOS_DEPLOYMENT_VERSION_arm64 = 7.0
ARCHS = armv6 arm64 ARCHS = armv6 arm64
BTSTACK_ROOT=../../..
BUNDLE_NAME = BTstack BUNDLE_NAME = BTstack
BTstack_FILES = PrefsViewController.m BluetoothController.m BluetoothTableViewAdapter.m BTstack_FILES = PrefsViewController.m BluetoothController.m BluetoothTableViewAdapter.m
BTstack_INSTALL_PATH = /Library/PreferenceBundles BTstack_INSTALL_PATH = /Library/PreferenceBundles
BTstack_FRAMEWORKS = UIKit BTstack_FRAMEWORKS = UIKit
BTstack_CFLAGS = -I.. -I../../../src -g BTstack_CFLAGS = -I.. -I$(BTSTACK_ROOT)/src -I$(BTSTACK_ROOT)/platform/daemon/src -g
BTstack_LDFLAGS = -L../src/.theos/obj -lBTstack BTstack_LDFLAGS = -L../src/.theos/obj -lBTstack
BTstack_PRIVATE_FRAMEWORKS = Preferences BTstack_PRIVATE_FRAMEWORKS = Preferences

10
port/ios/README.md
View File

@ -13,7 +13,7 @@ Packages that already use BTstack are: BTstack GPS, Blutrol, WeBe++, and various
Note: As BTstack directly uses the Bluetooth hardware, the iOS Bluetooth is automatically disabled for BTstack applications & services. You can always turn BTstack off in Settings->BTstack. Note: As BTstack directly uses the Bluetooth hardware, the iOS Bluetooth is automatically disabled for BTstack applications & services. You can always turn BTstack off in Settings->BTstack.
Please visit the [project page at GitHub](https://github.com/bluekitchen/btstack/) for technical information and check the platform/ios subfolder. Please visit the [project page at GitHub](https://github.com/bluekitchen/btstack/) for technical information and check the port/ios subfolder.
## How to develop ## How to develop
@ -34,9 +34,9 @@ Set the $THEOS environment variable to the location of the theos checkout, e.g.
export THEOS=/Projects/theos export THEOS=/Projects/theos
Go to btstack/platforms/ios and run make Go to btstack/port/ios and run make
cd btstack/platforms/ios cd btstack/port/ios
make package make package
If everything went right, you'll end up with a .deb package that you could install via: If everything went right, you'll end up with a .deb package that you could install via:
@ -48,7 +48,7 @@ If everything went right, you'll end up with a .deb package that you could insta
With THEOS set-up as before, you can compile and install a set of command line examples in the example folder: With THEOS set-up as before, you can compile and install a set of command line examples in the example folder:
cd btstack/platforms/ios/example cd btstack/port/ios/example
make make
You can copy the created examples to your device using scp and run it from there. You can copy the created examples to your device using scp and run it from there.
@ -58,7 +58,7 @@ You can copy the created examples to your device using scp and run it from there
Similar as before, you can compile the WiiMoteOpenGLDemo by running make: Similar as before, you can compile the WiiMoteOpenGLDemo by running make:
cd btstack/platforms/ios/example/WiiMoteOpenGLDemo cd btstack/port/ios/example/WiiMoteOpenGLDemo
make package make package
You'll end up with a deb file that you can install with You'll end up with a deb file that you can install with

2
port/ios/example/Makefile
View File

@ -10,7 +10,7 @@ ARCHS = armv6 arm64
BTSTACK_ROOT=../../.. BTSTACK_ROOT=../../..
VPATH += $(BTSTACK_ROOT)/example/daemon VPATH += $(BTSTACK_ROOT)/example/daemon
ADDITIONAL_CFLAGS = -I.. -I$(BTSTACK_ROOT)/src -I$(BTSTACK_ROOT)/ble ADDITIONAL_CFLAGS = -I.. -I$(BTSTACK_ROOT)/src -I$(BTSTACK_ROOT)/platform/daemon/src
ADDITIONAL_LDFLAGS = -L../src/.theos/obj -lBTstack ADDITIONAL_LDFLAGS = -L../src/.theos/obj -lBTstack
TOOL_NAME = inquiry l2cap-test rfcomm-echo rfcomm-cat rfcomm-test l2cap-server l2cap-throughput TOOL_NAME = inquiry l2cap-test rfcomm-echo rfcomm-cat rfcomm-test l2cap-server l2cap-throughput

25
port/ios/src/Makefile
View File

@ -7,10 +7,11 @@ TARGET_IPHONEOS_DEPLOYMENT_VERSION_arm64 = 7.0
ARCHS = armv6 arm64 ARCHS = armv6 arm64
BTSTACK_ROOT=../../.. BTSTACK_ROOT=../../..
POSIX_ROOT=$(BTSTACK_ROOT)/platforms/posix POSIX_ROOT=$(BTSTACK_ROOT)/platform/posix
DAEMON_ROOT=$(BTSTACK_ROOT)/platforms/daemon DAEMON_ROOT=$(BTSTACK_ROOT)/platform/daemon
VPATH += $(BTSTACK_ROOT)/src VPATH += $(BTSTACK_ROOT)/src \
$(BTSTACK_ROOT)/src/classic
LIBRARY_NAME = libBTstack LIBRARY_NAME = libBTstack
libBTstack_FILES = \ libBTstack_FILES = \
@ -20,12 +21,12 @@ libBTstack_FILES = \
run_loop.c \ run_loop.c \
sdp_util.c \ sdp_util.c \
utils.c \ utils.c \
$(BTSTACK_ROOT)/platforms/cocoa/run_loop_cocoa.m \ $(BTSTACK_ROOT)/platform/cocoa/run_loop_cocoa.m \
$(POSIX_ROOT)/src/run_loop_posix.c \ $(POSIX_ROOT)/src/run_loop_posix.c \
$(DAEMON_ROOT)/src/btstack.c \ $(DAEMON_ROOT)/src/btstack.c \
$(DAEMON_ROOT)/src/socket_connection.c \ $(DAEMON_ROOT)/src/socket_connection.c \
libBTstack_CFLAGS = -I$(BTSTACK_ROOT)/include -I$(BTSTACK_ROOT)/ble -I$(BTSTACK_ROOT)/src -I.. libBTstack_CFLAGS = -I$(BTSTACK_ROOT)/src/ble -I$(BTSTACK_ROOT)/src -I..
TOOL_NAME = BTdaemon TOOL_NAME = BTdaemon
BTdaemon_FILES = \ BTdaemon_FILES = \
@ -43,17 +44,17 @@ BTdaemon_FILES = \
sdp_query_util.c \ sdp_query_util.c \
$(DAEMON_ROOT)/src/daemon.c \ $(DAEMON_ROOT)/src/daemon.c \
$(POSIX_ROOT)/src/hci_transport_h4.c \ $(POSIX_ROOT)/src/hci_transport_h4.c \
$(BTSTACK_ROOT)/platforms/ios/src/bt_control_iphone.m \ $(BTSTACK_ROOT)/port/ios/src/bt_control_iphone.m \
$(BTSTACK_ROOT)/platforms/ios/src/hci_transport_h4_iphone.c \ $(BTSTACK_ROOT)/port/ios/src/hci_transport_h4_iphone.c \
$(BTSTACK_ROOT)/platforms/ios/src/platform_iphone.m \ $(BTSTACK_ROOT)/port/ios/src/platform_iphone.m \
$(BTSTACK_ROOT)/platforms/ios/SpringBoardAccess/SpringBoardAccess.c \ $(BTSTACK_ROOT)/port/ios/SpringBoardAccess/SpringBoardAccess.c \
$(BTSTACK_ROOT)/platforms/cocoa/remote_device_db_cocoa.m \ $(BTSTACK_ROOT)/platform/cocoa/remote_device_db_cocoa.m \
BTdaemon_CFLAGS = -I$(BTSTACK_ROOT)/include -I$(BTSTACK_ROOT)/ble -I$(BTSTACK_ROOT)/src -I.. BTdaemon_CFLAGS = -I$(BTSTACK_ROOT)/src -I$(BTSTACK_ROOT)/platform/daemon/src -I..
BTdaemon_PRIVATE_FRAMEWORKS = IOKIT BTdaemon_PRIVATE_FRAMEWORKS = IOKIT
before-all:: before-all::
../../../tools/get_version.sh ../../../tool/get_version.sh
after-BTdaemon-stage:: after-BTdaemon-stage::
echo $(THEOS_STAGING_DIR) echo $(THEOS_STAGING_DIR)

2
port/ios/src/bt_control_iphone.m
View File

@ -62,7 +62,7 @@
#include <sys/uio.h> #include <sys/uio.h>
#include <unistd.h> #include <unistd.h>
#include "../platforms/ios/SpringBoardAccess/SpringBoardAccess.h" #include "../port/ios/SpringBoardAccess/SpringBoardAccess.h"
// minimal IOKit // minimal IOKit
#include <Availability.h> #include <Availability.h>

2
port/ios/src/platform_iphone.m
View File

@ -43,7 +43,7 @@
#include "platform_iphone.h" #include "platform_iphone.h"
#include "btstack-config.h" #include "btstack-config.h"
#include "../platforms/ios/SpringBoardAccess/SpringBoardAccess.h" #include "../port/ios/SpringBoardAccess/SpringBoardAccess.h"
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>

9
port/libusb/Makefile
View File

@ -1,6 +1,6 @@
# Makefile for libusb based examples # Makefile for libusb based examples
BTSTACK_ROOT = ../.. BTSTACK_ROOT = ../..
POSIX_ROOT= ${BTSTACK_ROOT}/platforms/posix POSIX_ROOT= ${BTSTACK_ROOT}/platform/posix
CORE += main.c stdin_support.c CORE += main.c stdin_support.c
@ -12,8 +12,11 @@ include ${BTSTACK_ROOT}/example/embedded/Makefile.inc
CFLAGS += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror CFLAGS += -g -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -Werror
# CFLAGS += -Werror # CFLAGS += -Werror
CFLAGS += -I${POSIX_ROOT}/src CFLAGS += -I${POSIX_ROOT}/src \
VPATH += ${BTSTACK_ROOT}/platforms/posix/src -I${BTSTACK_ROOT}/platform/embedded
VPATH += ${BTSTACK_ROOT}/platform/embedded
VPATH += ${BTSTACK_ROOT}/platform/posix/src
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
LDFLAGS += -lws2_32 LDFLAGS += -lws2_32

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

@ -12,11 +12,13 @@ BTSTACK_ROOT = ../..
VPATH += example VPATH += example
VPATH += firmware VPATH += firmware
VPATH += src VPATH += src
VPATH += ${BTSTACK_ROOT}/platforms/msp430
VPATH += $(BTSTACK_ROOT)/ble
VPATH += $(BTSTACK_ROOT)/chipset/cc256x
VPATH += $(BTSTACK_ROOT)/example/embedded
VPATH += $(BTSTACK_ROOT)/src VPATH += $(BTSTACK_ROOT)/src
VPATH += $(BTSTACK_ROOT)/src/ble
VPATH += $(BTSTACK_ROOT)/src/classic
VPATH += $(BTSTACK_ROOT)/chipset/cc256x
VPATH += ${BTSTACK_ROOT}/platform/msp430
VPATH += ${BTSTACK_ROOT}/platform/embedded
VPATH += $(BTSTACK_ROOT)/example/embedded
CC = msp430-gcc CC = msp430-gcc
CFLAGS = -mmcu=msp430f5438a -Os -Wall -fno-toplevel-reorder CFLAGS = -mmcu=msp430f5438a -Os -Wall -fno-toplevel-reorder
@ -24,11 +26,10 @@ CFLAGS += \
-I. \ -I. \
-I src \ -I src \
-I firmware \ -I firmware \
-I$(BTSTACK_ROOT)/include \
-I$(BTSTACK_ROOT)/src \ -I$(BTSTACK_ROOT)/src \
-I$(BTSTACK_ROOT)/ble \
-I$(BTSTACK_ROOT)/chipset/cc256x \ -I$(BTSTACK_ROOT)/chipset/cc256x \
-I${BTSTACK_ROOT}/platforms/msp430 \ -I$(BTSTACK_ROOT)/platform/embedded \
-I${BTSTACK_ROOT}/platform/msp430 \
LDFLAGS = -mmcu=msp430f5438a LDFLAGS = -mmcu=msp430f5438a
@ -74,7 +75,7 @@ BLE = \
le_device_db_memory.c \ le_device_db_memory.c \
sm.c \ sm.c \
att_dispatch.c \ att_dispatch.c \
l2cap_le.c \ l2cap.c \
${CC2564B} \ ${CC2564B} \
# gatt_client.c \ # gatt_client.c \
@ -112,7 +113,7 @@ include ${BTSTACK_ROOT}/chipset/cc256x/Makefile.inc
# compile GATT database # compile GATT database
%.h: %.gatt %.h: %.gatt
python ${BTSTACK_ROOT}/ble/compile-gatt.py $< $@ python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@
led_counter.out: ${CORE_OBJ} ${COMMON_OBJ} ${CC2560B} led_counter.o led_counter.out: ${CORE_OBJ} ${COMMON_OBJ} ${CC2560B} led_counter.o

8
port/msp-exp430f5438-cc2564b/example/ant-test.c
View File

@ -59,15 +59,15 @@
#include "ant_cmds.h" #include "ant_cmds.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "utils.h" #include "utils.h"
#include "hci.h" #include "hci.h"
#include "l2cap.h" #include "l2cap.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "btstack-config.h" #include "btstack-config.h"
#define HEARTBEAT_PERIOD_MS 1000 #define HEARTBEAT_PERIOD_MS 1000

10
port/msp-exp430f5438-cc2564b/example/ble_server.c
View File

@ -73,11 +73,11 @@
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sm.h" #include "ble/sm.h"
#include "att.h" #include "ble/att.h"
#include "att_server.h" #include "ble/att_server.h"
#include "gap_le.h" #include "ble/gap_le.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
#define FONT_HEIGHT 12 // Each character has 13 lines #define FONT_HEIGHT 12 // Each character has 13 lines
#define FONT_WIDTH 8 #define FONT_WIDTH 8

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

@ -56,14 +56,14 @@
#include "hci_cmds.h" #include "hci_cmds.h"
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "hci.h" #include "hci.h"
#include "l2cap.h" #include "l2cap.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "btstack-config.h" #include "btstack-config.h"
#define HEARTBEAT_PERIOD_MS 1000 #define HEARTBEAT_PERIOD_MS 1000

2
port/msp-exp430f5438-cc2564b/src/main.c
View File

@ -59,7 +59,7 @@
#include "hci.h" #include "hci.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "btstack-config.h" #include "btstack-config.h"
static void hw_setup(void){ static void hw_setup(void){

20
port/msp430f5229lp-cc2564b/Makefile
View File

@ -12,11 +12,13 @@ BTSTACK_ROOT = ../..
VPATH += example VPATH += example
VPATH += firmware VPATH += firmware
VPATH += src VPATH += src
VPATH += ${BTSTACK_ROOT}/platforms/msp430 VPATH += ${BTSTACK_ROOT}/platform/msp430
VPATH += $(BTSTACK_ROOT)/ble
VPATH += $(BTSTACK_ROOT)/chipset/cc256x
VPATH += $(BTSTACK_ROOT)/example/embedded
VPATH += $(BTSTACK_ROOT)/src VPATH += $(BTSTACK_ROOT)/src
VPATH += $(BTSTACK_ROOT)/src/ble
VPATH += $(BTSTACK_ROOT)/src/classic
VPATH += $(BTSTACK_ROOT)/chipset/cc256x
VPATH += $(BTSTACK_ROOT)/platform/embedded
VPATH += $(BTSTACK_ROOT)/example/embedded
MCU = msp430f5529 MCU = msp430f5529
@ -26,11 +28,10 @@ CFLAGS += \
-I. \ -I. \
-I src \ -I src \
-I firmware \ -I firmware \
-I$(BTSTACK_ROOT)/include \
-I$(BTSTACK_ROOT)/src \ -I$(BTSTACK_ROOT)/src \
-I$(BTSTACK_ROOT)/ble \
-I$(BTSTACK_ROOT)/chipset/cc256x \ -I$(BTSTACK_ROOT)/chipset/cc256x \
-I${BTSTACK_ROOT}/platforms/msp430 \ -I$(BTSTACK_ROOT)/platform/embedded \
-I${BTSTACK_ROOT}/platform/msp430 \
LDFLAGS = -mmcu=${MCU} LDFLAGS = -mmcu=${MCU}
@ -76,7 +77,8 @@ BLE = \
le_device_db_memory.c \ le_device_db_memory.c \
sm.c \ sm.c \
att_dispatch.c \ att_dispatch.c \
l2cap_le.c \ l2cap.c \
l2cap_signaling.c \
${CC2564B} \ ${CC2564B} \
# gatt_client.c \ # gatt_client.c \
@ -108,7 +110,7 @@ include ${BTSTACK_ROOT}/chipset/cc256x/Makefile.inc
# compile GATT database # compile GATT database
%.h: %.gatt %.h: %.gatt
python ${BTSTACK_ROOT}/ble/compile-gatt.py $< $@ python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@
led_counter.out: ${CORE_OBJ} ${COMMON_OBJ} ${CC2560B} led_counter.o led_counter.out: ${CORE_OBJ} ${COMMON_OBJ} ${CC2560B} led_counter.o

10
port/msp430f5229lp-cc2564b/example/ble_server.c
View File

@ -71,11 +71,11 @@
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sm.h" #include "ble/sm.h"
#include "att.h" #include "ble/att.h"
#include "att_server.h" #include "ble/att_server.h"
#include "gap_le.h" #include "ble/gap_le.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
#define FONT_HEIGHT 12 // Each character has 13 lines #define FONT_HEIGHT 12 // Each character has 13 lines
#define FONT_WIDTH 8 #define FONT_WIDTH 8

2
port/msp430f5229lp-cc2564b/src/main.c
View File

@ -60,7 +60,7 @@
#include "hci.h" #include "hci.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "btstack-config.h" #include "btstack-config.h"
static void hw_setup(void){ static void hw_setup(void){

10
port/mtk/Makefile
View File

@ -13,12 +13,14 @@ BTSTACK_ROOT = ../..
CFLAGS += -I$(BTSTACK_ROOT)/include CFLAGS += -I$(BTSTACK_ROOT)/include
CFLAGS += -I$(BTSTACK_ROOT)/src/ CFLAGS += -I$(BTSTACK_ROOT)/src/
CFLAGS += -I$(BTSTACK_ROOT)/ble CFLAGS += -I$(BTSTACK_ROOT)/ble
CFLAGS += -I$(BTSTACK_ROOT)/platform/daemon/src
CFLAGS += -I. CFLAGS += -I.
VPATH += $(BTSTACK_ROOT)/src VPATH += $(BTSTACK_ROOT)/src
VPATH += $(BTSTACK_ROOT)/ble VPATH += $(BTSTACK_ROOT)/src/ble
VPATH += $(BTSTACK_ROOT)/platforms/posix/src VPATH += $(BTSTACK_ROOT)/src/classic
VPATH += $(BTSTACK_ROOT)/platforms/daemon/src VPATH += $(BTSTACK_ROOT)/platform/posix/src
VPATH += $(BTSTACK_ROOT)/platform/daemon/src
VPATH += $(BTSTACK_ROOT)/example/daemon VPATH += $(BTSTACK_ROOT)/example/daemon
libBTstack_OBJS = \ libBTstack_OBJS = \
@ -81,7 +83,7 @@ shell:
$(ADB) shell $(ADB) shell
version: version:
$(BTSTACK_ROOT)/tools/get_version.sh $(BTSTACK_ROOT)/tool/get_version.sh
grep BTSTACK_DATE $(BTSTACK_ROOT)/src/version.h grep BTSTACK_DATE $(BTSTACK_ROOT)/src/version.h
BTstackDaemon: $(BTdaemon_OBJS) libbluetoothdrv.so BTstackDaemon: $(BTdaemon_OBJS) libbluetoothdrv.so

6
port/mtk/package.sh
View File

@ -2,7 +2,7 @@
DIR=`dirname $0` DIR=`dirname $0`
echo "Update version info" echo "Update version info"
$DIR/../../tools/get_version.sh $DIR/../../tool/get_version.sh
echo "Rebuild clean" echo "Rebuild clean"
pushd . pushd .
@ -13,7 +13,7 @@ popd
echo "Build Java Classes" echo "Build Java Classes"
pushd . pushd .
cd $DIR/../../java cd $DIR/../../binding/java
ant jar ant jar
popd popd
@ -23,7 +23,7 @@ VERSION=`sed -n -e 's/^.*BTSTACK_VERSION \"\(.*\)\"/\1/p' src/version.h`
ARCHIVE=btstack-android-mtk-$VERSION.tar.gz ARCHIVE=btstack-android-mtk-$VERSION.tar.gz
echo "Create Archive $ARCHIVE" echo "Create Archive $ARCHIVE"
rm -f $ARCHIVE rm -f $ARCHIVE
tar cfz $ARCHIVE platforms/mtk java tar cfz $ARCHIVE port/mtk binding/java
popd popd

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

@ -18,31 +18,27 @@
</logicalFolder> </logicalFolder>
<logicalFolder name="f3" displayName="btstack" projectFiles="true"> <logicalFolder name="f3" displayName="btstack" projectFiles="true">
<logicalFolder name="ble" displayName="ble" projectFiles="true"> <logicalFolder name="ble" displayName="ble" projectFiles="true">
<itemPath>../../../ble/ad_parser.h</itemPath> <itemPath>../../../src/ble/ad_parser.h</itemPath>
<itemPath>../../../ble/ancs_client_lib.h</itemPath> <itemPath>../../../src/ble/ancs_client_lib.h</itemPath>
<itemPath>../../../ble/att.h</itemPath> <itemPath>../../../src/ble/att.h</itemPath>
<itemPath>../../../ble/att_dispatch.h</itemPath> <itemPath>../../../src/ble/att_dispatch.h</itemPath>
<itemPath>../../../ble/att_server.h</itemPath> <itemPath>../../../src/ble/att_server.h</itemPath>
<itemPath>../../../ble/gap_le.h</itemPath> <itemPath>../../../src/ble/gap_le.h</itemPath>
<itemPath>../../../ble/gatt_client.h</itemPath> <itemPath>../../../src/ble/gatt_client.h</itemPath>
<itemPath>../../../ble/le_device_db.h</itemPath> <itemPath>../../../src/ble/le_device_db.h</itemPath>
<itemPath>../../../ble/sm.h</itemPath> <itemPath>../../../src/ble/sm.h</itemPath>
</logicalFolder> <logicalFolder name="embedded" displayName="embedded" projectFiles="true">
<logicalFolder name="btstack" displayName="btstack" projectFiles="true"> <itemPath>../../../platform/embedded/hal_cpu.h</itemPath>
<itemPath>../../../include/btstack/ant_cmds.h</itemPath> <itemPath>../../../platform/embedded/hal_led.h</itemPath>
<itemPath>../../../include/btstack/btstack.h</itemPath> <itemPath>../../../platform/embedded/hal_tick.h</itemPath>
<itemPath>../../../include/btstack/hal_cpu.h</itemPath> <itemPath>../../../platform/embedded/hal_uart_dma.h</itemPath>
<itemPath>../../../include/btstack/hal_led.h</itemPath>
<itemPath>../../../include/btstack/hal_tick.h</itemPath>
<itemPath>../../../include/btstack/hal_uart_dma.h</itemPath>
<itemPath>../../../include/btstack/hci_cmds.h</itemPath>
<itemPath>../../../include/btstack/linked_list.h</itemPath>
<itemPath>../../../include/btstack/memory_pool.h</itemPath>
<itemPath>../../../include/btstack/run_loop.h</itemPath>
<itemPath>../../../include/btstack/sdp_util.h</itemPath>
<itemPath>../../../include/btstack/utils.h</itemPath>
</logicalFolder> </logicalFolder>
<logicalFolder name="src" displayName="src" projectFiles="true"> <logicalFolder name="src" displayName="src" projectFiles="true">
<itemPath>../../../src/hci_cmds.h</itemPath>
<itemPath>../../../src/linked_list.h</itemPath>
<itemPath>../../../src/memory_pool.h</itemPath>
<itemPath>../../../src/run_loop.h</itemPath>
<itemPath>../../../src/utils.h</itemPath>
<itemPath>../../../src/bnep.h</itemPath> <itemPath>../../../src/bnep.h</itemPath>
<itemPath>../../../src/bt_control.h</itemPath> <itemPath>../../../src/bt_control.h</itemPath>
<itemPath>../../../src/btstack_memory.h</itemPath> <itemPath>../../../src/btstack_memory.h</itemPath>
@ -53,10 +49,12 @@
<itemPath>../../../src/hci_transport.h</itemPath> <itemPath>../../../src/hci_transport.h</itemPath>
<itemPath>../../../src/l2cap.h</itemPath> <itemPath>../../../src/l2cap.h</itemPath>
<itemPath>../../../src/l2cap_signaling.h</itemPath> <itemPath>../../../src/l2cap_signaling.h</itemPath>
<itemPath>../../../src/pan.h</itemPath> <itemPath>../../../src/run_loop_private.h</itemPath>
</logicalFolder>
<logicalFolder name="classic" displayName="classic" projectFiles="true">
<itemPath>../../../src/classic/sdp_util.h</itemPath>
<itemPath>../../../src/remote_device_db.h</itemPath> <itemPath>../../../src/remote_device_db.h</itemPath>
<itemPath>../../../src/rfcomm.h</itemPath> <itemPath>../../../src/rfcomm.h</itemPath>
<itemPath>../../../src/run_loop_private.h</itemPath>
<itemPath>../../../src/sdp.h</itemPath> <itemPath>../../../src/sdp.h</itemPath>
<itemPath>../../../src/sdp_client.h</itemPath> <itemPath>../../../src/sdp_client.h</itemPath>
<itemPath>../../../src/sdp_parser.h</itemPath> <itemPath>../../../src/sdp_parser.h</itemPath>
@ -111,18 +109,17 @@
</logicalFolder> </logicalFolder>
<logicalFolder name="f3" displayName="btstack" projectFiles="true"> <logicalFolder name="f3" displayName="btstack" projectFiles="true">
<logicalFolder name="ble" displayName="ble" projectFiles="true"> <logicalFolder name="ble" displayName="ble" projectFiles="true">
<itemPath>../../../ble/ad_parser.c</itemPath> <itemPath>../../../src/ble/ad_parser.c</itemPath>
<itemPath>../../../ble/att.c</itemPath> <itemPath>../../../src/ble/att.c</itemPath>
<itemPath>../../../ble/att_dispatch.c</itemPath> <itemPath>../../../src/ble/att_dispatch.c</itemPath>
<itemPath>../../../ble/att_server.c</itemPath> <itemPath>../../../src/ble/att_server.c</itemPath>
<itemPath>../../../ble/le_device_db_memory.c</itemPath> <itemPath>../../../src/ble/le_device_db_memory.c</itemPath>
<itemPath>../../../ble/sm.c</itemPath> <itemPath>../../../src/ble/sm.c</itemPath>
</logicalFolder> </logicalFolder>
<logicalFolder name="chipset-csr" displayName="chipset-csr" projectFiles="true"> <logicalFolder name="chipset-csr" displayName="chipset-csr" projectFiles="true">
<itemPath>../../../chipset/csr/bt_control_csr.c</itemPath> <itemPath>../../../chipset/csr/bt_control_csr.c</itemPath>
</logicalFolder> </logicalFolder>
<logicalFolder name="src" displayName="src" projectFiles="true"> <logicalFolder name="src" displayName="src" projectFiles="true">
<itemPath>../../../src/bnep.c</itemPath>
<itemPath>../../../src/btstack_memory.c</itemPath> <itemPath>../../../src/btstack_memory.c</itemPath>
<itemPath>../../../src/hci.c</itemPath> <itemPath>../../../src/hci.c</itemPath>
<itemPath>../../../src/hci_cmds.c</itemPath> <itemPath>../../../src/hci_cmds.c</itemPath>
@ -132,17 +129,16 @@
<itemPath>../../../src/l2cap_signaling.c</itemPath> <itemPath>../../../src/l2cap_signaling.c</itemPath>
<itemPath>../../../src/linked_list.c</itemPath> <itemPath>../../../src/linked_list.c</itemPath>
<itemPath>../../../src/memory_pool.c</itemPath> <itemPath>../../../src/memory_pool.c</itemPath>
<itemPath>../../../src/pan.c</itemPath> <itemPath>../../../src/classic/remote_device_db_memory.c</itemPath>
<itemPath>../../../src/remote_device_db_memory.c</itemPath> <itemPath>../../../src/classic/rfcomm.c</itemPath>
<itemPath>../../../src/rfcomm.c</itemPath>
<itemPath>../../../src/run_loop.c</itemPath> <itemPath>../../../src/run_loop.c</itemPath>
<itemPath>../../../src/run_loop_embedded.c</itemPath> <itemPath>../../../src/run_loop_embedded.c</itemPath>
<itemPath>../../../src/sdp.c</itemPath> <itemPath>../../../src/classic/sdp.c</itemPath>
<itemPath>../../../src/sdp_client.c</itemPath> <itemPath>../../../src/classic/sdp_client.c</itemPath>
<itemPath>../../../src/sdp_parser.c</itemPath> <itemPath>../../../src/classic/sdp_parser.c</itemPath>
<itemPath>../../../src/sdp_query_rfcomm.c</itemPath> <itemPath>../../../src/classic/sdp_query_rfcomm.c</itemPath>
<itemPath>../../../src/sdp_query_util.c</itemPath> <itemPath>../../../src/classic/sdp_query_util.c</itemPath>
<itemPath>../../../src/sdp_util.c</itemPath> <itemPath>../../../src/classic/sdp_util.c</itemPath>
<itemPath>../../../src/utils.c</itemPath> <itemPath>../../../src/utils.c</itemPath>
</logicalFolder> </logicalFolder>
</logicalFolder> </logicalFolder>

8
port/posix-cc2564b/Makefile
View File

@ -1,6 +1,6 @@
# Makefile for libusb based examples # Makefile for libusb based examples
BTSTACK_ROOT = ../.. BTSTACK_ROOT = ../..
POSIX_ROOT= ${BTSTACK_ROOT}/platforms/posix POSIX_ROOT= ${BTSTACK_ROOT}/platform/posix
CORE += main.c stdin_support.c bt_control_cc256x.c bluetooth_init_cc2564B_1.2_BT_Spec_4.1.c CORE += main.c stdin_support.c bt_control_cc256x.c bluetooth_init_cc2564B_1.2_BT_Spec_4.1.c
@ -11,13 +11,15 @@ include ${BTSTACK_ROOT}/example/embedded/Makefile.inc
# fetch and convert init scripts # fetch and convert init scripts
include ${BTSTACK_ROOT}/chipset/cc256x/Makefile.inc include ${BTSTACK_ROOT}/chipset/cc256x/Makefile.inc
CFLAGS += -I$(BTSTACK_ROOT)/chipset/cc256x CFLAGS += -I$(BTSTACK_ROOT)/chipset/cc256x \
-I$(BTSTACK_ROOT)/platform/embedded
# CC = gcc-fsf-4.9 # CC = gcc-fsf-4.9
CFLAGS += -g -Wall CFLAGS += -g -Wall
# CFLAGS += -Werror # CFLAGS += -Werror
VPATH += ${BTSTACK_ROOT}/platforms/posix/src VPATH += ${BTSTACK_ROOT}/platform/posix/src
VPATH += ${BTSTACK_ROOT}/platform/embedded
VPATH += ${BTSTACK_ROOT}/chipset/cc256x VPATH += ${BTSTACK_ROOT}/chipset/cc256x
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)

11
port/posix-h4/Makefile
View File

@ -1,6 +1,5 @@
# Makefile for libusb based examples # Makefile for libusb based examples
BTSTACK_ROOT = ../.. BTSTACK_ROOT = ../..
POSIX_ROOT= ${BTSTACK_ROOT}/platforms/posix
CORE += main.c stdin_support.c CORE += main.c stdin_support.c
@ -8,11 +7,11 @@ COMMON += hci_transport_h4.c run_loop_posix.c remote_device_db_fs.c
include ${BTSTACK_ROOT}/example/embedded/Makefile.inc include ${BTSTACK_ROOT}/example/embedded/Makefile.inc
# CC = gcc-fsf-4.9 CFLAGS += -g -Wall -I$(BTSTACK_ROOT)/platform/embedded
CFLAGS += -g -Wall
# CFLAGS += -Werror # CFLAGS += -Werror
VPATH += ${BTSTACK_ROOT}/platforms/posix/src VPATH += ${BTSTACK_ROOT}/platform/posix/src
VPATH += ${BTSTACK_ROOT}/platform/embedded
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
LDFLAGS += -lws2_32 LDFLAGS += -lws2_32
@ -21,7 +20,7 @@ endif
# Command Line examples require porting to win32, so only build on other unix-ish hosts # Command Line examples require porting to win32, so only build on other unix-ish hosts
ifneq ($(OS),Windows_NT) ifneq ($(OS),Windows_NT)
EXAMPLES += ${EXAMPLES_CLI} EXAMPLES += ${EXAMPLES_CLI}
CFLAGS += -I${POSIX_ROOT}/src CFLAGS += -I${BTSTACK_ROOT}/platform/posix/src
endif endif
all: ${BTSTACK_ROOT}/include/btstack/version.h ${EXAMPLES} all: ${BTSTACK_ROOT}/src/version.h ${EXAMPLES}

7
port/posix-stlc2500d/Makefile
View File

@ -1,6 +1,6 @@
# Makefile for libusb based examples # Makefile for libusb based examples
BTSTACK_ROOT = ../.. BTSTACK_ROOT = ../..
POSIX_ROOT= ${BTSTACK_ROOT}/platforms/posix POSIX_ROOT= ${BTSTACK_ROOT}/platform/posix
CORE += main.c stdin_support.c bt_control_stlc2500d.c CORE += main.c stdin_support.c bt_control_stlc2500d.c
@ -12,10 +12,11 @@ include ${BTSTACK_ROOT}/example/embedded/Makefile.inc
CFLAGS += -I$(BTSTACK_ROOT)/chipset/stlc2500d CFLAGS += -I$(BTSTACK_ROOT)/chipset/stlc2500d
# CC = gcc-fsf-4.9 # CC = gcc-fsf-4.9
CFLAGS += -g -Wall CFLAGS += -g -Wall -I$(BTSTACK_ROOT)/platform/embedded
# CFLAGS += -Werror # CFLAGS += -Werror
VPATH += ${BTSTACK_ROOT}/platforms/posix/src VPATH += ${BTSTACK_ROOT}/platform/posix/src
VPATH += ${BTSTACK_ROOT}/platform/embedded
VPATH += ${BTSTACK_ROOT}/chipset/stlc2500d VPATH += ${BTSTACK_ROOT}/chipset/stlc2500d
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)

9
port/posix-wl183x/Makefile
View File

@ -1,6 +1,6 @@
# Makefile for libusb based examples # Makefile for libusb based examples
BTSTACK_ROOT = ../.. BTSTACK_ROOT = ../..
POSIX_ROOT= ${BTSTACK_ROOT}/platforms/posix POSIX_ROOT= ${BTSTACK_ROOT}/platform/posix
CORE += main.c stdin_support.c bt_control_cc256x.c TIInit_11.8.32.c CORE += main.c stdin_support.c bt_control_cc256x.c TIInit_11.8.32.c
@ -11,13 +11,12 @@ include ${BTSTACK_ROOT}/example/embedded/Makefile.inc
# fetch and convert init scripts # fetch and convert init scripts
include ${BTSTACK_ROOT}/chipset/cc256x/Makefile.inc include ${BTSTACK_ROOT}/chipset/cc256x/Makefile.inc
CFLAGS += -I$(BTSTACK_ROOT)/chipset/cc256x CFLAGS += -I$(BTSTACK_ROOT)/chipset/cc256x -I$(BTSTACK_ROOT)/platform/embedded
# CC = gcc-fsf-4.9
CFLAGS += -g -Wall CFLAGS += -g -Wall
# CFLAGS += -Werror
VPATH += ${BTSTACK_ROOT}/platforms/posix/src VPATH += ${BTSTACK_ROOT}/platform/posix/src
VPATH += ${BTSTACK_ROOT}/platform/embedded
VPATH += ${BTSTACK_ROOT}/chipset/cc256x VPATH += ${BTSTACK_ROOT}/chipset/cc256x
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)

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

@ -10,7 +10,9 @@ LDSCRIPT = stm32f1-nucleo.ld
BTSTACK_ROOT = ../.. BTSTACK_ROOT = ../..
VPATH = $(BTSTACK_ROOT)/example/embedded VPATH = $(BTSTACK_ROOT)/example/embedded
VPATH += $(BTSTACK_ROOT)/src VPATH += $(BTSTACK_ROOT)/src
VPATH += $(BTSTACK_ROOT)/ble VPATH += $(BTSTACK_ROOT)/src/ble
VPATH += $(BTSTACK_ROOT)/src/classic
VPATH += $(BTSTACK_ROOT)/platform/embedded
VPATH += $(BTSTACK_ROOT)/chipset/cc256x VPATH += $(BTSTACK_ROOT)/chipset/cc256x
CORE = \ CORE = \
@ -54,7 +56,10 @@ BLE_OBJ = $(BLE:.c=.o)
OBJS += $(CORE_OBJ) $(COMMON_OBJ) $(BLE_OBJ) OBJS += $(CORE_OBJ) $(COMMON_OBJ) $(BLE_OBJ)
CFLAGS = -I. -I$(BTSTACK_ROOT)/include -I$(BTSTACK_ROOT)/src -I$(BTSTACK_ROOT)/ble -I$(BTSTACK_ROOT)/chipset/cc256x CFLAGS = -I. \
-I$(BTSTACK_ROOT)/platform/embedded \
-I$(BTSTACK_ROOT)/src \
-I$(BTSTACK_ROOT)/chipset/cc256x
examples: libopencm3/lib/libopencm3_stm32f1.a spp_and_le_counter.h spp_and_le_counter.elf examples: libopencm3/lib/libopencm3_stm32f1.a spp_and_le_counter.h spp_and_le_counter.elf
@ -73,5 +78,5 @@ libopencm3/lib/libopencm3_stm32f1.a:
# compile GATT database # compile GATT database
spp_and_le_counter.h: spp_and_le_counter.gatt spp_and_le_counter.h: spp_and_le_counter.gatt
python ${BTSTACK_ROOT}/ble/compile-gatt.py $< $@ python ${BTSTACK_ROOT}/tool/compile-gatt.py $< $@

2
port/stm32-f103rb-nucleo/main.c
View File

@ -52,7 +52,7 @@
#include "hci.h" #include "hci.h"
#include "bt_control_cc256x.h" #include "bt_control_cc256x.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "remote_device_db.h" #include "classic/remote_device_db.h"
// STDOUT_FILENO and STDERR_FILENO are defined by <unistd.h> with GCC // STDOUT_FILENO and STDERR_FILENO are defined by <unistd.h> with GCC
// (this is a hack for IAR) // (this is a hack for IAR)

4
src/ble/ad_parser.c
View File

@ -48,11 +48,11 @@
#include <string.h> #include <string.h>
#include "utils.h" #include "utils.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "hci.h" #include "hci.h"
#include "ad_parser.h" #include "ble/ad_parser.h"
typedef enum { typedef enum {
IncompleteList16 = 0x02, IncompleteList16 = 0x02,

10
src/ble/ancs_client_lib.c
View File

@ -43,15 +43,15 @@
#include <string.h> #include <string.h>
#include "run_loop.h" #include "run_loop.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "ancs_client_lib.h" #include "ancs_client_lib.h"
#include "att.h" #include "ble/att.h"
#include "debug.h" #include "debug.h"
#include "gap_le.h" #include "ble/gap_le.h"
#include "gatt_client.h" #include "ble/gatt_client.h"
#include "sm.h" #include "ble/sm.h"
// ancs_client.h Start // ancs_client.h Start
typedef enum ancs_chunk_parser_state { typedef enum ancs_chunk_parser_state {

2
src/ble/att.c
View File

@ -39,7 +39,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "att.h" #include "ble/att.h"
#include "debug.h" #include "debug.h"
#include "utils.h" #include "utils.h"

2
src/ble/att_db_util.c
View File

@ -39,7 +39,7 @@
#include <string.h> #include <string.h>
#include "att_db_util.h" #include "att_db_util.h"
#include "att.h" #include "ble/att.h"
#include "utils.h" #include "utils.h"
#include "debug.h" #include "debug.h"

2
src/ble/att_dispatch.h
View File

@ -43,7 +43,7 @@
#ifndef __ATT_DISPATCH_H #ifndef __ATT_DISPATCH_H
#define __ATT_DISPATCH_H #define __ATT_DISPATCH_H
#include "btstack.h" #include "utils.h"
#if defined __cplusplus #if defined __cplusplus
extern "C" { extern "C" {

10
src/ble/att_server.c
View File

@ -56,13 +56,13 @@
#include "l2cap.h" #include "l2cap.h"
#include "sm.h" #include "ble/sm.h"
#include "att.h" #include "ble/att.h"
#include "att_dispatch.h" #include "att_dispatch.h"
#include "gap_le.h" #include "ble/gap_le.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
#include "att_server.h" #include "ble/att_server.h"
static void att_run(void); static void att_run(void);

3
src/ble/att_server.h
View File

@ -37,9 +37,8 @@
#ifndef __ATT_SERVER_H #ifndef __ATT_SERVER_H
#define __ATT_SERVER_H #define __ATT_SERVER_H
#include "btstack.h"
#include <stdint.h> #include <stdint.h>
#include "att.h" #include "ble/att.h"
#if defined __cplusplus #if defined __cplusplus
extern "C" { extern "C" {

12
src/ble/gatt_client.c
View File

@ -42,22 +42,22 @@
#include "run_loop.h" #include "run_loop.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "utils.h" #include "utils.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "btstack-config.h" #include "btstack-config.h"
#include "gatt_client.h" #include "ble/gatt_client.h"
#include "ad_parser.h" #include "ble/ad_parser.h"
#include "debug.h" #include "debug.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci.h" #include "hci.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "att.h" #include "ble/att.h"
#include "att_dispatch.h" #include "att_dispatch.h"
#include "sm.h" #include "ble/sm.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
static linked_list_t gatt_client_connections = NULL; static linked_list_t gatt_client_connections = NULL;
static linked_list_t gatt_subclients = NULL; static linked_list_t gatt_subclients = NULL;

2
src/ble/le_device_db_memory.c
View File

@ -35,7 +35,7 @@
* *
*/ */
#include "le_device_db.h" #include "ble/le_device_db.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

6
src/ble/sm.c
View File

@ -45,9 +45,9 @@
#include "debug.h" #include "debug.h"
#include "hci.h" #include "hci.h"
#include "l2cap.h" #include "l2cap.h"
#include "le_device_db.h" #include "ble/le_device_db.h"
#include "sm.h" #include "ble/sm.h"
#include "gap_le.h" #include "ble/gap_le.h"
// //
// SM internal types and globals // SM internal types and globals

3
src/ble/sm.h
View File

@ -38,9 +38,8 @@
#ifndef __SM_H #ifndef __SM_H
#define __SM_H #define __SM_H
#include "utils.h"
#include "btstack.h"
#include <stdint.h> #include <stdint.h>
#include "utils.h"
#if defined __cplusplus #if defined __cplusplus
extern "C" { extern "C" {

16
src/btstack_memory.h
View File

@ -53,16 +53,20 @@ extern "C" {
#include "btstack-config.h" #include "btstack-config.h"
// Core
#include "hci.h" #include "hci.h"
#include "l2cap.h" #include "l2cap.h"
#include "rfcomm.h"
#include "bnep.h"
#include "hfp.h"
#include "remote_device_db.h"
// Classic
#include "classic/rfcomm.h"
#include "classic/bnep.h"
#include "classic/hfp.h"
#include "classic/remote_device_db.h"
// BLE
#ifdef HAVE_BLE #ifdef HAVE_BLE
#include "gatt_client.h" #include "ble/gatt_client.h"
#include "sm.h" #include "ble/sm.h"
#endif #endif
/* API_START */ /* API_START */

3
src/classic/bnep.c
View File

@ -46,10 +46,9 @@
#include <string.h> // memcpy #include <string.h> // memcpy
#include <stdint.h> #include <stdint.h>
#include "btstack.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "utils.h" #include "utils.h"
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci.h" #include "hci.h"

4
src/classic/hfp.c
View File

@ -56,8 +56,8 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "debug.h" #include "debug.h"
#define HFP_HF_FEATURES_SIZE 10 #define HFP_HF_FEATURES_SIZE 10

2
src/classic/hfp.h
View File

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

8
src/classic/hfp_ag.c
View File

@ -55,11 +55,11 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "debug.h" #include "debug.h"
#include "hfp.h" #include "classic/hfp.h"
#include "hfp_ag.h" #include "classic/hfp_ag.h"
static const char default_hfp_ag_service_name[] = "Voice gateway"; static const char default_hfp_ag_service_name[] = "Voice gateway";
static uint16_t hfp_supported_features = HFP_DEFAULT_AG_SUPPORTED_FEATURES; static uint16_t hfp_supported_features = HFP_DEFAULT_AG_SUPPORTED_FEATURES;

4
src/classic/hfp_ag.h
View File

@ -46,8 +46,8 @@
#define btstack_hfp_ag_h #define btstack_hfp_ag_h
#include "hci.h" #include "hci.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
#include "hfp.h" #include "classic/hfp.h"
#if defined __cplusplus #if defined __cplusplus
extern "C" { extern "C" {

8
src/classic/hfp_hf.c
View File

@ -55,11 +55,11 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "debug.h" #include "debug.h"
#include "hfp.h" #include "classic/hfp.h"
#include "hfp_hf.h" #include "classic/hfp_hf.h"
static const char default_hfp_hf_service_name[] = "Hands-Free unit"; static const char default_hfp_hf_service_name[] = "Hands-Free unit";

4
src/classic/hfp_hf.h
View File

@ -46,8 +46,8 @@
#define btstack_hfp_hf_h #define btstack_hfp_hf_h
#include "hci.h" #include "hci.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
#include "hfp.h" #include "classic/hfp.h"
#if defined __cplusplus #if defined __cplusplus
extern "C" { extern "C" {

4
src/classic/hsp_ag.c
View File

@ -55,8 +55,8 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "debug.h" #include "debug.h"
#include "hsp_ag.h" #include "hsp_ag.h"

2
src/classic/hsp_ag.h
View File

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

4
src/classic/hsp_hs.c
View File

@ -55,8 +55,8 @@
#include "btstack_memory.h" #include "btstack_memory.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_query_rfcomm.h" #include "classic/sdp_query_rfcomm.h"
#include "sdp.h" #include "classic/sdp.h"
#include "debug.h" #include "debug.h"
#include "hsp_hs.h" #include "hsp_hs.h"

2
src/classic/hsp_hs.h
View File

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

2
src/classic/pan.c
View File

@ -46,7 +46,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "hci_cmds.h" #include "hci_cmds.h"
static const char default_panu_service_name[] = "Personal Ad-hoc User Service"; static const char default_panu_service_name[] = "Personal Ad-hoc User Service";

2
src/classic/remote_device_db_memory.c
View File

@ -38,7 +38,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "remote_device_db.h" #include "classic/remote_device_db.h"
#include "btstack_memory.h" #include "btstack_memory.h"
#include "debug.h" #include "debug.h"

2
src/classic/rfcomm.c
View File

@ -52,7 +52,7 @@
#include "hci.h" #include "hci.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "debug.h" #include "debug.h"
#include "rfcomm.h" #include "classic/rfcomm.h"
// workaround for missing PRIxPTR on mspgcc (16/20-bit MCU) // workaround for missing PRIxPTR on mspgcc (16/20-bit MCU)
#ifndef PRIxPTR #ifndef PRIxPTR

4
src/classic/sdp.c
View File

@ -39,12 +39,12 @@
* Implementation of the Service Discovery Protocol Server * Implementation of the Service Discovery Protocol Server
*/ */
#include "sdp.h" #include "classic/sdp.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "sdp_util.h" #include "classic/sdp_util.h"
#include "hci_dump.h" #include "hci_dump.h"
#include "l2cap.h" #include "l2cap.h"

6
src/classic/sdp_client.c
View File

@ -40,13 +40,13 @@
*/ */
#include "btstack-config.h" #include "btstack-config.h"
#include "sdp_client.h" #include "classic/sdp_client.h"
#include "hci_cmds.h" #include "hci_cmds.h"
#include "l2cap.h" #include "l2cap.h"
#include "sdp_parser.h" #include "classic/sdp_parser.h"
#include "sdp.h" #include "classic/sdp.h"
#include "debug.h" #include "debug.h"
typedef enum { typedef enum {

2
src/classic/sdp_parser.c
View File

@ -39,7 +39,7 @@
* sdp_parser.c * sdp_parser.c
*/ */
#include "hci_cmds.h" #include "hci_cmds.h"
#include "sdp_parser.h" #include "classic/sdp_parser.h"
#include "debug.h" #include "debug.h"
typedef enum { typedef enum {

Some files were not shown because too many files have changed in this diff Show More