From af204097d5c951c752e17284a699567c2ec6d503 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Tue, 2 Feb 2016 22:32:29 +0100
Subject: [PATCH] daemon/ios: use btstack_device_name_db_fs or _cocoa if
 appropriate

---
 platform/daemon/daemon.c  | 14 ++++++++++++--
 port/daemon/configure.ac  | 25 ++++++++++++++++---------
 port/ios/btstack_config.h |  5 +++--
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/platform/daemon/daemon.c b/platform/daemon/daemon.c
index ee0aebaed..09ec6a09f 100644
--- a/platform/daemon/daemon.c
+++ b/platform/daemon/daemon.c
@@ -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());
diff --git a/port/daemon/configure.ac b/port/daemon/configure.ac
index ec69e04fe..7f739f9ea 100644
--- a/port/daemon/configure.ac
+++ b/port/daemon/configure.ac
@@ -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
diff --git a/port/ios/btstack_config.h b/port/ios/btstack_config.h
index b5d7e5b34..1df435e8c 100644
--- a/port/ios/btstack_config.h
+++ b/port/ios/btstack_config.h
@@ -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
\ No newline at end of file