Yoshihiro TSUBOI
Originally from Donal's blog article. http://mbed.org/users/donalm/code/BLE_Health_Thermometer_Blog/ Changed low freq. clock source from XTAL to IRC.
Dependents: BLE_Health_Thermometer_IRC BLE_RCBController_micono_test BLE_konashi_PIO_test BLE_ADT7410_TMP102_Sample ... more
Fork of
BLE_API_Native_blog
by 
Donal Morrissey
Revision 4:2f1f20c755ed, committed 2014-02-07
- Comitter:
- ktownsend
- Date:
- Fri Feb 07 16:04:09 2014 +0000
- Parent:
- 3:cb37056dbcc6
- Child:
- 5:2dca0528db6a
- Commit message:
- Added nordic_global.h to solve conditional compilation issues
Changed in this revision
--- a/hw/nRF51822n/nRF51822n.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nRF51822n.h Fri Feb 07 16:04:09 2014 +0000 @@ -17,6 +17,11 @@ #ifndef __NRF51822_H__ #define __NRF51822_H__ +#define NRF51 +#define DEBUG_NRF_USER +#define BLE_STACK_SUPPORT_REQD +#define BOARD_PCA10001 + #include "mbed.h" #include "blecommon.h" #include "hw/BLEDevice.h"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hw/nRF51822n/nordic/nordic_global.h Fri Feb 07 16:04:09 2014 +0000 @@ -0,0 +1,11 @@ +#ifndef _NORDIC_GLOBAL_H_ +#define _NORDIC_GLOBAL_H_ + +/* There are no global defines in mbed, so we need to define */ +/* mandatory conditional compilation flags here */ +#define NRF51 +#define DEBUG_NRF_USER +#define BLE_STACK_SUPPORT_REQD +#define BOARD_PCA10001 + +#endif \ No newline at end of file
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/app_button.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/app_button.h Fri Feb 07 16:04:09 2014 +0000 @@ -40,6 +40,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" #include "nrf.h" #include "app_error.h" #include "app_scheduler.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/app_error.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/app_error.h Fri Feb 07 16:04:09 2014 +0000 @@ -24,6 +24,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" #include "nrf_error.h" /**@brief Function for error handling, which is called when an error has occurred.
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/app_fifo.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/app_fifo.h Fri Feb 07 16:04:09 2014 +0000 @@ -24,6 +24,7 @@ #include <stdint.h> #include <stdlib.h> +#include "nordic_global.h" #include "nrf_error.h" /**@brief A FIFO instance structure. Keeps track of which bytes to read and write next.
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/app_gpiote.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/app_gpiote.h Fri Feb 07 16:04:09 2014 +0000 @@ -40,6 +40,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" #include "nrf.h" #include "app_error.h" #include "app_util.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/app_scheduler.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/app_scheduler.h Fri Feb 07 16:04:09 2014 +0000 @@ -49,6 +49,7 @@ #define APP_SCHEDULER_H__ #include <stdint.h> +#include "nordic_global.h" #include "app_error.h" #define APP_SCHED_EVENT_HEADER_SIZE 8 /**< Size of app_scheduler.event_header_t (only for use inside APP_SCHED_BUF_SIZE()). */
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/app_timer.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/app_timer.h Fri Feb 07 16:04:09 2014 +0000 @@ -44,6 +44,7 @@ #include <stdint.h> #include <stdbool.h> #include <stdio.h> +#include "nordic_global.h" #include "app_error.h" #include "app_util.h" #include "app_scheduler.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/app_uart.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/app_uart.h Fri Feb 07 16:04:09 2014 +0000 @@ -24,6 +24,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" #include "app_util.h" #define UART_PIN_DISCONNECTED 0xFFFFFFFF /**< Value indicating that no pin is connected to this UART register. */
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/app_util.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/app_util.h Fri Feb 07 16:04:09 2014 +0000 @@ -23,6 +23,7 @@ #define APP_UTIL_H__ #include <stdint.h> +#include "nordic_global.h" #include "compiler_abstraction.h" #include "nrf51.h" #include "app_error.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/crc16.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/crc16.h Fri Feb 07 16:04:09 2014 +0000 @@ -23,6 +23,7 @@ #define CRC16_H__ #include <stdint.h> +#include "nordic_global.h" /**@brief Function for calculating CRC-16 in blocks. *
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_mem_pool.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_mem_pool.h Fri Feb 07 16:04:09 2014 +0000 @@ -46,6 +46,7 @@ #define HCI_MEM_POOL_H__ #include <stdint.h> +#include "nordic_global.h" #include "nrf_error.h" /**@brief Function for opening the module.
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_slip.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_slip.h Fri Feb 07 16:04:09 2014 +0000 @@ -32,6 +32,7 @@ #define HCI_SLIP_H__ #include <stdint.h> +#include "nordic_global.h" /**@brief Event types from the SLIP Layer. */ typedef enum
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_transport.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/hci_transport.h Fri Feb 07 16:04:09 2014 +0000 @@ -76,6 +76,7 @@ #define HCI_TRANSPORT_H__ #include <stdint.h> +#include "nordic_global.h" #include "nrf_error.h" /**@brief Generic event callback function events. */
--- a/hw/nRF51822n/nordic/nrf-sdk/app_common/pstorage.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/app_common/pstorage.h Fri Feb 07 16:04:09 2014 +0000 @@ -25,6 +25,7 @@ #ifndef PSTORAGE_H__ #define PSTORAGE_H__ +#include "nordic_global.h" #include "pstorage_platform.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_advdata.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_advdata.h Fri Feb 07 16:04:09 2014 +0000 @@ -25,6 +25,7 @@ #include <stdint.h> #include <stdbool.h> #include <string.h> +#include "nordic_global.h" #include "ble.h" #include "app_util.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_advdata_parser.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_advdata_parser.h Fri Feb 07 16:04:09 2014 +0000 @@ -1,6 +1,7 @@ #ifndef BLE_ADVDATA_PARSER_H_ #define BLE_ADVDATA_PARSER_H_ +#include "nordic_global.h" #include "ble_advdata.h" uint32_t ble_advdata_parse(uint8_t * p_data, uint8_t len, ble_advdata_t * advdata);
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_bondmngr.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_bondmngr.h Fri Feb 07 16:04:09 2014 +0000 @@ -100,6 +100,7 @@ #define BLE_BONDMNGR_H__ #include <stdint.h> +#include "nordic_global.h" #include "ble.h" #include "ble_srv_common.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_central_bondmngr.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_central_bondmngr.h Fri Feb 07 16:04:09 2014 +0000 @@ -1,6 +1,7 @@ #ifndef __BLE_CENTRAL_BONDMNGR_H_ #define __BLE_CENTRAL_BONDMNGR_H_ +#include "nordic_global.h" #include "ble.h" #include "ble_gap.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_conn_params.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_conn_params.h Fri Feb 07 16:04:09 2014 +0000 @@ -22,6 +22,7 @@ #define BLE_CONN_PARAMS_H__ #include <stdint.h> +#include "nordic_global.h" #include "ble.h" #include "ble_srv_common.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_date_time.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_date_time.h Fri Feb 07 16:04:09 2014 +0000 @@ -10,7 +10,7 @@ */ /* Attention! -* To maintain compliance with Nordic Semiconductor ASAs Bluetooth profile +* To maintain compliance with Nordic Semiconductor ASA�s Bluetooth profile * qualification listings, this section of source code must not be modified. */ @@ -30,6 +30,7 @@ #define BLE_DATE_TIME_H__ #include <stdint.h> +#include "nordic_global.h" /**@brief Date and Time structure. */ typedef struct
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_debug_assert_handler.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_debug_assert_handler.h Fri Feb 07 16:04:09 2014 +0000 @@ -27,6 +27,7 @@ #define BLE_DEBUG_ASSERT_HANDLER_H__ #include <stdint.h> +#include "nordic_global.h" /**@brief Function for handling the Debug assert, which can be called from an error handler. * To be used only for debugging purposes.
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_dtm.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_dtm.h Fri Feb 07 16:04:09 2014 +0000 @@ -23,6 +23,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" /**@brief Configuration parameters. */
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_error_log.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_error_log.h Fri Feb 07 16:04:09 2014 +0000 @@ -27,6 +27,7 @@ #include <stdint.h> #include <stdbool.h> #include "ble_flash.h" +#include "nordic_global.h" #define ERROR_MESSAGE_LENGTH 128 /**< Length of error message to stored. */ #define STACK_DUMP_LENGTH 256 /**< Length of stack to be stored at max: 64 entries of 4 bytes each. */
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_flash.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_flash.h Fri Feb 07 16:04:09 2014 +0000 @@ -33,6 +33,7 @@ #include <stdint.h> #include <stdbool.h> #include <nrf51.h> +#include "nordic_global.h" #define BLE_FLASH_PAGE_SIZE ((uint16_t)NRF_FICR->CODEPAGESIZE) /**< Size of one flash page. */ #define BLE_FLASH_MAGIC_NUMBER 0x45DE0000 /**< Magic value to identify if flash contains valid data. */
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_racp.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_racp.h Fri Feb 07 16:04:09 2014 +0000 @@ -22,6 +22,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" #include "ble.h" #include "ble_types.h" #include "ble.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_radio_notification.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_radio_notification.h Fri Feb 07 16:04:09 2014 +0000 @@ -22,6 +22,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" #include "nrf_soc.h" /**@brief Application radio notification event handler type. */
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_sensorsim.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_sensorsim.h Fri Feb 07 16:04:09 2014 +0000 @@ -25,6 +25,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" /**@brief Triangular waveform sensor simulator configuration. */ typedef struct
--- a/hw/nRF51822n/nordic/nrf-sdk/ble/ble_services/ble_srv_common.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/ble/ble_services/ble_srv_common.h Fri Feb 07 16:04:09 2014 +0000 @@ -23,6 +23,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" #include "ble_types.h" #include "app_util.h" #include "ble_gap.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/boards.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/boards.h Fri Feb 07 16:04:09 2014 +0000 @@ -12,6 +12,8 @@ #ifndef BOARDS_H #define BOARDS_H +#include "nordic_global.h" + #if defined(BOARD_NRF6310) #include "boards/nrf6310.h" #elif defined(BOARD_PCA10000)
--- a/hw/nRF51822n/nordic/nrf-sdk/common.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/common.h Fri Feb 07 16:04:09 2014 +0000 @@ -17,6 +17,7 @@ #include <stdbool.h> #include <stdint.h> +#include "nordic_global.h" /* @file * @brief Common header file for generic macros and definitions
--- a/hw/nRF51822n/nordic/nrf-sdk/compiler_abstraction.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/compiler_abstraction.h Fri Feb 07 16:04:09 2014 +0000 @@ -14,6 +14,8 @@ #ifndef _COMPILER_ABSTRACTION_H #define _COMPILER_ABSTRACTION_H +#include "nordic_global.h" + /*lint ++flb "Enter library region" */ #if defined ( __CC_ARM )
--- a/hw/nRF51822n/nordic/nrf-sdk/console.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/console.h Fri Feb 07 16:04:09 2014 +0000 @@ -82,6 +82,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" /* Newline character sequences */ #define CONSOLE_NEWLINE_CRLF "\r\n" //!< CRLF newline
--- a/hw/nRF51822n/nordic/nrf-sdk/nordic_common.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nordic_common.h Fri Feb 07 16:04:09 2014 +0000 @@ -16,6 +16,8 @@ #ifndef NORDIC_COMMON_H__ #define NORDIC_COMMON_H__ +#include "nordic_global.h" + /** Swaps the upper byte with the lower byte in a 16 bit variable */ //lint -emacro((572),SWAP) // Suppress warning 572 "Excessive shift value" #define SWAP(x) ((((x)&0xFF)<<8)|(((x)>>8)&0xFF))
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nrf.h Fri Feb 07 16:04:09 2014 +0000 @@ -14,11 +14,7 @@ #ifndef NRF_H #define NRF_H -/* KTOWN: 06022014: Added here to ensure these are always available */ -#define NRF51 -#define DEBUG_NRF_USER -#define BLE_STACK_SUPPORT_REQD -#define BOARD_PCA10001 +#include "nordic_global.h" #ifndef _WIN32
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf51_bitfields.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nrf51_bitfields.h Fri Feb 07 16:04:09 2014 +0000 @@ -17,6 +17,7 @@ /*lint ++flb "Enter library region */ #include <core_cm0.h> +#include "nordic_global.h" /* Peripheral: AAR */ /* Description: Accelerated Address Resolver. */
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf51_deprecated.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nrf51_deprecated.h Fri Feb 07 16:04:09 2014 +0000 @@ -14,6 +14,8 @@ #ifndef NRF51_DEPRECATED_H #define NRF51_DEPRECATED_H +#include "nordic_global.h" + /*lint ++flb "Enter library region */ /* This file is given to prevent your SW from not compiling with the updates made to nrf51.h and
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf_assert.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nrf_assert.h Fri Feb 07 16:04:09 2014 +0000 @@ -15,6 +15,7 @@ #define NRF_ASSERT_H_ #include <stdint.h> +#include "nordic_global.h" #if defined(DEBUG_NRF) || defined(DEBUG_NRF_USER)
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf_delay.h Thu Feb 06 13:05:36 2014 +0000
+++ b/hw/nRF51822n/nordic/nrf-sdk/nrf_delay.h Fri Feb 07 16:04:09 2014 +0000
@@ -1,6 +1,7 @@
#ifndef _NRF_DELAY_H
#define _NRF_DELAY_H
+#include "nordic_global.h"
#include "nrf.h"
/*lint --e{438, 522} "Variable not used" "Function lacks side-effects" */
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf_ecb.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nrf_ecb.h Fri Feb 07 16:04:09 2014 +0000 @@ -30,6 +30,7 @@ */ #include <stdint.h> +#include "nordic_global.h" /** * Initialize and power on the ECB peripheral.
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf_gpio.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nrf_gpio.h Fri Feb 07 16:04:09 2014 +0000 @@ -1,6 +1,7 @@ #ifndef NRF_GPIO_H__ #define NRF_GPIO_H__ +#include "nordic_global.h" #include "nrf51.h" #include "nrf51_bitfields.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf_gpiote.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nrf_gpiote.h Fri Feb 07 16:04:09 2014 +0000 @@ -12,6 +12,7 @@ #ifndef NRF_GPIOTE_H__ #define NRF_GPIOTE_H__ +#include "nordic_global.h" #include "nrf.h" /**
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf_nvmc.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nrf_nvmc.h Fri Feb 07 16:04:09 2014 +0000 @@ -20,6 +20,7 @@ #define NRF_NVMC_H__ #include <stdint.h> +#include "nordic_global.h" /**
--- a/hw/nRF51822n/nordic/nrf-sdk/nrf_temp.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/nrf_temp.h Fri Feb 07 16:04:09 2014 +0000 @@ -13,6 +13,7 @@ #ifndef NRF_TEMP_H__ #define NRF_TEMP_H__ +#include "nordic_global.h" #include "nrf51.h" /**
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/ble.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/ble.h Fri Feb 07 16:04:09 2014 +0000 @@ -18,6 +18,7 @@ #ifndef BLE_H__ #define BLE_H__ +#include "nordic_global.h" #include "ble_ranges.h" #include "ble_types.h" #include "ble_gap.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/ble_err.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/ble_err.h Fri Feb 07 16:04:09 2014 +0000 @@ -24,6 +24,7 @@ #ifndef NRF_BLE_ERR_H__ #define NRF_BLE_ERR_H__ +#include "nordic_global.h" #include "nrf_error.h" /* @defgroup BLE_ERRORS Error Codes
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gap.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gap.h Fri Feb 07 16:04:09 2014 +0000 @@ -14,6 +14,7 @@ #ifndef BLE_GAP_H__ #define BLE_GAP_H__ +#include "nordic_global.h" #include "ble_types.h" #include "ble_ranges.h" #include "nrf_svc.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gatt.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gatt.h Fri Feb 07 16:04:09 2014 +0000 @@ -14,6 +14,7 @@ #ifndef BLE_GATT_H__ #define BLE_GATT_H__ +#include "nordic_global.h" #include "ble_types.h" #include "ble_ranges.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gattc.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gattc.h Fri Feb 07 16:04:09 2014 +0000 @@ -14,6 +14,7 @@ #ifndef BLE_GATTC_H__ #define BLE_GATTC_H__ +#include "nordic_global.h" #include "ble_gatt.h" #include "ble_types.h" #include "ble_ranges.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gatts.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/ble_gatts.h Fri Feb 07 16:04:09 2014 +0000 @@ -14,6 +14,7 @@ #ifndef BLE_GATTS_H__ #define BLE_GATTS_H__ +#include "nordic_global.h" #include "ble_types.h" #include "ble_ranges.h" #include "ble_l2cap.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/ble_l2cap.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/ble_l2cap.h Fri Feb 07 16:04:09 2014 +0000 @@ -14,6 +14,7 @@ #ifndef BLE_L2CAP_H__ #define BLE_L2CAP_H__ +#include "nordic_global.h" #include "ble_types.h" #include "ble_ranges.h" #include "ble_err.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/ble_types.h Thu Feb 06 13:05:36 2014 +0000
+++ b/hw/nRF51822n/nordic/nrf-sdk/s110/ble_types.h Fri Feb 07 16:04:09 2014 +0000
@@ -18,6 +18,7 @@
#define BLE_TYPES_H__
#include <stdint.h>
+#include "nordic_global.h"
/** @addtogroup BLE_COMMON_DEFINES Defines
* @{ */
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_sdm.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_sdm.h Fri Feb 07 16:04:09 2014 +0000 @@ -18,6 +18,7 @@ #ifndef NRF_SDM_H__ #define NRF_SDM_H__ +#include "nordic_global.h" #include "nrf_svc.h" #include "nrf51.h" #include "nrf_soc.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_soc.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_soc.h Fri Feb 07 16:04:09 2014 +0000 @@ -19,6 +19,7 @@ #include <stdint.h> #include <stdbool.h> +#include "nordic_global.h" #include "nrf_svc.h" #include "nrf51.h" #include "nrf51_bitfields.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_svc.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/nrf_svc.h Fri Feb 07 16:04:09 2014 +0000 @@ -1,6 +1,8 @@ #ifndef NRF_SVC__ #define NRF_SVC__ +#include "nordic_global.h" + #ifdef SVCALL_AS_NORMAL_FUNCTION #define SVCALL(number, return_type, signature) return_type signature #else
--- a/hw/nRF51822n/nordic/nrf-sdk/s110/softdevice_assert.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/s110/softdevice_assert.h Fri Feb 07 16:04:09 2014 +0000 @@ -14,6 +14,7 @@ #define SOFTDEVICE_ASSERT_H_ #include <stdint.h> +#include "nordic_global.h" /** @brief This function handles assertions. *
--- a/hw/nRF51822n/nordic/nrf-sdk/sd_common/ant_stack_handler_types.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/sd_common/ant_stack_handler_types.h Fri Feb 07 16:04:09 2014 +0000 @@ -25,6 +25,7 @@ #ifdef ANT_STACK_SUPPORT_REQD #include <stdlib.h> +#include "nordic_global.h" #define ANT_STACK_EVT_MSG_BUF_SIZE 32 /**< Size of ANT event message buffer. This will be provided to the SoftDevice while fetching an event. */ #define ANT_STACK_EVT_STRUCT_SIZE (sizeof(ant_evt_t)) /**< Size of the @ref ant_evt_t structure. This will be used by the @ref softdevice_handler.h to internal event buffer size needed. */
--- a/hw/nRF51822n/nordic/nrf-sdk/sd_common/ble_stack_handler_types.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/sd_common/ble_stack_handler_types.h Fri Feb 07 16:04:09 2014 +0000 @@ -22,6 +22,8 @@ #ifndef BLE_STACK_HANDLER_TYPES_H__ #define BLE_STACK_HANDLER_TYPES_H__ +#include "nordic_global.h" + #ifdef BLE_STACK_SUPPORT_REQD #include <stdlib.h>
--- a/hw/nRF51822n/nordic/nrf-sdk/sd_common/softdevice_handler.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/sd_common/softdevice_handler.h Fri Feb 07 16:04:09 2014 +0000 @@ -33,6 +33,7 @@ #define SOFTDEVICE_HANDLER_H__ #include <stdlib.h> +#include "nordic_global.h" #include "nrf_sdm.h" #include "app_error.h" #include "app_scheduler.h"
--- a/hw/nRF51822n/nordic/nrf-sdk/simple_uart.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/simple_uart.h Fri Feb 07 16:04:09 2014 +0000 @@ -17,6 +17,7 @@ #include <stdbool.h> #include <stdint.h> +#include "nordic_global.h" /** @file * @brief Simple UART driver
--- a/hw/nRF51822n/nordic/nrf-sdk/spi_master.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/spi_master.h Fri Feb 07 16:04:09 2014 +0000 @@ -15,6 +15,7 @@ #include <stdbool.h> #include <stdint.h> +#include "nordic_global.h" /** @file * @brief Software controlled SPI Master driver.
--- a/hw/nRF51822n/nordic/nrf-sdk/spi_slave.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/spi_slave.h Fri Feb 07 16:04:09 2014 +0000 @@ -23,6 +23,7 @@ #define SPI_SLAVE_H__ #include <stdint.h> +#include "nordic_global.h" #include "nrf_error.h" /**@brief SPI transaction bit order definitions. */
--- a/hw/nRF51822n/nordic/nrf-sdk/system_nrf51.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/system_nrf51.h Fri Feb 07 16:04:09 2014 +0000 @@ -19,6 +19,7 @@ #endif #include <stdint.h> +#include "nordic_global.h" extern uint32_t SystemCoreClock; /*!< System Clock Frequency (Core Clock) */
--- a/hw/nRF51822n/nordic/nrf-sdk/twi_master.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/nrf-sdk/twi_master.h Fri Feb 07 16:04:09 2014 +0000 @@ -17,6 +17,7 @@ #include <stdbool.h> #include <stdint.h> +#include "nordic_global.h" /** @file * @brief Software controlled TWI Master driver.
--- a/hw/nRF51822n/nordic/pstorage_platform.h Thu Feb 06 13:05:36 2014 +0000 +++ b/hw/nRF51822n/nordic/pstorage_platform.h Fri Feb 07 16:04:09 2014 +0000 @@ -20,6 +20,7 @@ #define PSTORAGE_PL_H__ #include <stdint.h> +#include "nordic_global.h" #define PSTORAGE_FLASH_PAGE_SIZE ((uint16_t)NRF_FICR->CODEPAGESIZE) /**< Size of one flash page. */ #define PSTORAGE_FLASH_EMPTY_MASK 0xFFFFFFFF /**< Bit mask that defines an empty address in flash. */