wip; compiles

Author: dhalbert

ports/nrf/Makefile

@@ -73,8 +73,6 @@ INC += -I$(BUILD)
 INC += -I$(BUILD)/genhdr
 INC += -I./../../lib/cmsis/inc
 INC += -I./boards/$(BOARD)
-INC += -I./modules/ubluepy
-INC += -I./modules/ble
 INC += -I./nrfx
 INC += -I./nrfx/hal
 INC += -I./nrfx/mdk
@@ -156,6 +154,7 @@ SRC_C += \
 	boards/$(BOARD)/pins.c \
 	device/$(MCU_VARIANT)/startup_$(MCU_SUB_VARIANT).c \
 	bluetooth/ble_drv.c \
+	common-hal/_bleio/bonding.c \
 	lib/libc/string0.c \
 	lib/mp-readline/readline.c \
 	lib/oofatfs/ff.c \

ports/nrf/background.c

@@ -43,6 +43,7 @@
 
 #if CIRCUITPY_BLEIO
 #include "supervisor/shared/bluetooth.h"
+#include "common-hal/_bleio/bonding.h"
 #endif
 
 static bool running_background_tasks = false;
@@ -68,6 +69,7 @@ void run_background_tasks(void) {
 
 #if CIRCUITPY_BLEIO
     supervisor_bluetooth_background();
+    bonding_background();
 #endif
 
     #if CIRCUITPY_DISPLAYIO

ports/nrf/common-hal/_bleio/Adapter.c

@@ -32,6 +32,7 @@
 
 #include "ble.h"
 #include "ble_drv.h"
+#include "bonding.h"
 #include "nrfx_power.h"
 #include "nrf_nvic.h"
 #include "nrf_sdm.h"
@@ -669,4 +670,5 @@ void bleio_adapter_reset(bleio_adapter_obj_t* adapter) {
         bleio_connection_internal_t *connection = &connections[i];
         connection->connection_obj = mp_const_none;
     }
+    bonding_reset();
 }

ports/nrf/common-hal/_bleio/Characteristic.c

@@ -33,6 +33,7 @@
 #include "shared-bindings/_bleio/Service.h"
 
 #include "common-hal/_bleio/Adapter.h"
+#include "common-hal/_bleio/bonding.h"
 
 STATIC uint16_t characteristic_get_cccd(uint16_t cccd_handle, uint16_t conn_handle) {
     uint16_t cccd;
@@ -92,9 +93,11 @@ STATIC bool characteristic_on_ble_evt(ble_evt_t *ble_evt, void *param) {
                 bleio_connection_obj_t *connection = self->service->connection;
                 uint16_t conn_handle = bleio_connection_get_conn_handle(connection);
                 if (conn_handle != BLE_CONN_HANDLE_INVALID &&
-                    connection->pairing_status == PAIR_PAIRED &&
-                    ble_evt->gatts_evt.params.write.handle == self->cccd_handle) {
-                    bonding_save_cccd_later(connection->is_central, conn_handle, connection->ediv);
+                    common_hal_bleio_connection_get_paired(connection) &&
+                    ble_evt->evt.gatts_evt.params.write.handle == self->cccd_handle) {
+                    bonding_save_cccd_info(
+                        connection->connection->is_central, conn_handle, connection->connection->ediv);
+                }
             }
             break;
         }

ports/nrf/common-hal/_bleio/Connection.c

@@ -47,6 +47,8 @@
 #include "shared-bindings/_bleio/Service.h"
 #include "shared-bindings/_bleio/UUID.h"
 
+#include "common-hal/_bleio/bonding.h"
+
 #define BLE_ADV_LENGTH_FIELD_SIZE   1
 #define BLE_ADV_AD_TYPE_FIELD_SIZE  1
 #define BLE_AD_TYPE_FLAGS_DATA_SIZE 1
@@ -212,7 +214,7 @@ bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
             ble_gap_evt_auth_status_t* status = &ble_evt->evt.gap_evt.params.auth_status;
             self->sec_status = status->auth_status;
             if (status->auth_status == BLE_GAP_SEC_STATUS_SUCCESS) {
-                self->ediv = bonding_keys->own_enc.master_id.ediv;
+                self->ediv = self->bonding_keys.own_enc.master_id.ediv;
                 self->pair_status = PAIR_PAIRED;
                 bonding_save_keys(self->is_central, self->conn_handle, &self->bonding_keys);
             } else {
@@ -227,13 +229,12 @@ bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
             // - Else return NULL --> Initiate key exchange
             ble_gap_evt_sec_info_request_t* sec_info_request = &ble_evt->evt.gap_evt.params.sec_info_request;
             (void) sec_info_request;
-            bond_keys bond_keys_t;
             if ( bonding_load_keys(self->is_central, sec_info_request->master_id.ediv, &self->bonding_keys) ) {
-                sd_ble_gap_sec_info_reply(self->conn_handle
+                sd_ble_gap_sec_info_reply(self->conn_handle,
                                           &self->bonding_keys.own_enc.enc_info,
                                           &self->bonding_keys.peer_id.id_info,
                                           NULL);
-                self->ediv = bond_keys.own_enc.master_id.ediv;
+                self->ediv = self->bonding_keys.own_enc.master_id.ediv;
             } else {
                 sd_ble_gap_sec_info_reply(self->conn_handle, NULL, NULL, NULL);
             }
@@ -249,12 +250,10 @@ bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
                 // mode >=1 and/or level >=1 means encryption is set up
                 self->pair_status = PAIR_NOT_PAIRED;
             } else {
-                uint8_t *sys_attr;
-                uint16_t sys_attr_len;
-                if (bonding_load_cccd_info(self->is_central, self->conn_handle, self->ediv, sys_attr, sys_attr_len)) {
-                    sd_ble_gatts_sys_attr_set(self->conn_handle, sys_attr, sys_attr_len, SVC_CONTEXT_FLAG);
-                // Not quite paired yet: wait for BLE_GAP_EVT_AUTH_STATUS SUCCESS.
-                self->ediv = self->bonding_keys.own_enc.master_id.ediv;
+                // Does an sd_ble_gatts_sys_attr_set() with the stored values.
+                if (bonding_load_cccd_info(self->is_central, self->conn_handle, self->ediv)) {
+                    // Not quite paired yet: wait for BLE_GAP_EVT_AUTH_STATUS SUCCESS.
+                    self->ediv = self->bonding_keys.own_enc.master_id.ediv;
                 } else {
                     // No matching bonding found, so use fresh system attributes.
                     sd_ble_gatts_sys_attr_set(self->conn_handle, NULL, 0, 0);
@@ -263,10 +262,6 @@ bool connection_on_ble_evt(ble_evt_t *ble_evt, void *self_in) {
             break;
         }
 
-        case BLE_GATTS_EVT_WRITE: {
-            if (self->pair_status == PAIR_PAIRED) &&
-
-
         default:
             return false;
     }
@@ -278,7 +273,7 @@ void bleio_connection_clear(bleio_connection_internal_t *self) {
 
     self->conn_handle = BLE_CONN_HANDLE_INVALID;
     self->pair_status = PAIR_NOT_PAIRED;
-    bonding_clear_keys(self);
+    bonding_clear_keys(&self->bonding_keys);
 }
 
 bool common_hal_bleio_connection_get_paired(bleio_connection_obj_t *self) {

ports/nrf/common-hal/_bleio/__init__.h

@@ -30,9 +30,9 @@
 void bleio_reset(void);
 
 typedef struct {
-  ble_gap_enc_key_t own_enc;
-  ble_gap_enc_key_t peer_enc;
-  ble_gap_id_key_t peer_id;
+    ble_gap_enc_key_t own_enc;
+    ble_gap_enc_key_t peer_enc;
+    ble_gap_id_key_t peer_id;
 } bonding_keys_t;
 
 // We assume variable length data.