Nordic Semiconductor / nrf51-sdk

Nordic nrf51 sdk sources. Mirrored from https://github.com/ARMmbed/nrf51-sdk.

Dependents:   nRF51822 nRF51822

Files at this revision

API Documentation at this revision

Revision 3:6d535ccf2f48, committed 2016-04-07

Comitter:
vcoubard
Date:
Thu Apr 07 17:37:19 2016 +0100
Parent:
2:40d78e68bc70
Child:
4:7019f1d6317d
Commit message:
Synchronized with git rev e68b1f8c
Author: Liyou Zhou
Move defines from cmake files into noridc files
This requires changing of nordic source but do away with
magic defines in parent modules

note on #define asm __ASM
all yotta mobule compile with -std=c99 which does not
include "asm" keyword.

Changed in this revision

source/nordic_sdk/components/drivers_nrf/hal/nrf_delay.h Show annotated file Show diff for this revision Revisions of this file
source/nordic_sdk/components/softdevice/common/softdevice_handler/ble_stack_handler_types.h Show annotated file Show diff for this revision Revisions of this file 
--- a/source/nordic_sdk/components/drivers_nrf/hal/nrf_delay.h	Thu Apr 07 17:37:18 2016 +0100
+++ b/source/nordic_sdk/components/drivers_nrf/hal/nrf_delay.h	Thu Apr 07 17:37:19 2016 +0100
@@ -3,6 +3,8 @@
 
 #include "nrf.h"
 
+#define asm __ASM
+
 /*lint --e{438, 522} "Variable not used" "Function lacks side-effects" */
 #if defined ( __CC_ARM   )
 static __ASM void __INLINE nrf_delay_us(uint32_t volatile number_of_us)

--- a/source/nordic_sdk/components/softdevice/common/softdevice_handler/ble_stack_handler_types.h	Thu Apr 07 17:37:18 2016 +0100
+++ b/source/nordic_sdk/components/softdevice/common/softdevice_handler/ble_stack_handler_types.h	Thu Apr 07 17:37:19 2016 +0100
@@ -22,6 +22,7 @@
 #ifndef BLE_STACK_HANDLER_TYPES_H__
 #define BLE_STACK_HANDLER_TYPES_H__
 
+#define BLE_STACK_SUPPORT_REQD
 #ifdef BLE_STACK_SUPPORT_REQD
 
 #include <stdlib.h>