Schoumi
/
nrf51-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
master
Liyou Zhou 2015-11-17 12:51:34 +00:00
parent edae269261
commit e68b1f8c39
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/extra_defines.cmake
View File

@ -1,2 +0,0 @@
add_definitions(-DBLE_STACK_SUPPORT_REQD)
add_definitions(-Dasm=__ASM)

2
source/nordic_sdk/components/drivers_nrf/hal/nrf_delay.h
View File

@ -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)

1
source/nordic_sdk/components/softdevice/common/softdevice_handler/ble_stack_handler_types.h
View File

@ -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>