mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-22 16:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/ios: use btstack_device_name_db_fs or _cocoa if appropriate

Browse Source
This commit is contained in:
Matthias Ringwald 2016-02-02 22:32:29 +01:00
parent ea809503bf
commit af204097d5
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platform/daemon/daemon.c
View File

@ -96,6 +96,12 @@
extern void hci_transport_h4_iphone_set_enforce_wake_device(char *path);
#endif
// copy of prototypes
const btstack_device_name_db_t * btstack_device_name_db_cocoa_instance(void);
const btstack_device_name_db_t * btstack_device_name_db_fs_instance(void);
const btstack_link_key_db_t * btstack_link_key_db_cocoa_instance(void);
const btstack_link_key_db_t * btstack_link_key_db_fs_instance(void);
#ifndef BTSTACK_LOG_FILE
#define BTSTACK_LOG_FILE "/tmp/hci_dump.pklg"
#endif
@ -2017,8 +2023,12 @@ int main (int argc, char * const * argv){
platform_iphone_register_preferences_changed(preferences_changed_callback);
#endif
#ifdef btstack_link_key_db
btstack_link_key_db = &btstack_link_key_db;
#ifdef BTSTACK_LINK_KEY_DB_INSTANCE
btstack_link_key_db = BTSTACK_LINK_KEY_DB_INSTANCE();
#endif
#ifdef BTSTACK_DEVICE_NAME_DB_INSTANCE
btstack_device_name_db = BTSTACK_DEVICE_NAME_DB_INSTANCE();
#endif
btstack_run_loop_init(btstack_run_loop_posix_get_instance());

25
port/daemon/configure.ac
View File

@ -65,8 +65,9 @@ case "$host_os" in
LDFLAGS="$LDFLAGS -framework CoreFoundation -framework Foundation"
BTSTACK_LIB_LDFLAGS="-dynamiclib -install_name \$(prefix)/lib/libBTstack.dylib"
BTSTACK_LIB_EXTENSION="dylib"
REMOTE_DEVICE_DB_SOURCES="btstack_link_key_db_cocoa.m rfcomm_service_db_cocoa.m"
REMOTE_DEVICE_DB="remote_device_db_cocoa"
REMOTE_DEVICE_DB_SOURCES="btstack_link_key_db_cocoa.m btstack_device_name_db_cocoa.m rfcomm_service_db_cocoa.m"
BTSTACK_LINK_KEY_DB_INSTANCE="btstack_link_key_db_cocoa_instance"
BTSTACK_DEVICE_NAME_DB_INSTANCE="btstack_device_name_db_cocoa_instance"
HAVE_SO_NOSIGPIPE="yes";
;;
mingw*)
@ -75,13 +76,15 @@ case "$host_os" in
BTSTACK_LIB_LDFLAGS="-shared"
BTSTACK_LIB_EXTENSION="dll"
REMOTE_DEVICE_DB_SOURCES="btstack_link_key_db_memory.c rfcomm_service_db_memory.c"
REMOTE_DEVICE_DB="btstack_link_key_db_memory"
BTSTACK_LINK_KEY_DB_INSTANCE="btstack_link_key_db_memory_instance"
# BTSTACK_DEVICE_NAME_DB_INSTANCE="btstack_device_name_db_memory_instance"
;;
*)
BTSTACK_LIB_LDFLAGS="-shared -Wl,-rpath,\$(prefix)/lib"
BTSTACK_LIB_EXTENSION="so"
REMOTE_DEVICE_DB_SOURCES="btstack_link_key_db_memory.c rfcomm_service_db_memory.c"
REMOTE_DEVICE_DB="btstack_link_key_db_memory"
REMOTE_DEVICE_DB_SOURCES="btstack_link_key_db_memory.c btstack_device_name_db_fs.c rfcomm_service_db_memory.c"
BTSTACK_LINK_KEY_DB_INSTANCE="btstack_link_key_db_memory_instance"
BTSTACK_DEVICE_NAME_DB_INSTANCE="btstack_device_name_db_fs_instance"
;;
esac
@ -108,8 +111,9 @@ else
echo "UART_SPEED: $UART_SPEED"
fi
echo "REMOTE_DEVICE_DB: $REMOTE_DEVICE_DB"
echo "HAVE_SO_NOSIGPIPE: $HAVE_SO_NOSIGPIPE"
echo "BTSTACK_LINK_KEY_DB: $BTSTACK_LINK_KEY_DB_INSTANCE"
echo "BTSTACK_DEVICE_NAME_DB: $BTSTACK_DEVICE_NAME_DB_INSTANCE"
echo "HAVE_SO_NOSIGPIPE: $HAVE_SO_NOSIGPIPE"
echo
echo
@ -163,8 +167,11 @@ else
echo "#define UART_DEVICE \"$UART_DEVICE\"" >> btstack_config.h
echo "#define UART_SPEED $UART_SPEED" >> btstack_config.h
fi
if test ! -z "$REMOTE_DEVICE_DB" ; then
echo "#define REMOTE_DEVICE_DB $REMOTE_DEVICE_DB" >> btstack_config.h
if test ! -z "$BTSTACK_LINK_KEY_DB_INSTANCE" ; then
echo "#define BTSTACK_LINK_KEY_DB_INSTANCE $BTSTACK_LINK_KEY_DB_INSTANCE" >> btstack_config.h
fi
if test ! -z "$BTSTACK_DEVICE_NAME_DB_INSTANCE" ; then
echo "#define BTSTACK_DEVICE_NAME_DB_INSTANCE $BTSTACK_DEVICE_NAME_DB_INSTANCE" >> btstack_config.h
fi
echo >> btstack_config.h

5
port/ios/btstack_config.h
View File

@ -23,13 +23,14 @@
#define HCI_ACL_PAYLOAD_SIZE 1021
// Daemon configuration
#define BTSTACK_DEVICE_NAME_DB_INSTANCE btstack_device_name_db_cocoa_instance
#define BTSTACK_LINK_KEY_DB_INSTANCE btstack_link_key_db_cocoa_instance
#define ENABLE_RFCOMM
#define ENABLE_SDP
#define HAVE_TRANSPORT_H4
#define UART_DEVICE "/dev/tty.bluetooth"
#define UART_SPEED 921600
#define REMOTE_DEVICE_DB remote_device_db_iphone
#define USE_SPRINGBOARD
#define USE_LAUNCHD
#define USE_SPRINGBOARD
#endif