Merge pull request #6308 from donatieng/nrf52x_ble5_events

Support for nRF52x BLE 4.2 and 5 events

Author: cmonr

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/btle/btle.cpp

@@ -369,6 +369,53 @@ static void btle_handler(ble_evt_t *p_ble_evt)
             break;
         }
 
+
+#if  (NRF_SD_BLE_API_VERSION >= 5)
+#ifndef S140
+        // Handle PHY upgrade request
+        case BLE_GAP_EVT_PHY_UPDATE_REQUEST:
+        {
+            ble_gap_phys_t const phys =
+            {
+                /* rx_phys */ BLE_GAP_PHY_AUTO,
+                /* tx_phys */ BLE_GAP_PHY_AUTO,
+            };
+            ASSERT_STATUS_RET_VOID( sd_ble_gap_phy_update(p_ble_evt->evt.gap_evt.conn_handle, &phys) );
+            break;
+        }
+#endif
+
+        	// Handle Data length negotiation request
+        case BLE_GAP_EVT_DATA_LENGTH_UPDATE_REQUEST:
+        {
+            ble_gap_evt_t       const * p_gap_evt = &p_ble_evt->evt.gap_evt;
+            uint8_t const data_length_peer =
+                p_gap_evt->params.data_length_update_request.peer_params.max_tx_octets;
+
+            const uint8_t max_data_length = NRF_SDH_BLE_GATT_MAX_MTU_SIZE + 4 /* L2CAP header size */;
+
+            uint8_t const data_length = MIN(max_data_length, data_length_peer);
+
+            ble_gap_data_length_params_t const dlp =
+            {
+                /* max_rx_octets */ data_length,
+                /* max_tx_octets */ data_length
+            };
+
+            ASSERT_STATUS_RET_VOID(sd_ble_gap_data_length_update(p_gap_evt->conn_handle, &dlp, NULL));
+        		break;
+        }
+
+        	// Handle MTU exchange request
+        case BLE_GATTS_EVT_EXCHANGE_MTU_REQUEST:
+        {
+        		// Respond with the server MTU
+            uint16_t   conn_handle = p_ble_evt->evt.gatts_evt.conn_handle;
+            ASSERT_STATUS_RET_VOID(sd_ble_gatts_exchange_mtu_reply(conn_handle, NRF_SDH_BLE_GATT_MAX_MTU_SIZE));
+        		break;
+        }
+#endif
+
         case BLE_GAP_EVT_PASSKEY_DISPLAY:
             securityManager.processPasskeyDisplayEvent(p_ble_evt->evt.gap_evt.conn_handle, p_ble_evt->evt.gap_evt.params.passkey_display.passkey);
             break;

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5x/source/nRF5xn.cpp

@@ -222,8 +222,10 @@ nRF5xn::waitForEvent(void)
 }
 
 void nRF5xn::processEvents() {
-    if (isEventsSignaled) {
+    core_util_critical_section_enter();
+    while (isEventsSignaled) {
         isEventsSignaled = false;
+        core_util_critical_section_exit();
         #if NRF_SD_BLE_API_VERSION >= 5
         // We use the "polling" dispatch model
         // http://infocenter.nordicsemi.com/topic/com.nordic.infocenter.sdk5.v14.2.0/group__nrf__sdh.html?cp=4_0_0_6_11_60_20#gab4d7be69304d4f5feefd1d440cc3e6c7
@@ -232,5 +234,8 @@ void nRF5xn::processEvents() {
         #else
         intern_softdevice_events_execute();
         #endif
+
+        core_util_critical_section_enter();
     }
+    core_util_critical_section_exit();
 }