!deleteme: Temp commit

This is just to get things
compiling.

Author: jaguilar

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -3,6 +3,7 @@
 
 // Bluetooth driver using BlueKitchen BTStack.
 
+#include <btstack_config.h>
 #include <pbdrv/config.h>
 
 #if PBDRV_CONFIG_BLUETOOTH_BTSTACK
@@ -21,9 +22,10 @@
 #include <classic/sdp_client.h>
 #include <classic/sdp_server.h>
 #include <classic/spp_server.h>
+#include <gap.h>
+#include <lwrb/lwrb.h>
 #include <pbsys/storage.h>
 #include <pbsys/storage_settings.h>
-#include <lwrb/lwrb.h>
 
 #if HAVE_UMM_MALLOC
 #include <umm_malloc.h>
@@ -61,7 +63,7 @@
 #define PERIPHERAL_TIMEOUT_MS_CONNECT       (5000)
 #define PERIPHERAL_TIMEOUT_MS_PAIRING       (5000)
 
-#define DEBUG 0
+#define DEBUG 2
 
 #if DEBUG
 #include <pbio/debug.h>
@@ -1847,6 +1849,7 @@ pbio_error_t pbdrv_bluetooth_rfcomm_listen(
     // ready when the bluetooth system is initialized, but it will be ready by
     // the time we try to make any rfcomm connections.
     link_db_settings_load_once();
+    gap_discoverable_control(1);
 
     sock = pbdrv_bluetooth_classic_rfcomm_socket_alloc();
     if (!sock) {
@@ -1884,11 +1887,12 @@ pbio_error_t pbdrv_bluetooth_rfcomm_listen(
     }
 
     DEBUG_PRINT("[btc:rfcomm_listen] Connected\n");
+    gap_discoverable_control(0);
 
     PBIO_OS_ASYNC_END(PBIO_SUCCESS);
 
-cleanup:
-    ;
+cleanup:;
+    gap_discoverable_control(0);
     pbio_error_t err = sock->err;
     pbdrv_bluetooth_classic_rfcomm_socket_reset(sock);
     return err;

lib/pbio/platform/virtual_hub/btstack_config.h

@@ -60,6 +60,24 @@
 #define MAX_NR_MESH_TRANSPORT_KEYS    16
 #define MAX_NR_MESH_VIRTUAL_ADDRESSES 16
 
+#define MAX_ATT_DB_SIZE 512
+#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES 20
+#define MAX_NR_HCI_CONNECTIONS 7 // CC2560/A limit.
+#define MAX_NR_HFP_CONNECTIONS 0
+// Up to 7 RFCOMM channels, plus 2 for transient use.
+#define MAX_NR_L2CAP_CHANNELS 9
+#define MAX_NR_L2CAP_SERVICES 7
+// We can have up to 7 connections, so we keep one extra spare.
+#define MAX_NR_RFCOMM_CHANNELS 8
+// We have one rfcomm service for the SPP profile.
+#define MAX_NR_RFCOMM_MULTIPLEXERS 1
+#define MAX_NR_RFCOMM_SERVICES 1
+#define MAX_NR_SERVICE_RECORD_ITEMS 1
+#define MAX_NR_SM_LOOKUP_ENTRIES 3
+#define MAX_NR_WHITELIST_ENTRIES 0
+#define MAX_NR_LE_DEVICE_DB_ENTRIES 3
+#define MAX_NR_SDP_CLIENTS 1
+
 // allow for one NetKey update
 #define MAX_NR_MESH_NETWORK_KEYS      (MAX_NR_MESH_SUBNETS + 1)
 

lib/pbio/platform/virtual_hub/pbdrvconfig.h

@@ -16,6 +16,8 @@
 #define PBDRV_CONFIG_BLUETOOTH_BTSTACK                      (1)
 #define PBDRV_CONFIG_BLUETOOTH_BTSTACK_LE_SERVER            (1)
 #define PBDRV_CONFIG_BLUETOOTH_BTSTACK_POSIX                (1)
+#define PBDRV_CONFIG_BLUETOOTH_BTSTACK_CLASSIC (1)
+
 #define PBDRV_CONFIG_BLUETOOTH_BTSTACK_HUB_KIND             (LWP3_HUB_KIND_TECHNIC_LARGE)
 #endif // PBDRV_CONFIG_RUN_ON_CI
 

lib/pbio/platform/virtual_hub/pbsysconfig.h

@@ -28,3 +28,4 @@
 #define PBSYS_CONFIG_TELEMETRY                      (1)
 #define PBSYS_CONFIG_USER_PROGRAM                   (0)
 #define PBSYS_CONFIG_PROGRAM_STOP                   (1)
+#define PBSYS_CONFIG_BLUETOOTH_CLASSIC_LINK_KEY_DB_SIZE (2 + 20 * 23)