Diff: nordic/nrf-sdk/s110/nrf_sdm.h

Revision:

37:c29c330d942c

Parent:

0:eff01767de02

diff -r bd0186ce644a -r c29c330d942c nordic/nrf-sdk/s110/nrf_sdm.h
--- a/nordic/nrf-sdk/s110/nrf_sdm.h	Thu Jul 03 10:01:02 2014 +0100
+++ b/nordic/nrf-sdk/s110/nrf_sdm.h	Mon Jul 07 13:43:31 2014 +0100
@@ -18,7 +18,6 @@
 #ifndef NRF_SDM_H__
 #define NRF_SDM_H__
 
-#include "nordic_global.h"
 #include "nrf_svc.h"
 #include "nrf51.h"
 #include "nrf_soc.h"
@@ -28,7 +27,7 @@
  * @{ */
 
 /**@brief SoftDevice Manager SVC Base number. */
-#define SDM_SVC_BASE 0x10   
+#define SDM_SVC_BASE  (0x10)
 
 /** @} */
 
@@ -41,7 +40,7 @@
   SD_SOFTDEVICE_ENABLE = SDM_SVC_BASE, /**< ::sd_softdevice_enable */
   SD_SOFTDEVICE_DISABLE,               /**< ::sd_softdevice_disable */
   SD_SOFTDEVICE_IS_ENABLED,            /**< ::sd_softdevice_is_enabled */
-  SD_SOFTDEVICE_FORWARD_TO_APPLICATION,/**< ::sd_softdevice_forward_to_application */
+  SD_SOFTDEVICE_VECTOR_TABLE_BASE_SET, /**< ::sd_softdevice_vector_table_base_set */
   SVC_SDM_LAST                         /**< Placeholder for last SDM SVC */
 };
 
@@ -63,6 +62,11 @@
   NRF_CLOCK_LFCLKSRC_RC_250_PPM_2000MS_CALIBRATION,       /**< LFCLK RC oscillator, 2000ms calibration interval.*/
   NRF_CLOCK_LFCLKSRC_RC_250_PPM_4000MS_CALIBRATION,       /**< LFCLK RC oscillator, 4000ms calibration interval.*/
   NRF_CLOCK_LFCLKSRC_RC_250_PPM_8000MS_CALIBRATION,       /**< LFCLK RC oscillator, 8000ms calibration interval.*/
+  NRF_CLOCK_LFCLKSRC_RC_250_PPM_TEMP_1000MS_CALIBRATION,  /**< LFCLK RC oscillator. Temperature checked every 1000ms, if changed above a threshold, a calibration is done.*/
+  NRF_CLOCK_LFCLKSRC_RC_250_PPM_TEMP_2000MS_CALIBRATION,  /**< LFCLK RC oscillator. Temperature checked every 2000ms, if changed above a threshold, a calibration is done.*/
+  NRF_CLOCK_LFCLKSRC_RC_250_PPM_TEMP_4000MS_CALIBRATION,  /**< LFCLK RC oscillator. Temperature checked every 4000ms, if changed above a threshold, a calibration is done.*/
+  NRF_CLOCK_LFCLKSRC_RC_250_PPM_TEMP_8000MS_CALIBRATION,  /**< LFCLK RC oscillator. Temperature checked every 8000ms, if changed above a threshold, a calibration is done.*/
+  NRF_CLOCK_LFCLKSRC_RC_250_PPM_TEMP_16000MS_CALIBRATION, /**< LFCLK RC oscillator. Temperature checked every 16000ms, if changed above a threshold, a calibration is done.*/
 };
 
 /** @} */
@@ -144,16 +148,15 @@
  */
 SVCALL(SD_SOFTDEVICE_IS_ENABLED, uint32_t, sd_softdevice_is_enabled(uint8_t * p_softdevice_enabled));
 
-/**@brief Start forwarding interrupts to application.
+/**@brief Sets the base address of the interrupt vector table for interrupts forwarded from the SoftDevice
  * 
- * This function is only intended to be called when a bootloader is enabled is used.
- * The bootloader should call this right before it starts the application. 
- * It is recommended that all interrupt sources are off when this is called, 
- * or you could end up having interrupts in the application being executed before main() of the application.
+ * This function is only intended to be called when a bootloader is enabled.
  *
+ * @param[in] address The base address of the interrupt vector table for forwarded interrupts.
+ 
  * @retval ::NRF_SUCCESS
  */
-SVCALL(SD_SOFTDEVICE_FORWARD_TO_APPLICATION, uint32_t, sd_softdevice_forward_to_application(void)); 
+SVCALL(SD_SOFTDEVICE_VECTOR_TABLE_BASE_SET, uint32_t, sd_softdevice_vector_table_base_set(uint32_t address)); 
 
 /** @} */