- nRF51822 include cleanup

linuxdevel · Oct 3, 2015 · eb27d52 · eb27d52
1 parent 1586331
commit eb27d52
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/nRF51822.cpp b/nRF51822.cpp
@@ -1,19 +1,13 @@
 #if defined(NRF51) || defined(__RFduino__)
 
 #ifdef __RFduino__
-  #include <utility/nrf51822/s110/ble_gatts.h>
-  #include <utility/nrf51822/s110/ble_hci.h>
-  #include <utility/nrf51822/sd_common/ble_stack_handler_types.h>
-  #include <utility/nrf51822/nordic_common.h>
-  #include <utility/nrf51822/s110/nrf_sdm.h>
-  #include <utility/nrf51822/s110/nrf_soc.h>
+  #include <utility/RFduino/ble.h>
+  #include <utility/RFduino/ble_hci.h>
+  #include <utility/RFduino/nrf_sdm.h>
 #else
-  #include <s110/ble_gatts.h>
+  #include <s110/ble.h>
   #include <s110/ble_hci.h>
-  #include <sd_common/ble_stack_handler_types.h>
-  #include <nordic_common.h>
   #include <s110/nrf_sdm.h>
-  #include <s110/nrf_soc.h>
 #endif
 
 #include "Arduino.h"
@@ -29,6 +23,8 @@
 
 // #define NRF_51822_DEBUG
 
+#define BLE_STACK_EVT_MSG_BUF_SIZE       (sizeof(ble_evt_t) + (GATT_MTU_SIZE_DEFAULT))
+
 nRF51822::nRF51822() :
   BLEDevice(),
 

diff --git a/nRF51822.h b/nRF51822.h
@@ -2,13 +2,11 @@
 #define _NRF_51822_H_
 
 #ifdef __RFduino__
-  #include <utility/nrf51822/s110/ble_gatts.h>
-  #include <utility/nrf51822/s110/ble_gattc.h>
-  #include <utility/nrf51822/s110/nrf_soc.h>
+  #include <utility/RFduino/ble_gatts.h>
+  #include <utility/RFduino/ble_gattc.h>
 #else
   #include <s110/ble_gatts.h>
   #include <s110/ble_gattc.h>
-  #include <s110/nrf_soc.h>
 #endif
 
 #include "BLEDevice.h"