Revision 493:46fbcb7eab5b, committed 2015-12-02

Comitter:

rgrover1

Date:

Wed Dec 02 10:31:32 2015 +0000

Parent:

492:c03f54ed1607

Child:

494:ed0e3d0353e2

Commit message:

Synchronized with git rev 348c323d
Author: Liyou Zhou
Take modification out of the nordic sdk files
and put them into ARM written files.

Changed in this revision

--- a/source/btle/btle.cpp	Wed Dec 02 10:31:32 2015 +0000
+++ b/source/btle/btle.cpp	Wed Dec 02 10:31:32 2015 +0000
@@ -19,7 +19,6 @@
 
 #include "btle.h"
 
-#include "ble_stack_handler_types.h"
 #include "ble_flash.h"
 #include "ble_conn_params.h"
 
@@ -27,15 +26,18 @@
 #include "btle_advertising.h"
 #include "custom/custom_helper.h"
 
-#include "softdevice_handler.h"
-#include "pstorage.h"
-
 #include "ble/GapEvents.h"
 #include "nRF5xGap.h"
 #include "nRF5xGattServer.h"
 #include "nRF5xSecurityManager.h"
 
+#define BLE_STACK_SUPPORT_REQD
+extern "C" {
+#include "pstorage.h"
 #include "device_manager.h"
+#include "softdevice_handler.h"
+#include "ble_stack_handler_types.h"
+}
 
 #include "ble_hci.h"
 #include "btle_discovery.h"

--- a/source/btle/btle_security.cpp	Wed Dec 02 10:31:32 2015 +0000
+++ b/source/btle/btle_security.cpp	Wed Dec 02 10:31:32 2015 +0000
@@ -15,12 +15,15 @@
  */
 
 #include "btle.h"
-#include "pstorage.h"
 
 #include "nRF5xGap.h"
 #include "nRF5xSecurityManager.h"
 
+extern "C" {
+#include "pstorage.h"
 #include "device_manager.h"
+}
+
 #include "btle_security.h"
 
 static dm_application_instance_t applicationInstance;

--- a/source/nRF5xGap.h	Wed Dec 02 10:31:32 2015 +0000
+++ b/source/nRF5xGap.h	Wed Dec 02 10:31:32 2015 +0000
@@ -26,7 +26,11 @@
 #include "ble/GapScanningParams.h"
 
 #include "nrf_soc.h"
+
+extern "C" {
 #include "ble_radio_notification.h"
+}
+
 #include "btle_security.h"
 
 void radioNotificationStaticCallback(bool param);

--- a/source/nRF5xn.cpp	Wed Dec 02 10:31:32 2015 +0000
+++ b/source/nRF5xn.cpp	Wed Dec 02 10:31:32 2015 +0000
@@ -20,9 +20,13 @@
 #include "nrf_soc.h"
 
 #include "btle/btle.h"
+
+#define asm __ASM
 #include "nrf_delay.h"
 
+extern "C" {
 #include "softdevice_handler.h"
+}
 
 /**
  * The singleton which represents the nRF51822 transport for the BLE.