You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/10/03 20:28:58 UTC

[5/6] incubator-mynewt-core git commit: Add #ifdef __cplusplus guards

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/nrf51xxx/include/mcu/cortex_m0.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf51xxx/include/mcu/cortex_m0.h b/hw/mcu/nordic/nrf51xxx/include/mcu/cortex_m0.h
index ff85dc2..3f41ee3 100644
--- a/hw/mcu/nordic/nrf51xxx/include/mcu/cortex_m0.h
+++ b/hw/mcu/nordic/nrf51xxx/include/mcu/cortex_m0.h
@@ -22,6 +22,10 @@
 
 #include "nrf51.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * The nRF51 microcontroller uses RTC0 for periodic interrupts and it is
  * clocked at 32768Hz. The tick frequency is chosen such that it divides
@@ -29,4 +33,8 @@
  */
 #define OS_TICKS_PER_SEC    (128)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __MCU_CORTEX_M0_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/nrf52xxx/include/mcu/cortex_m4.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf52xxx/include/mcu/cortex_m4.h b/hw/mcu/nordic/nrf52xxx/include/mcu/cortex_m4.h
index 09e9c93..e5a6a86 100644
--- a/hw/mcu/nordic/nrf52xxx/include/mcu/cortex_m4.h
+++ b/hw/mcu/nordic/nrf52xxx/include/mcu/cortex_m4.h
@@ -23,10 +23,18 @@
 #include "syscfg/syscfg.h"
 #include "nrf52.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if MYNEWT_VAL(XTAL_32768)
 #define OS_TICKS_PER_SEC    (128)
 #else
 #define OS_TICKS_PER_SEC    (1000)
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __MCU_CORTEX_M4_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/compiler_abstraction.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/compiler_abstraction.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/compiler_abstraction.h
index 6a41e8e..ba5e691 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/compiler_abstraction.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/compiler_abstraction.h
@@ -30,6 +30,10 @@
 #ifndef _COMPILER_ABSTRACTION_H
 #define _COMPILER_ABSTRACTION_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region" */
 
 #if defined ( __CC_ARM )
@@ -123,4 +127,8 @@
 
 /*lint --flb "Leave library region" */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf.h
index fa24afa..031d4ab 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf.h
@@ -31,6 +31,10 @@
 #ifndef NRF_H
 #define NRF_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* MDK version */
 #define MDK_MAJOR_VERSION   8
 #define MDK_MINOR_VERSION   5
@@ -62,5 +66,9 @@
 
 #endif /* _WIN32 || __unix || __APPLE__ */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_H */
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_bitfields.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_bitfields.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_bitfields.h
index 5c5af9a..ec7cf01 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_bitfields.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_bitfields.h
@@ -30,6 +30,10 @@
 #ifndef __NRF51_BITS_H
 #define __NRF51_BITS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region" */
 
 /* Peripheral: AAR */
@@ -6889,4 +6893,8 @@
 
 
 /*lint --flb "Leave library region" */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_deprecated.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_deprecated.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_deprecated.h
index 0c7d7df..8e503ca 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_deprecated.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_deprecated.h
@@ -31,6 +31,10 @@
 #ifndef NRF51_DEPRECATED_H
 #define NRF51_DEPRECATED_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region */
 
 /* This file is given to prevent your SW from not compiling with the updates made to nrf51.h and 
@@ -434,5 +438,9 @@
 
 /*lint --flb "Leave library region" */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF51_DEPRECATED_H */
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_to_nrf52.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_to_nrf52.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_to_nrf52.h
index 16ae6f7..0d4c2cf 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_to_nrf52.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf51_to_nrf52.h
@@ -31,6 +31,10 @@
 #ifndef NRF51_TO_NRF52_H
 #define NRF51_TO_NRF52_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region */
 
 /* This file is given to prevent your SW from not compiling with the name changes between nRF51 and nRF52 devices.
@@ -931,5 +935,9 @@
 
 /*lint --flb "Leave library region" */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF51_TO_NRF52_H */
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_bitfields.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_bitfields.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_bitfields.h
index ae959d4..1f4aa88 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_bitfields.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_bitfields.h
@@ -30,6 +30,10 @@
 #ifndef __NRF52_BITS_H
 #define __NRF52_BITS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region" */
 
 /* Peripheral: AAR */
@@ -14858,4 +14862,8 @@
 
 
 /*lint --flb "Leave library region" */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_name_change.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_name_change.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_name_change.h
index 5ce8ba4..987a145 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_name_change.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/device/nrf52_name_change.h
@@ -31,6 +31,10 @@
 #ifndef NRF52_NAME_CHANGE_H
 #define NRF52_NAME_CHANGE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region */
 
 /* This file is given to prevent your SW from not compiling with the updates made to nrf52.h and 
@@ -66,5 +70,9 @@
 
 /*lint --flb "Leave library region" */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF52_NAME_CHANGE_H */
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/adc/nrf_drv_adc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/adc/nrf_drv_adc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/adc/nrf_drv_adc.h
index 90f60ac..fac5752 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/adc/nrf_drv_adc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/adc/nrf_drv_adc.h
@@ -72,6 +72,10 @@ typedef struct
 
 /**@brief Macro for initializing the ADC channel with the default configuration. */
 #define NRF_DRV_ADC_DEFAULT_CHANNEL(analog_input)          \
+#ifdef __cplusplus
+extern "C" {
+#endif
+
  {{{                                                       \
     .resolution = NRF_ADC_CONFIG_RES_10BIT,                \
     .input      = NRF_ADC_CONFIG_SCALING_INPUT_FULL_SCALE, \
@@ -284,5 +288,9 @@ __STATIC_INLINE nrf_adc_config_input_t nrf_drv_adc_gpio_to_ain(uint32_t pin)
         return NRF_ADC_CONFIG_INPUT_DISABLED;
     }
 }
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ble_flash/ble_flash.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ble_flash/ble_flash.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ble_flash/ble_flash.h
index 149bf65..080ea5a 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ble_flash/ble_flash.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ble_flash/ble_flash.h
@@ -34,6 +34,10 @@
 #include <stdbool.h>
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #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. */
 #define BLE_FLASH_EMPTY_MASK    0xFFFFFFFF                          /**< Bit mask that defines an empty address in flash. */
@@ -137,6 +141,10 @@ uint16_t ble_flash_crc16_compute(uint8_t * p_data, uint16_t size, uint16_t * p_c
  */
 void ble_flash_on_radio_active_evt(bool radio_active);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // BLE_FLASH_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/clock/nrf_drv_clock.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/clock/nrf_drv_clock.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/clock/nrf_drv_clock.h
index 0ad098e..78e13d9 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/clock/nrf_drv_clock.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/clock/nrf_drv_clock.h
@@ -21,6 +21,10 @@
 #include "nrf_drv_config.h"
 #include "nrf_drv_common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *
  * @addtogroup nrf_clock Clock HAL and driver
@@ -243,4 +247,8 @@ __STATIC_INLINE uint32_t nrf_drv_clock_ppi_event_addr(nrf_clock_event_t event)
 #endif //SUPPRESS_INLINE_IMPLEMENTATION
 
 /*lint --flb "Leave library region" */
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_CLOCK_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/common/nrf_drv_common.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/common/nrf_drv_common.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/common/nrf_drv_common.h
index 927f401..356ff72 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/common/nrf_drv_common.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/common/nrf_drv_common.h
@@ -20,6 +20,10 @@
 #include "nrf_drv_config.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Offset of event registers in every peripheral instance
  *
@@ -191,4 +195,8 @@ __STATIC_INLINE bool nrf_drv_is_in_RAM(void const * const ptr)
 
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_COMMON_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/comp/nrf_drv_comp.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/comp/nrf_drv_comp.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/comp/nrf_drv_comp.h
index b61e0d3..b1d8d49 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/comp/nrf_drv_comp.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/comp/nrf_drv_comp.h
@@ -19,6 +19,10 @@
 #include "nrf_drv_config.h"
 #include "app_util_platform.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup nrf_comp COMP HAL and driver
  * @ingroup nrf_drivers
@@ -265,4 +269,8 @@ __STATIC_INLINE uint8_t nrf_drv_comp_ain_to_gpio(nrf_comp_input_t ain)
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
  #endif /* NRF_DRV_COMP_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config.h
index 74e18f9..e823d6c 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config.h
@@ -13,6 +13,10 @@
 #ifndef NRF_DRV_CONFIG_H
 #define NRF_DRV_CONFIG_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Provide a non-zero value here in applications that need to use several
  * peripherals with the same ID that are sharing certain resources
@@ -461,4 +465,8 @@
 
 #include "nrf_drv_config_validation.h"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_CONFIG_H

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config_validation.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config_validation.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config_validation.h
index f2b6adc..fa1bb8f 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config_validation.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/config/nrf_drv_config_validation.h
@@ -13,6 +13,10 @@
 #ifndef NRF_DRV_CONFIG_VALIDATION_H
 #define NRF_DRV_CONFIG_VALIDATION_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef NRF52
 
 #if (!PERIPHERAL_RESOURCE_SHARING_ENABLED) && \
@@ -80,4 +84,8 @@
 
 #endif //NRF51
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_CONFIG_VALIDATION_H

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/delay/nrf_delay.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/delay/nrf_delay.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/delay/nrf_delay.h
index c41e444..5114df7 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/delay/nrf_delay.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/delay/nrf_delay.h
@@ -3,6 +3,10 @@
 
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Function for delaying execution for number of microseconds.
  *
@@ -239,4 +243,8 @@ __ASM volatile (
 
 void nrf_delay_ms(uint32_t volatile number_of_ms);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/gpiote/nrf_drv_gpiote.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/gpiote/nrf_drv_gpiote.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/gpiote/nrf_drv_gpiote.h
index e8345d1..efb8bb8 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/gpiote/nrf_drv_gpiote.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/gpiote/nrf_drv_gpiote.h
@@ -13,6 +13,10 @@
 #ifndef NRF_DRV_GPIOTE__
 #define NRF_DRV_GPIOTE__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup nrf_gpiote GPIOTE abstraction and driver
  * @ingroup nrf_drivers
@@ -306,4 +310,8 @@ void nrf_drv_gpiote_out_task_trigger(nrf_drv_gpiote_pin_t pin);
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //NRF_DRV_GPIOTE__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_adc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_adc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_adc.h
index 66da0e6..56fce31 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_adc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_adc.h
@@ -13,6 +13,10 @@
 #ifndef NRF_ADC_H_
 #define NRF_ADC_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_adc_hal ADC HAL
  * @{
@@ -413,4 +417,8 @@ __STATIC_INLINE void nrf_adc_disable(void)
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_ADC_H_ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_clock.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_clock.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_clock.h
index 902442c..b9839dc 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_clock.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_clock.h
@@ -18,6 +18,10 @@
  
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_clock_hal Clock HAL
  * @{
@@ -411,4 +415,8 @@ __STATIC_INLINE void nrf_clock_cal_timer_timeout_set(uint32_t interval)
 /**
  *@}
  **/
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_CLOCK_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_comp.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_comp.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_comp.h
index b4c83b8..b1a3b71 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_comp.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_comp.h
@@ -18,6 +18,10 @@
 #ifndef NRF_COMP_H_
 #define NRF_COMP_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_comp_hal COMP HAL
  * @{
@@ -466,4 +470,8 @@ __STATIC_INLINE bool nrf_comp_event_check(nrf_comp_event_t comp_event)
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_COMP_H_ 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ecb.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ecb.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ecb.h
index 4c88f60..7c3f3d2 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ecb.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ecb.h
@@ -19,6 +19,10 @@
 #ifndef NRF_ECB_H__
 #define NRF_ECB_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_ecb AES ECB encryption
  * @{
@@ -61,6 +65,10 @@ bool nrf_ecb_crypt(uint8_t * dst, const uint8_t * src);
  */
 void nrf_ecb_set_key(const uint8_t * key);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  // NRF_ECB_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_egu.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_egu.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_egu.h
index 1ffe714..105839c 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_egu.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_egu.h
@@ -13,6 +13,10 @@
 #ifndef NRF_EGU_H__
 #define NRF_EGU_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef NRF52
     #error EGU is not supported on your chip.
 #endif
@@ -283,4 +287,8 @@ __STATIC_INLINE nrf_egu_int_mask_t nrf_egu_int_get(uint8_t channel)
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpio.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpio.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpio.h
index 0d2de6b..3e8b2d7 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpio.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpio.h
@@ -15,6 +15,10 @@
 #include "nrf.h"
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_gpio GPIO abstraction
  * @{
@@ -644,4 +648,8 @@ __STATIC_INLINE void nrf_gpio_port_clear(nrf_gpio_port_select_t port, uint8_t cl
 #endif //SUPPRESS_INLINE_IMPLEMENTATION
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpiote.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpiote.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpiote.h
index a525f6e..e493f44 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpiote.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_gpiote.h
@@ -17,6 +17,10 @@
 #include <stddef.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
 * @defgroup nrf_gpiote_abs GPIOTE abstraction
 * @{
@@ -388,4 +392,8 @@ __STATIC_INLINE void nrf_gpiote_te_default(uint32_t idx)
 #endif //SUPPRESS_INLINE_IMPLEMENTATION
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_i2s.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_i2s.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_i2s.h
index f464dbc..2dca3a2 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_i2s.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_i2s.h
@@ -28,6 +28,10 @@
 #include "nrf.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief This value can be provided as a parameter for the @ref nrf_i2s_pins_set
  *        function call to specify that a given I2S signal (SDOUT, SDIN, or MCK)
@@ -518,6 +522,10 @@ __STATIC_INLINE uint32_t * nrf_i2s_tx_buffer_get(NRF_I2S_Type const * p_i2s)
 
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_I2S_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_lpcomp.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_lpcomp.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_lpcomp.h
index 8aadb15..7056dfb 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_lpcomp.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_lpcomp.h
@@ -18,6 +18,10 @@
 #ifndef NRF_LPCOMP_H_
 #define NRF_LPCOMP_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_lpcomp_hal LPCOMP HAL
  * @{
@@ -364,4 +368,8 @@ __STATIC_INLINE bool nrf_lpcomp_event_check(nrf_lpcomp_event_t lpcomp_event)
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_LPCOMP_H_ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_nvmc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_nvmc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_nvmc.h
index 95ff228..a975f5f 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_nvmc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_nvmc.h
@@ -22,6 +22,10 @@
 #include <stdint.h>
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_nvmc Non-volatile memory controller
  * @{
@@ -84,6 +88,10 @@ void nrf_nvmc_write_bytes(uint32_t  address, const uint8_t * src, uint32_t num_b
 void nrf_nvmc_write_words(uint32_t address, const uint32_t * src, uint32_t num_words);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_NVMC_H__
 /** @} */
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pdm.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pdm.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pdm.h
index 2b7a4ec..9b07545 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pdm.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pdm.h
@@ -14,6 +14,10 @@
 #ifndef NRF_PDM_H_
 #define NRF_PDM_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_pdm_hal PDM HAL
  * @{
@@ -356,4 +360,8 @@ __STATIC_INLINE uint32_t * nrf_pdm_buffer_get()
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_PDM_H_ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ppi.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ppi.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ppi.h
index 60541db..c7d8dbe 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ppi.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_ppi.h
@@ -16,6 +16,10 @@
 #include <stddef.h>
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_ppi_hal PPI HAL
  * @{
@@ -399,4 +403,8 @@ __STATIC_INLINE uint32_t * nrf_ppi_task_group_disable_address_get(nrf_ppi_channe
  **/
 
 /*lint --flb "Leave library region" */
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_PPI_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pwm.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pwm.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pwm.h
index 13296d7..8fc4bbb 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pwm.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_pwm.h
@@ -30,6 +30,10 @@
 #include "nrf_assert.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief This value can be provided as a parameter for the @ref nrf_pwm_pins_set
  *        function call to specify that a given output channel shall not be
@@ -656,6 +660,10 @@ __STATIC_INLINE void nrf_pwm_loop_set(NRF_PWM_Type * p_pwm,
 
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_PWM_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_qdec.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_qdec.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_qdec.h
index 92de8fc..499df98 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_qdec.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_qdec.h
@@ -16,6 +16,10 @@
 #include "nrf_error.h"
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region" */
 
 /**
@@ -465,4 +469,8 @@ __STATIC_INLINE uint32_t nrf_qdec_ledpol_get(void)
  **/
 
 /*lint --flb "Leave library region" */
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rng.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rng.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rng.h
index b696588..415fad6 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rng.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rng.h
@@ -17,6 +17,10 @@
 
 #ifndef NRF_RNG_H__
 #define NRF_RNG_H__
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_rng_hal RNG HAL
  * @{
@@ -208,4 +212,8 @@ __STATIC_INLINE void nrf_rng_error_correction_disable(void)
 /**
  *@}
  **/
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_RNG_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rtc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rtc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rtc.h
index 814da83..ad05f61 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rtc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_rtc.h
@@ -18,6 +18,10 @@
 #ifndef NRF_RTC_H
 #define NRF_RTC_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_rtc_hal RTC HAL
  * @{
@@ -301,4 +305,8 @@ __STATIC_INLINE void nrf_rtc_event_disable(NRF_RTC_Type * p_rtc, uint32_t mask)
 }
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif  /* NRF_RTC_H */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_saadc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_saadc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_saadc.h
index 6824c30..f2b6805 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_saadc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_saadc.h
@@ -14,6 +14,10 @@
 #ifndef NRF_SAADC_H_
 #define NRF_SAADC_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_saadc_hal SAADC HAL
  * @{
@@ -551,4 +555,8 @@ void nrf_saadc_channel_init(uint8_t channel, nrf_saadc_channel_config_t const *
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_SAADC_H_ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spi.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spi.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spi.h
index a571ed1..98dd662 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spi.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spi.h
@@ -28,6 +28,10 @@
 #include "nrf.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief This value can be used as a parameter for the @ref nrf_spi_pins_set
  *        function to specify that a given SPI signal (SCK, MOSI, or MISO)
@@ -329,6 +333,10 @@ __STATIC_INLINE void nrf_spi_configure(NRF_SPI_Type * p_spi,
 
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_SPI_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spim.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spim.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spim.h
index f76aaad..7c05956 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spim.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spim.h
@@ -28,6 +28,10 @@
 #include "nrf.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief This value can be used as a parameter for the @ref nrf_spim_pins_set
  *        function to specify that a given SPI signal (SCK, MOSI, or MISO)
@@ -515,6 +519,10 @@ __STATIC_INLINE void nrf_spim_rx_list_disable(NRF_SPIM_Type * p_spim)
 #endif
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_SPIM_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spis.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spis.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spis.h
index 1f250b5..273e048 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spis.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_spis.h
@@ -28,6 +28,10 @@
 #include "nrf.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief This value can be used as a parameter for the @ref nrf_spis_pins_set
  *        function to specify that a given SPI signal (SCK, MOSI, or MISO)
@@ -507,6 +511,10 @@ __STATIC_INLINE void nrf_spis_def_set(NRF_SPIS_Type * p_spis,
 
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_SPIS_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_temp.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_temp.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_temp.h
index d108072..2075bd6 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_temp.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_temp.h
@@ -15,6 +15,10 @@
 
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
 * @defgroup nrf_temperature TEMP (temperature) abstraction
 * @{
@@ -52,4 +56,8 @@ static __INLINE int32_t nrf_temp_read(void)
 
 /** @} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_timer.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_timer.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_timer.h
index 2568d5f..c252506 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_timer.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_timer.h
@@ -29,6 +29,10 @@
 #include "nrf_assert.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Macro for validating the correctness of the BIT_WIDTH setting.
  */
@@ -571,6 +575,10 @@ __STATIC_INLINE uint32_t nrf_timer_ms_to_ticks(uint32_t time_ms,
 
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_TIMER_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twi.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twi.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twi.h
index 4f38df2..b5ddaeb 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twi.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twi.h
@@ -13,6 +13,10 @@
 #ifndef NRF_TWI_H__
 #define NRF_TWI_H__
  
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_twi_hal TWI HAL
  * @{
@@ -399,4 +403,8 @@ __STATIC_INLINE void nrf_twi_shorts_set(NRF_TWI_Type * p_twi,
 
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_TWI_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twim.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twim.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twim.h
index f54d6c6..7d4e5cc 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twim.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twim.h
@@ -13,6 +13,10 @@
 #ifndef NRF_TWIM_H__
 #define NRF_TWIM_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_twim_hal TWIM HAL
  * @{
@@ -475,4 +479,8 @@ __STATIC_INLINE void nrf_twim_rx_list_disable(NRF_TWIM_Type * p_twim)
 }
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_TWIM_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twis.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twis.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twis.h
index 0e568f7..a7b7a1d 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twis.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_twis.h
@@ -27,6 +27,10 @@
 #include <stddef.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief TWIS tasks
  */
@@ -672,5 +676,9 @@ uint8_t nrf_twis_orc_get(NRF_TWIS_Type const * const p_twis)
 
 #endif /* SUPPRESS_INLINE_IMPLEMENTATION */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_TWIS_H__ */
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uart.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uart.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uart.h
index 87ca963..cc82f40 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uart.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uart.h
@@ -17,6 +17,10 @@
 #include <stddef.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup nrf_uart_hal UART HAL
  * @{
@@ -468,4 +472,8 @@ __STATIC_INLINE void nrf_uart_baudrate_set(NRF_UART_Type   * p_reg, nrf_uart_bau
 }
 #endif //SUPPRESS_INLINE_IMPLEMENTATION
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif //NRF_UART_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uarte.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uarte.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uarte.h
index 26784d9..b1c560d 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uarte.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_uarte.h
@@ -17,6 +17,10 @@
 #include <stddef.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define NRF_UARTE_PSEL_DISCONNECTED 0xFFFFFFFF
 
 /**
@@ -531,4 +535,8 @@ __STATIC_INLINE uint32_t nrf_uarte_rx_amount_get(NRF_UARTE_Type * p_reg)
 }
 #endif //SUPPRESS_INLINE_IMPLEMENTATION
 /** @} */
+#ifdef __cplusplus
+}
+#endif
+
 #endif //NRF_UARTE_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_wdt.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_wdt.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_wdt.h
index f2b067a..63bc2fb 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_wdt.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/hal/nrf_wdt.h
@@ -27,6 +27,10 @@
 
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define NRF_WDT_CHANNEL_NUMBER 0x8UL
 #define NRF_WDT_RR_VALUE       0x6E524635UL /* Fixed value, shouldn't be modified.*/
 
@@ -294,6 +298,10 @@ __STATIC_INLINE void nrf_wdt_reload_request_set(nrf_wdt_rr_register_t rr_registe
 }
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/i2s/nrf_drv_i2s.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/i2s/nrf_drv_i2s.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/i2s/nrf_drv_i2s.h
index 71e0eb6..b732f64 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/i2s/nrf_drv_i2s.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/i2s/nrf_drv_i2s.h
@@ -31,6 +31,10 @@
 #include "sdk_errors.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief This value can be provided instead of a pin number for the signals
  *        SDOUT, SDIN, and MCK to specify that a given signal is not used
@@ -214,6 +218,10 @@ ret_code_t nrf_drv_i2s_start(uint32_t * p_rx_buffer,
  */
 void       nrf_drv_i2s_stop(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_I2S_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/lpcomp/nrf_drv_lpcomp.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/lpcomp/nrf_drv_lpcomp.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/lpcomp/nrf_drv_lpcomp.h
index ffb78ad..eed52d5 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/lpcomp/nrf_drv_lpcomp.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/lpcomp/nrf_drv_lpcomp.h
@@ -18,6 +18,10 @@
 #include "nrf_drv_common.h"
 #include "nrf_drv_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup nrf_lpcomp LPCOMP HAL and driver
  * @ingroup nrf_drivers
@@ -104,4 +108,8 @@ void nrf_drv_lpcomp_disable(void);
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
  #endif /* NRF_DRV_LPCOMP_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_error.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_error.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_error.h
index 30ab2ec..bff2053 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_error.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_error.h
@@ -11,6 +11,10 @@
 #ifndef NRF_ERROR_H__
 #define NRF_ERROR_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /// @cond Make doxygen skip this file 
 
 /** @defgroup NRF_ERRORS_BASE Error Codes Base number definitions
@@ -40,6 +44,10 @@
 #define NRF_ERROR_INVALID_ADDR                (NRF_ERROR_BASE_NUM + 16) ///< Bad Memory Address
 #define NRF_ERROR_BUSY                        (NRF_ERROR_BASE_NUM + 17) ///< Busy
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_ERROR_H__
 
 /// @endcond 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_nvic.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_nvic.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_nvic.h
index 284b8db..f429d9f 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_nvic.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_nvic.h
@@ -16,6 +16,10 @@
 #include <stdint.h>
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Enable External Interrupt.
  * @note Corresponds to NVIC_EnableIRQ in CMSIS.
  *
@@ -127,4 +131,8 @@ uint32_t sd_nvic_critical_region_enter(uint8_t * p_is_nested_critical_region);
  */
 uint32_t sd_nvic_critical_region_exit(uint8_t is_nested_critical_region);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_SOC_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_soc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_soc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_soc.h
index f34f15c..b64326d 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_soc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/nrf_soc_nosd/nrf_soc.h
@@ -16,6 +16,10 @@
 #include <stdint.h>
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Waits for an application event.
  *
  * An application event is either an application interrupt or a pended interrupt when the
@@ -41,4 +45,8 @@
  */
 uint32_t sd_app_evt_wait(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_SOC_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pdm/nrf_drv_pdm.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pdm/nrf_drv_pdm.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pdm/nrf_drv_pdm.h
index f1b7e53..623785e 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pdm/nrf_drv_pdm.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pdm/nrf_drv_pdm.h
@@ -34,6 +34,10 @@
 #include "sdk_errors.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define NRF_PDM_MAX_BUFFER_SIZE 32768
 
 
@@ -162,6 +166,10 @@ ret_code_t nrf_drv_pdm_start(void);
 ret_code_t nrf_drv_pdm_stop(void);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_PDM_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ppi/nrf_drv_ppi.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ppi/nrf_drv_ppi.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ppi/nrf_drv_ppi.h
index 1aadbf1..27cea57 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ppi/nrf_drv_ppi.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/ppi/nrf_drv_ppi.h
@@ -13,6 +13,10 @@
 #ifndef NRF_DRV_PPI_H
 #define NRF_DRV_PPI_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region" */
 #include "sdk_errors.h"
 #include "nrf_ppi.h"
@@ -281,4 +285,8 @@ __STATIC_INLINE uint32_t nrf_drv_ppi_task_addr_group_disable_get(nrf_ppi_channel
  **/
 
 /*lint --flb "Leave library region" */
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_PPI_H

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/config/pstorage_platform.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/config/pstorage_platform.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/config/pstorage_platform.h
index 184e415..5dd217a 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/config/pstorage_platform.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/config/pstorage_platform.h
@@ -22,6 +22,10 @@
 #include <stdint.h>
 #include "nrf.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 static __INLINE uint16_t pstorage_flash_page_size()
 {
   	return (uint16_t)NRF_FICR->CODEPAGESIZE;
@@ -66,6 +70,10 @@ typedef uint16_t pstorage_size_t;      /** Size of length and offset fields. */
 /**@brief Handles Flash Access Result Events. To be called in the system event dispatcher of the application. */
 void pstorage_sys_event_handler (uint32_t sys_evt);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // PSTORAGE_PL_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/pstorage.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/pstorage.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/pstorage.h
index f7d2f43..ac713dd 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/pstorage.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pstorage/pstorage.h
@@ -28,6 +28,10 @@
 #include "pstorage_platform.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@defgroup ps_opcode Persistent Storage Access Operation Codes
  * @{
  * @brief    Persistent Storage Access Operation Codes. 
@@ -377,5 +381,9 @@ uint32_t pstorage_raw_clear(pstorage_handle_t * p_dest, pstorage_size_t size);
 /**@} */
 /**@} */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // PSTORAGE_H__
 

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pwm/nrf_drv_pwm.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pwm/nrf_drv_pwm.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pwm/nrf_drv_pwm.h
index 3794992..a1ffc86 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pwm/nrf_drv_pwm.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/pwm/nrf_drv_pwm.h
@@ -31,6 +31,10 @@
 #include "sdk_errors.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief PWM driver instance data structure.
  */
@@ -421,6 +425,10 @@ __STATIC_INLINE uint32_t nrf_drv_pwm_event_address_get(
 
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_PWM_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/qdec/nrf_drv_qdec.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/qdec/nrf_drv_qdec.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/qdec/nrf_drv_qdec.h
index 84dbf5d..df20f38 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/qdec/nrf_drv_qdec.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/qdec/nrf_drv_qdec.h
@@ -19,6 +19,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup nrf_qdec QDEC HAL and driver
  * @ingroup nrf_drivers
@@ -146,4 +150,8 @@ void nrf_drv_qdec_event_address_get(nrf_qdec_event_t event, uint32_t * p_event);
 /**
    *@}
  **/
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_DRV_QDEC_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/radio_config/radio_config.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/radio_config/radio_config.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/radio_config/radio_config.h
index 7bb3551..9181aaf 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/radio_config/radio_config.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/radio_config/radio_config.h
@@ -12,10 +12,18 @@
 #ifndef RADIO_CONFIG_H
 #define RADIO_CONFIG_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define PACKET_BASE_ADDRESS_LENGTH  (4UL)                   //!< Packet base address length field size in bytes
 #define PACKET_STATIC_LENGTH        (1UL)                   //!< Packet static length in bytes
 #define PACKET_PAYLOAD_MAXSIZE      (PACKET_STATIC_LENGTH)  //!< Packet payload maximum size in bytes
 
 void radio_configure(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rng/nrf_drv_rng.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rng/nrf_drv_rng.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rng/nrf_drv_rng.h
index 756eb43..684ad39 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rng/nrf_drv_rng.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rng/nrf_drv_rng.h
@@ -20,6 +20,10 @@
 #include "sdk_errors.h"
 #include "nrf_drv_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup nrf_rng RNG HAL and driver
  * @ingroup nrf_drivers
@@ -112,4 +116,8 @@ ret_code_t nrf_drv_rng_block_rand(uint8_t * p_buff, uint32_t length);
 /**
  *@}
  **/
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_RNG_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rtc/nrf_drv_rtc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rtc/nrf_drv_rtc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rtc/nrf_drv_rtc.h
index a1f31ae..72e639f 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rtc/nrf_drv_rtc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/rtc/nrf_drv_rtc.h
@@ -20,6 +20,10 @@
 #include "nrf_rtc.h"
 #include "sdk_errors.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @addtogroup nrf_rtc RTC HAL and driver
  * @ingroup nrf_drivers
@@ -322,4 +326,8 @@ __STATIC_INLINE uint32_t nrf_drv_rtc_event_address_get(nrf_drv_rtc_t const * con
 /**
  *@}
  **/
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_DRV_RTC_H */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/saadc/nrf_drv_saadc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/saadc/nrf_drv_saadc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/saadc/nrf_drv_saadc.h
index 50780d0..35fdc01 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/saadc/nrf_drv_saadc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/saadc/nrf_drv_saadc.h
@@ -31,6 +31,10 @@
 #include "nrf_saadc.h"
 #include "sdk_errors.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Value that should be set as high limit to disable limit detection.
  */
@@ -298,6 +302,10 @@ __STATIC_INLINE nrf_saadc_input_t nrf_drv_saadc_gpio_to_ain(uint32_t pin)
     }
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_SAADC_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/config/sdio_config.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/config/sdio_config.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/config/sdio_config.h
index f8e3dc1..715280b 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/config/sdio_config.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/config/sdio_config.h
@@ -12,7 +12,15 @@
 #ifndef SDIO_CONFIG_H
 #define SDIO_CONFIG_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SDIO_CONFIG_CLOCK_PIN_NUMBER 24
 #define SDIO_CONFIG_DATA_PIN_NUMBER 25
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/sdio.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/sdio.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/sdio.h
index 16b5358..ffbde5c 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/sdio.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/sdio/sdio.h
@@ -13,6 +13,10 @@
 #ifndef SDIO_H
 #define SDIO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region" */
 
 #include <stdbool.h>
@@ -66,4 +70,8 @@ void sdio_write_byte(uint8_t address, uint8_t data_byte);
  **/
 
 /*lint --flb "Leave library region" */ 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/nrf_drv_spi.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/nrf_drv_spi.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/nrf_drv_spi.h
index 6ae31fb..1e0c900 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/nrf_drv_spi.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/nrf_drv_spi.h
@@ -30,6 +30,10 @@
 #include "nrf_spim.h"
 #include "sdk_errors.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(NRF52)
     #define NRF_DRV_SPI_PERIPHERAL(id)           \
         (CONCAT_3(SPI, id, _USE_EASY_DMA) == 1 ? \
@@ -363,6 +367,10 @@ uint32_t nrf_drv_spi_start_task_get(nrf_drv_spi_t const * p_instance);
  * @return     END event address.
  */
 uint32_t nrf_drv_spi_end_event_get(nrf_drv_spi_t const * p_instance);
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_SPI_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/spi_5W_master.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/spi_5W_master.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/spi_5W_master.h
index e8814fb..501eeff 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/spi_5W_master.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_master/spi_5W_master.h
@@ -17,6 +17,10 @@
 #include <stdlib.h>
 #include "boards.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define _SPI_5W_
 
 /**@brief Struct containing configuration parameters of the SPI master. */
@@ -167,4 +171,8 @@ void spi_5W_master_evt_handler_reg(const spi_master_hw_instance_t spi_master_hw_
                                          spi_master_event_handler_t event_handler);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_slave/nrf_drv_spis.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_slave/nrf_drv_spis.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_slave/nrf_drv_spis.h
index 684e20d..9734466 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_slave/nrf_drv_spis.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/spi_slave/nrf_drv_spis.h
@@ -30,6 +30,10 @@
 #include "sdk_common.h"
 #include "app_util_platform.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(NRF52)
     #define SPIS2_IRQ            SPIM2_SPIS2_SPI2_IRQn
     #define SPIS2_IRQ_HANDLER    SPIM2_SPIS2_SPI2_IRQHandler
@@ -218,6 +222,10 @@ ret_code_t nrf_drv_spis_buffers_set(nrf_drv_spis_t const * const  p_instance,
                                     uint8_t * p_rx_buffer, 
                                     uint8_t   rx_buffer_length);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // SPI_SLAVE_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/swi/nrf_drv_swi.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/swi/nrf_drv_swi.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/swi/nrf_drv_swi.h
index 58e7791..9ce71a0 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/swi/nrf_drv_swi.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/swi/nrf_drv_swi.h
@@ -30,6 +30,10 @@
 #include "nrf_drv_config.h"
 #include "sdk_errors.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef EGU_ENABLED
     #define EGU_ENABLED 0
 #endif
@@ -162,6 +166,10 @@ uint32_t nrf_drv_swi_event_triggered_address_get(nrf_swi_t swi, uint8_t channel)
 #endif // EGU_ENABLED > 0
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_SWI_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/timer/nrf_drv_timer.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/timer/nrf_drv_timer.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/timer/nrf_drv_timer.h
index 6aa10ca..f0ab9b4 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/timer/nrf_drv_timer.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/timer/nrf_drv_timer.h
@@ -32,6 +32,10 @@
 #include "sdk_errors.h"
 #include "nrf_assert.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Timer driver instance data structure.
  */
@@ -367,6 +371,10 @@ __STATIC_INLINE uint32_t nrf_drv_timer_ms_to_ticks(
 
 #endif // SUPPRESS_INLINE_IMPLEMENTATION
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_TIMER_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/config/twi_master_config.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/config/twi_master_config.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/config/twi_master_config.h
index 912ef1a..7d2b169 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/config/twi_master_config.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/config/twi_master_config.h
@@ -12,7 +12,15 @@
 #ifndef TWI_MASTER_CONFIG
 #define TWI_MASTER_CONFIG
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define TWI_MASTER_CONFIG_CLOCK_PIN_NUMBER (24U)
 #define TWI_MASTER_CONFIG_DATA_PIN_NUMBER (25U)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/twi_master.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/twi_master.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/twi_master.h
index e2209cd..2ac62cc 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/twi_master.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/deprecated/twi_master.h
@@ -13,6 +13,10 @@
 #ifndef TWI_MASTER_H
 #define TWI_MASTER_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*lint ++flb "Enter library region" */
 
 #include <stdbool.h>
@@ -98,4 +102,8 @@ bool twi_master_transfer(uint8_t address, uint8_t *data, uint8_t data_length, bo
  **/
 
 /*lint --flb "Leave library region" */
+#ifdef __cplusplus
+}
+#endif
+
 #endif //TWI_MASTER_H

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/nrf_drv_twi.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/nrf_drv_twi.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/nrf_drv_twi.h
index e4e67ec..229006e 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/nrf_drv_twi.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twi_master/nrf_drv_twi.h
@@ -31,6 +31,10 @@
 #include "nordic_common.h"
 #include "nrf_drv_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // This set of macros makes it possible to exclude parts of code when one type
 // of supported peripherals is not used.
 #if ((TWI0_ENABLED == 1 && TWI0_USE_EASY_DMA == 1) || \
@@ -381,4 +385,8 @@ uint32_t nrf_drv_twi_stopped_event_get(nrf_drv_twi_t const * p_instance);
  *@}
  **/
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // NRF_DRV_TWI_H__

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twis_slave/nrf_drv_twis.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twis_slave/nrf_drv_twis.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twis_slave/nrf_drv_twis.h
index 08ac9c2..c8d95f6 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twis_slave/nrf_drv_twis.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/twis_slave/nrf_drv_twis.h
@@ -18,6 +18,10 @@
 #include "nrf_twis.h"
 #include <stdint.h>
 #include "app_util.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @ingroup  nrf_twi
  * @defgroup nrf_twis TWI slave HAL and driver
@@ -395,4 +399,8 @@ bool nrf_drv_twis_is_pending_tx(nrf_drv_twis_t const * const p_inst);
 bool nrf_drv_twis_is_pending_rx(nrf_drv_twis_t const * const p_inst);
 
 /** @} */ /* End of lib_twis_drv group */
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NRF_DRV_TWIS_H__ */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/uart/nrf_drv_uart.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/uart/nrf_drv_uart.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/uart/nrf_drv_uart.h
index ed49f14..0aec80f 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/uart/nrf_drv_uart.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/uart/nrf_drv_uart.h
@@ -27,6 +27,10 @@
 #define NRF_DRV_UART_H
 
 #include "nrf_uart.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef NRF52
 #include "nrf_uarte.h"
 #endif
@@ -289,5 +293,9 @@ __STATIC_INLINE uint32_t nrf_drv_uart_event_address_get(nrf_uart_event_t event)
     return nrf_uart_event_address_get(NRF_UART0, event);
 }
 #endif //SUPPRESS_INLINE_IMPLEMENTATION
+#ifdef __cplusplus
+}
+#endif
+
 #endif //NRF_DRV_UART_H
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/wdt/nrf_drv_wdt.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/wdt/nrf_drv_wdt.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/wdt/nrf_drv_wdt.h
index 338d5bc..7d3779c 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/wdt/nrf_drv_wdt.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/drivers_nrf/wdt/nrf_drv_wdt.h
@@ -32,6 +32,10 @@
 #include "nrf_wdt.h"
 #include "nrf_drv_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Struct for WDT initialization. */
 typedef struct
 {
@@ -119,6 +123,10 @@ __STATIC_INLINE uint32_t nrf_drv_wdt_ppi_event_addr(nrf_wdt_event_t event)
 {
     return nrf_wdt_event_address_get(event);
 }
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/antfs.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/antfs.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/antfs.h
index 4cb17fc..1b3140f 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/antfs.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/antfs.h
@@ -25,6 +25,10 @@ All rights reserved.
 #include "defines.h"
 #include "antfs_config.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define ANTFS_VERSION_MAJOR               1u                                                                                             /**< Version major number. */
 #define ANTFS_VERSION_MINOR               0                                                                                              /**< Version minor number. */
 #define ANTFS_VERSION_ITERATION           0                                                                                              /**< Version iteration. */
@@ -343,6 +347,10 @@ void antfs_message_process(uint8_t * p_message);
  */
 void antfs_channel_setup(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // ANTFS_H__
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/crc.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/crc.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/crc.h
index 54eb774..59642e8 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/crc.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/crc.h
@@ -21,6 +21,10 @@ All rights reserved.
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Function for calculating CRC-16 in blocks.
  *
  * Feed each consecutive data block into this function, along with the current value of current_crc
@@ -35,6 +39,10 @@ All rights reserved.
  */
 uint16_t crc_crc16_update(uint16_t current_crc, const volatile void * p_data, uint32_t size);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // CRC_H__
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/defines.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/defines.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/defines.h
index 8420747..2ddc8c1 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/defines.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/ant_fs/defines.h
@@ -21,6 +21,10 @@ All rights reserved.
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define MAX_ULONG 0xFFFFFFFFu                 /**< The Max value for the type. */
 
 /**@brief uint16_t type presentation as an union. */
@@ -53,6 +57,10 @@ typedef union
 
 #define APP_TIMER_PRESCALER 0                 /**< Value of the RTC1 PRESCALER register. */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // DEFINES_H__
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/ble_transport/hci_mem_pool_internal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/ble_transport/hci_mem_pool_internal.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/ble_transport/hci_mem_pool_internal.h
index 945365e..b8ca3d4 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/ble_transport/hci_mem_pool_internal.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/ble_transport/hci_mem_pool_internal.h
@@ -22,11 +22,19 @@
 #ifndef MEM_POOL_INTERNAL_H__
 #define MEM_POOL_INTERNAL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define TX_BUF_SIZE       4u    /**< TX buffer size in bytes. */
 #define RX_BUF_SIZE       32u   /**< RX buffer size in bytes. */
 
 #define RX_BUF_QUEUE_SIZE 8u    /**< RX buffer element size. */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // MEM_POOL_INTERNAL_H__
  
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader.h
index 900c98f..44ee6f0 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader.h
@@ -26,6 +26,10 @@
 #include "bootloader_types.h"
 #include <dfu_types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Function for initializing the Bootloader.
  * 
  * @retval     NRF_SUCCESS If bootloader was succesfully initialized. 
@@ -92,6 +96,10 @@ uint32_t bootloader_dfu_sd_update_continue(void);
  */
 uint32_t bootloader_dfu_sd_update_finalize(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // BOOTLOADER_H__
 
 /**@} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_settings.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_settings.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_settings.h
index 27e05d3..c55cf21 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_settings.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_settings.h
@@ -24,12 +24,20 @@
 #include <stdint.h>
 #include "bootloader_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Function for getting the bootloader settings.
  * 
  * @param[out] pp_bootloader_settings Bootloader settings. 
  */
 void bootloader_util_settings_get(const bootloader_settings_t ** pp_bootloader_settings);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // BOOTLOADER_SETTINGS_H__
 
 /**@} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_types.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_types.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_types.h
index a6ce32d..c062c9a 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_types.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_types.h
@@ -25,6 +25,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define BOOTLOADER_DFU_START 0xB1
 
 #define BOOTLOADER_SVC_APP_DATA_PTR_GET 0x02
@@ -54,6 +58,10 @@ typedef struct
     uint32_t               sd_image_start;  /**< Location in flash where SoftDevice image is stored for SoftDevice update. */
 } bootloader_settings_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // BOOTLOADER_TYPES_H__ 
 
 /**@} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_util.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_util.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_util.h
index aefd764..ca92415 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_util.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/bootloader_util.h
@@ -24,6 +24,10 @@
 #include <stdint.h>
 #include "bootloader_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief Function for starting the application (or bootloader) at the provided address.
  * 
  * @param[in]  start_addr             Start address.
@@ -33,6 +37,10 @@
  */
 void bootloader_util_app_start(uint32_t start_addr);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // BOOTLOADER_UTIL_H__
 
 /**@} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu.h
index 8916b7a..716dcce 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu.h
@@ -26,6 +26,10 @@
 #include <stdint.h>
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief DFU event callback for asynchronous calls.
  *
  * @param[in] packet  Packet type for which this callback is related. START_PACKET, DATA_PACKET.
@@ -129,6 +133,10 @@ uint32_t dfu_sd_image_swap(void);
  */
 uint32_t dfu_init_pkt_complete(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // DFU_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_app_handler.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_app_handler.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_app_handler.h
index b93bd26..d25172e 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_app_handler.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_app_handler.h
@@ -39,6 +39,10 @@
 #include "bootloader_types.h"
 #include "device_manager.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DFU_APP_ATT_TABLE_POS     0                     /**< Position for the ATT table changed setting. */
 #define DFU_APP_ATT_TABLE_CHANGED 1                     /**< Value indicating that the ATT table might have changed. This value will be set in the application-specific context in Device Manager when entering DFU mode. */
 
@@ -81,6 +85,10 @@ void dfu_app_reset_prepare_set(dfu_app_reset_prepare_t reset_prepare_func);
  */
 void dfu_app_dm_appl_instance_set(dm_application_instance_t app_instance);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // DFU_APP_HANDLER_H__
 
 /** @} */

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/d69b0798/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_bank_internal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_bank_internal.h b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_bank_internal.h
index 4e524b4..5d759c0 100644
--- a/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_bank_internal.h
+++ b/hw/mcu/nordic/src/ext/nRF5_SDK_11.0.0_89a8197/components/libraries/bootloader_dfu/dfu_bank_internal.h
@@ -27,6 +27,10 @@
 
 #include <dfu_types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**@brief States of the DFU state machine. */
 typedef enum
 {
@@ -82,6 +86,10 @@ typedef struct
     dfu_bank_activate_t activate;                                                   /**< Function pointer to the activate function called on finalizing the update procedure. */
 } dfu_bank_func_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // DFU_BANK_INTERNAL_H__
 
 /** @} */