fixup! pbdrv/bluetooth: RFCOMM socket API.

Fix assumption that umm_malloc is present.

Author: jaguilar

.vscode/c_cpp_properties.json

@@ -79,6 +79,7 @@
                 "gcc",
                 "MICROPY_MODULE_FROZEN_MPY",
                 "MICROPY_ROM_TEXT_COMPRESSION",
+                "HAVE_UMM_MALLOC=1"
             ],
             "compilerArgs": [
                 "-Wall",
@@ -286,7 +287,8 @@
             ],
             "defines": [
                 "MICROPY_MODULE_FROZEN_MPY",
-                "MICROPY_ROM_TEXT_COMPRESSION"
+                "MICROPY_ROM_TEXT_COMPRESSION",
+                "HAVE_UMM_MALLOC=1"
             ],
             "compilerArgs": [
                 "-mthumb",
@@ -404,7 +406,8 @@
             ],
             "defines": [
                 "MICROPY_MODULE_FROZEN_MPY",
-                "MICROPY_USE_READLINE=1"
+                "MICROPY_USE_READLINE=1",
+                "HAVE_UMM_MALLOC=1",
             ],
             "compilerPath": "/usr/bin/gcc",
             "cStandard": "c11",

bricks/_common/common.mk

@@ -527,7 +527,7 @@ SRC_STM32_USB_DEV += $(addprefix lib/pbio/drv/usb/stm32_usbd/,\
 SRC_UMM_MALLOC = lib/umm_malloc/src/umm_malloc.c
 
 ifeq ($(PB_LIB_UMM_MALLOC),1)
-CFLAGS += -I$(PBTOP)/lib/umm_malloc/src
+CFLAGS += -I$(PBTOP)/lib/umm_malloc/src -DHAVE_UMM_MALLOC=1
 endif
 
 # NXT OS

lib/pbio/drv/bluetooth/bluetooth.c

@@ -685,7 +685,9 @@ pbio_error_t pbdrv_bluetooth_close_user_tasks(pbio_os_state_t *state, pbio_os_ti
     // Requests peripheral operations to cancel, if they support it.
     pbdrv_bluetooth_cancel_operation_request();
 
+    #if PBDRV_CONFIG_BLUETOOTH_NUM_CLASSIC_CONNECTIONS
     pbdrv_bluetooth_rfcomm_disconnect_all();
+    #endif // PBDRV_CONFIG_BLUETOOTH_NUM_CLASSIC_CONNECTIONS
 
     for (peri_index = 0; peri_index < PBDRV_CONFIG_BLUETOOTH_NUM_PERIPHERALS; peri_index++) {
         peri = pbdrv_bluetooth_peripheral_get_by_index(peri_index);

lib/pbio/drv/bluetooth/bluetooth_btstack.c

@@ -21,11 +21,14 @@
 #include <classic/sdp_client.h>
 #include <classic/sdp_server.h>
 #include <classic/spp_server.h>
-#include <umm_malloc.h>
 #include <pbsys/storage.h>
 #include <pbsys/storage_settings.h>
 #include <lwrb/lwrb.h>
 
+#if HAVE_UMM_MALLOC
+#include <umm_malloc.h>
+#endif
+
 #include <pbdrv/bluetooth.h>
 #include <pbdrv/clock.h>
 
@@ -1225,15 +1228,36 @@ bool is_already_paired(bd_addr_t addr) {
     return gap_get_link_key_for_bd_addr(addr, key, &type);
 }
 
+#ifndef MAX_NR_RFCOMM_CHANNELS
+#define MAX_NR_RFCOMM_CHANNELS 0
+#endif
+
+#define RFCOMM_SOCKET_COUNT (MAX_NR_RFCOMM_CHANNELS > 0 ? MAX_NR_RFCOMM_CHANNELS - 1 : 0)
+#if HAVE_UMM_MALLOC
+#define RFCOMM_RX_BUFFER_SIZE (4 * 1024)
+#define RFCOMM_TX_BUFFER_SIZE (2 * 1024)
+#else
+// When we don't have umm_malloc, statically allocate small buffers.
+// This limits throughput but doesn't constraint the logical size of
+// messages we can send.
+#define RFCOMM_RX_BUFFER_SIZE (256)
+#define RFCOMM_TX_BUFFER_SIZE (256)
+#endif
+
 typedef struct {
-    uint8_t *tx_buffer_data;  // tx_buffer from customer. We don't own this.
+    #if HAVE_UMM_MALLOC
+    uint8_t *tx_buffer_data; // tx_buffer from customer. We don't own this.
     uint8_t *rx_buffer_data;
-    pbio_os_timer_t tx_timer;  // Timer for tracking timeouts on the current send.
-    pbio_os_timer_t rx_timer;  // Timer for tracking timeouts on the current receive.
-    lwrb_t tx_buffer;  // Ring buffer to contain outgoing data.
-    lwrb_t rx_buffer;  // Ring buffer to contain incoming data.
+    #else
+    uint8_t tx_buffer_data[RFCOMM_TX_BUFFER_SIZE];
+    uint8_t rx_buffer_data[RFCOMM_RX_BUFFER_SIZE];
+    #endif
+    pbio_os_timer_t tx_timer; // Timer for tracking timeouts on the current send.
+    pbio_os_timer_t rx_timer; // Timer for tracking timeouts on the current receive.
+    lwrb_t tx_buffer;         // Ring buffer to contain outgoing data.
+    lwrb_t rx_buffer;         // Ring buffer to contain incoming data.
 
-    int mtu;           // MTU for this connection.
+    int mtu; // MTU for this connection.
 
     // How many rfcomm credits are outstanding? When the connection is first started,
     // this is the rx buffer size divided by the MTU (the frame size). Each time we receive
@@ -1247,16 +1271,12 @@ typedef struct {
     uint16_t server_channel;  // The remote rfcomm channel we're connected to.
     bool is_used;             // Is this socket descriptor in use?
     bool is_connected;        // Is this socket descriptor connected?
-    bool is_cancelled; // Has this socket been cancelled? Interrupts pending
-                       // listen() or connect calls.
+    bool is_cancelled;        // Has this socket been cancelled? Interrupts pending
+                              // listen() or connect calls.
     bool is_using_sdp_system; // Is this socket currently using the SDP system?
 } pbdrv_bluetooth_classic_rfcomm_socket_t;
 
-#define MAX_NUM_CONNECTIONS (7)
-#define RFCOMM_RX_BUFFER_SIZE (4 * 1024)
-#define RFCOMM_TX_BUFFER_SIZE (2 * 1024)
-
-static pbdrv_bluetooth_classic_rfcomm_socket_t pbdrv_bluetooth_classic_rfcomm_sockets[MAX_NUM_CONNECTIONS];
+static pbdrv_bluetooth_classic_rfcomm_socket_t pbdrv_bluetooth_classic_rfcomm_sockets[RFCOMM_SOCKET_COUNT];
 
 static int pbdrv_bluetooth_classic_rfcomm_socket_max_credits(pbdrv_bluetooth_classic_rfcomm_socket_t *socket) {
     return RFCOMM_RX_BUFFER_SIZE / socket->mtu;
@@ -1282,6 +1302,7 @@ static void pbdrv_bluetooth_classic_rfcomm_socket_grant_owed_credits(pbdrv_bluet
 }
 
 static void pbdrv_bluetooth_classic_rfcomm_socket_reset(pbdrv_bluetooth_classic_rfcomm_socket_t *socket) {
+    #if HAVE_UMM_MALLOC
     if (socket->rx_buffer_data) {
         umm_free(socket->rx_buffer_data);
         socket->rx_buffer_data = NULL;
@@ -1290,6 +1311,7 @@ static void pbdrv_bluetooth_classic_rfcomm_socket_reset(pbdrv_bluetooth_classic_
         umm_free(socket->tx_buffer_data);
         socket->tx_buffer_data = NULL;
     }
+    #endif
     lwrb_free(&socket->rx_buffer);
     lwrb_free(&socket->tx_buffer);
     // A non-zero duration on these timers is used as a flag to indicate the
@@ -1307,18 +1329,20 @@ static void pbdrv_bluetooth_classic_rfcomm_socket_reset(pbdrv_bluetooth_classic_
 }
 
 static pbdrv_bluetooth_classic_rfcomm_socket_t *pbdrv_bluetooth_classic_rfcomm_socket_alloc() {
-    for (uint32_t i = 0; i < PBIO_ARRAY_SIZE(pbdrv_bluetooth_classic_rfcomm_sockets); i++) {
+    for (int i = 0; i < RFCOMM_SOCKET_COUNT; i++) {
         if (!pbdrv_bluetooth_classic_rfcomm_sockets[i].is_used) {
             pbdrv_bluetooth_classic_rfcomm_socket_t *sock = &pbdrv_bluetooth_classic_rfcomm_sockets[i];
             pbdrv_bluetooth_classic_rfcomm_socket_reset(sock);
             sock->is_used = true;
+            #if HAVE_UMM_MALLOC
             sock->rx_buffer_data = umm_malloc(RFCOMM_RX_BUFFER_SIZE);
             sock->tx_buffer_data = umm_malloc(RFCOMM_TX_BUFFER_SIZE);
-            if (!sock->rx_buffer_data) {
-                DEBUG_PRINT("Failed to allocate RFCOMM RX buffer.\n");
+            if (!sock->rx_buffer_data || !sock->tx_buffer_data) {
+                DEBUG_PRINT("Failed to allocate RFCOMM RX or TX buffer.\n");
                 sock->is_used = false;
                 return NULL;
             }
+            #endif
             lwrb_init(&sock->rx_buffer, sock->rx_buffer_data, RFCOMM_RX_BUFFER_SIZE);
             lwrb_init(&sock->tx_buffer, sock->tx_buffer_data, RFCOMM_TX_BUFFER_SIZE);
             return sock;
@@ -1330,7 +1354,7 @@ static pbdrv_bluetooth_classic_rfcomm_socket_t *pbdrv_bluetooth_classic_rfcomm_s
 
 
 static pbdrv_bluetooth_classic_rfcomm_socket_t *pbdrv_bluetooth_classic_rfcomm_socket_find_by_cid(uint16_t cid) {
-    for (size_t i = 0; i < MAX_NUM_CONNECTIONS; i++) {
+    for (int i = 0; i < RFCOMM_SOCKET_COUNT; i++) {
         if (pbdrv_bluetooth_classic_rfcomm_sockets[i].is_used &&
             pbdrv_bluetooth_classic_rfcomm_sockets[i].cid == cid) {
             return &pbdrv_bluetooth_classic_rfcomm_sockets[i];
@@ -1340,14 +1364,14 @@ static pbdrv_bluetooth_classic_rfcomm_socket_t *pbdrv_bluetooth_classic_rfcomm_s
 }
 
 static pbdrv_bluetooth_classic_rfcomm_socket_t *pbdrv_bluetooth_classic_rfcomm_socket_find_by_conn(const pbdrv_bluetooth_rfcomm_conn_t *c) {
-    if (c->conn_id < 0 || c->conn_id >= MAX_NUM_CONNECTIONS) {
+    if (c->conn_id < 0 || c->conn_id >= RFCOMM_SOCKET_COUNT) {
         return NULL;
     }
     return &pbdrv_bluetooth_classic_rfcomm_sockets[c->conn_id];
 }
 
 static int pbdrv_bluetooth_classic_rfcomm_socket_id(pbdrv_bluetooth_classic_rfcomm_socket_t *socket) {
-    for (size_t i = 0; i < MAX_NUM_CONNECTIONS; i++) {
+    for (int i = 0; i < RFCOMM_SOCKET_COUNT; i++) {
         if (&pbdrv_bluetooth_classic_rfcomm_sockets[i] == socket) {
             return i;
         }
@@ -1971,7 +1995,7 @@ bool pbdrv_bluetooth_rfcomm_is_connected(const pbdrv_bluetooth_rfcomm_conn_t *co
 }
 
 void pbdrv_bluetooth_rfcomm_cancel_connection() {
-    for (size_t i = 0; i < MAX_NUM_CONNECTIONS; i++) {
+    for (int i = 0; i < RFCOMM_SOCKET_COUNT; i++) {
         pbdrv_bluetooth_classic_rfcomm_socket_t *sock =
             &pbdrv_bluetooth_classic_rfcomm_sockets[i];
         if (sock->is_used) {
@@ -1981,7 +2005,7 @@ void pbdrv_bluetooth_rfcomm_cancel_connection() {
 }
 
 void pbdrv_bluetooth_rfcomm_disconnect_all() {
-    for (size_t i = 0; i < MAX_NUM_CONNECTIONS; i++) {
+    for (int i = 0; i < RFCOMM_SOCKET_COUNT; i++) {
         pbdrv_bluetooth_classic_rfcomm_socket_t *sock =
             &pbdrv_bluetooth_classic_rfcomm_sockets[i];
         if (sock->is_used && sock->is_connected) {
@@ -2204,7 +2228,7 @@ void pbdrv_bluetooth_init_hci(void) {
     hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_ERROR, true);
     hci_dump_enable_log_level(HCI_DUMP_LOG_LEVEL_DEBUG, true);
     hci_dump_enable_packet_log(false);
-#endif
+    #endif
 
     static btstack_packet_callback_registration_t hci_event_callback_registration;
 

lib/pbio/include/pbsys/config.h

@@ -18,6 +18,10 @@
     + PBSYS_CONFIG_FEATURE_PROGRAM_FORMAT_MULTI_MPY_V6_3_NATIVE * PBIO_PYBRICKS_FEATURE_FLAG_USER_PROG_FORMAT_MULTI_MPY_V6_3_NATIVE \
     )
 
+#ifndef PBSYS_CONFIG_BLUETOOTH_CLASSIC_LINK_KEY_DB_SIZE
+#define PBSYS_CONFIG_BLUETOOTH_CLASSIC_LINK_KEY_DB_SIZE 0
+#endif
+
 // When set to (1) PBSYS_CONFIG_STATUS_LIGHT indicates that a hub has a hub status light
 #ifndef PBSYS_CONFIG_STATUS_LIGHT
 #error "Must define PBSYS_CONFIG_STATUS_LIGHT in pbsysconfig.h"