fixup! pbdrv/bluetooth: RFCOMM socket API.

Fix lib/pbio/test build.

Author: jaguilar

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -1149,6 +1149,11 @@ static void link_db_settings_save(void) {
         return;
     }
     uint8_t *base = pbsys_storage_settings_get_link_key_db();
+    if (base == NULL) {
+        DEBUG_PRINT("No storage for link key database in settings\n");
+        gap_link_key_iterator_done(&it);
+        return;
+    }
     uint16_t off = 0;
 
     uint8_t count = 0;
@@ -2006,7 +2011,7 @@ void pbdrv_bluetooth_rfcomm_cancel_connection() {
     }
 }
 
-void pbdrv_bluetooth_rfcomm_disconnect_all(void) {
+void pbdrv_bluetooth_rfcomm_disconnect_all() {
     for (int i = 0; i < RFCOMM_SOCKET_COUNT; i++) {
         pbdrv_bluetooth_classic_rfcomm_socket_t *sock =
             &pbdrv_bluetooth_classic_rfcomm_sockets[i];

lib/pbio/include/pbsys/storage.h

@@ -29,6 +29,8 @@ pbio_error_t pbsys_storage_get_user_data(uint32_t offset, uint8_t **data, uint32
 
 void pbsys_storage_request_write(void);
 
+bool pbsys_storage_settings_ready();
+
 #else
 
 static inline uint32_t pbsys_storage_get_maximum_program_size(void) {
@@ -49,6 +51,10 @@ static inline pbio_error_t pbsys_storage_get_user_data(uint32_t offset, uint8_t
 static inline void pbsys_storage_request_write(void) {
 }
 
+static inline bool pbsys_storage_settings_ready() {
+    return true;
+}
+
 #endif // PBSYS_CONFIG_STORAGE
 
 #endif // _PBSYS_STORAGE_H_

lib/pbio/include/pbsys/storage_settings.h

@@ -64,8 +64,6 @@ static inline uint8_t *pbsys_storage_settings_get_link_key_db(void) {
 }
 #endif
 
-bool pbsys_storage_settings_ready();
-
 #else
 
 static inline void pbsys_storage_settings_set_defaults(pbsys_storage_settings_t *settings) {
@@ -77,8 +75,8 @@ static inline bool pbsys_storage_settings_bluetooth_enabled_get(void) {
 }
 static inline void pbsys_storage_settings_bluetooth_enabled_set(bool enable) {
 }
-static inline bool pbsys_storage_settings_ready() {
-    return true;
+static inline uint8_t *pbsys_storage_settings_get_link_key_db(void) {
+    return NULL;
 }
 
 #endif // PBSYS_CONFIG_STORAGE

lib/pbio/sys/storage.h

@@ -20,7 +20,6 @@ pbio_error_t pbsys_storage_set_program_data(uint32_t offset, const void *data, u
 bool pbsys_storage_slot_change_is_allowed(void);
 void pbsys_storage_get_program_data(pbsys_main_program_t *program);
 pbsys_storage_settings_t *pbsys_storage_settings_get_settings(void);
-bool pbsys_storage_settings_ready();
 
 #else
 static inline void pbsys_storage_init(void) {
@@ -50,9 +49,6 @@ static inline void pbsys_storage_get_program_data(pbsys_main_program_t *program)
     program->user_ram_start = &pbsys_storage_heap_start;
     program->user_ram_end = &pbsys_storage_heap_end;
 }
-static inline bool pbsys_storage_settings_ready() {
-    return true;
-}
 
 #endif // PBSYS_CONFIG_STORAGE
 

lib/pbio/test/Makefile

@@ -116,6 +116,16 @@ BTSTACK_SRC += $(addprefix $(BTSTACK_DIR)/platform/posix/,\
 	hci_dump_posix_stdout.c \
 	)
 
+BTSTACK_SRC = $(addprefix lib/btstack/src/classic/,\
+	btstack_link_key_db_memory.c \
+	rfcomm.c \
+	sdp_client.c \
+	sdp_client_rfcomm.c \
+	sdp_server.c \
+	sdp_util.c \
+	spp_server.c \
+	)
+
 # pbio library
 PBIO_DIR = ..
 PBIO_INC = -I$(PBIO_DIR)/include -I$(PBIO_DIR)