Shuta Nakamae
sa
Fork of
nRF51822
by 
Nordic Semiconductor
Revision 476:a95a18ef5e9c, committed 2015-11-26
- Comitter:
- rgrover1
- Date:
- Thu Nov 26 14:33:46 2015 +0000
- Parent:
- 475:fe3d08b3a8e9
- Child:
- 477:5de80a383c85
- Commit message:
- Synchronized with git rev dfb6ac29
Author: Liyou Zhou
Remove magic hash defines which are used in nrf51-sdk
nrf51-sdk files are modified to include these defines.
Changed in this revision
| source/btle/btle.cpp | Show annotated file Show diff for this revision Revisions of this file |
| source/nRF5xn.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/source/btle/btle.cpp Thu Nov 26 14:33:46 2015 +0000
+++ b/source/btle/btle.cpp Thu Nov 26 14:33:46 2015 +0000
@@ -31,7 +31,6 @@
#include "nRF5xGattServer.h"
#include "nRF5xSecurityManager.h"
-#define BLE_STACK_SUPPORT_REQD
extern "C" {
#include "pstorage.h"
#include "device_manager.h"
--- a/source/nRF5xn.cpp Thu Nov 26 14:33:46 2015 +0000
+++ b/source/nRF5xn.cpp Thu Nov 26 14:33:46 2015 +0000
@@ -20,8 +20,6 @@
#include "nrf_soc.h"
#include "btle/btle.h"
-
-#define asm __ASM
#include "nrf_delay.h"
extern "C" {