diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-08 09:08:57 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-08 09:08:57 +0000 |
| commit | 6071e93a92058a05418095eeaa44e884405b8640 (patch) | |
| tree | 1d551b1762dd42c14d1da7ecb33778a740ba7a6c | |
| parent | 0c0288d678cab0070cae0e191e625760429f3ef3 (diff) | |
| download | ChibiOS-6071e93a92058a05418095eeaa44e884405b8640.tar.gz ChibiOS-6071e93a92058a05418095eeaa44e884405b8640.tar.bz2 ChibiOS-6071e93a92058a05418095eeaa44e884405b8640.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6103 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM4-STM32F303-DISCOVERY/chconf.h | 4 | ||||
| -rw-r--r-- | os/halnew/platforms/STM32/st_lld.c | 4 | ||||
| -rw-r--r-- | os/halnew/platforms/STM32/st_lld.h | 6 | ||||
| -rw-r--r-- | os/halnew/platforms/common/ARMCMx/nvic.c | 16 | ||||
| -rw-r--r-- | os/halnew/platforms/common/ARMCMx/nvic.h | 5 |
5 files changed, 24 insertions, 11 deletions
diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h b/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h index 36fb6fe76..05ecea47a 100644 --- a/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h +++ b/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h @@ -41,7 +41,7 @@ * setting also defines the system tick time unit.
*/
#if !defined(CH_CFG_ST_FREQUENCY) || defined(__DOXYGEN__)
-#define CH_CFG_ST_FREQUENCY 10000
+#define CH_CFG_ST_FREQUENCY 1000
#endif
/**
@@ -62,7 +62,7 @@ * this value.
*/
#if !defined(CH_CFG_TIMEDELTA) || defined(__DOXYGEN__)
-#define CH_CFG_TIMEDELTA 2
+#define CH_CFG_TIMEDELTA 0
#endif
/**
diff --git a/os/halnew/platforms/STM32/st_lld.c b/os/halnew/platforms/STM32/st_lld.c index 3498b8854..d0788bf93 100644 --- a/os/halnew/platforms/STM32/st_lld.c +++ b/os/halnew/platforms/STM32/st_lld.c @@ -104,7 +104,7 @@ void st_lld_init(void) { #if OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING
/* Free running counter mode.*/
rccEnableTIM2(FALSE);
- nvicEnableVector(STM32_TIM2_NUMBER, ST_TIMER_PRIORITY_MASK);
+ nvicEnableVector(STM32_TIM2_NUMBER, ST_TIMER_PRIORITY);
STM32_TIM2->PSC = STM32_TIMCLK2 / OSAL_SYSTICK_FREQUENCY - 1;
#endif
@@ -117,7 +117,7 @@ void st_lld_init(void) { SysTick_CTRL_ENABLE_Msk |
SysTick_CTRL_TICKINT_Msk;
- nvicSetSystemHandlerPriority(HANDLER_SYSTICK, ST_TIMER_PRIORITY_MASK);
+ nvicSetSystemHandlerPriority(SysTick_IRQn, ST_TIMER_PRIORITY);
#endif
}
diff --git a/os/halnew/platforms/STM32/st_lld.h b/os/halnew/platforms/STM32/st_lld.h index f9cdbb8fd..ac17d7ff7 100644 --- a/os/halnew/platforms/STM32/st_lld.h +++ b/os/halnew/platforms/STM32/st_lld.h @@ -40,10 +40,10 @@ * @{
*/
/**
- * @brief SysTick timer priority mask.
+ * @brief SysTick timer priority.
*/
-#if !defined(ST_TIMER_PRIORITY_MASK) || defined(__DOXYGEN__)
-#define ST_TIMER_PRIORITY_MASK 0x80
+#if !defined(ST_TIMER_PRIORITY) || defined(__DOXYGEN__)
+#define ST_TIMER_PRIORITY 8
#endif
/** @} */
diff --git a/os/halnew/platforms/common/ARMCMx/nvic.c b/os/halnew/platforms/common/ARMCMx/nvic.c index 20bf60035..c45366396 100644 --- a/os/halnew/platforms/common/ARMCMx/nvic.c +++ b/os/halnew/platforms/common/ARMCMx/nvic.c @@ -55,7 +55,7 @@ * @param[in] n the interrupt number
* @param[in] prio the interrupt priority mask
*/
-void nvicEnableVector(uint32_t n, uint32_t prio) {
+void nvicEnableVector(IRQn_Type n, uint32_t prio) {
NVIC->IP[n] = NVIC_PRIORITY_MASK(prio);
NVIC->ICPR[n >> 5] = 1 << (n & 0x1F);
@@ -68,10 +68,22 @@ void nvicEnableVector(uint32_t n, uint32_t prio) { *
* @param[in] n the interrupt number
*/
-void nvicDisableVector(uint32_t n) {
+void nvicDisableVector(IRQn_Type n) {
NVIC->ICER[n >> 5] = 1 << (n & 0x1F);
NVIC->IP[n] = 0;
}
+/**
+ * @brief Changes the priority of a system handler.
+ * @note The parameters are not tested for correctness.
+ *
+ * @param[in] handler the system handler number
+ * @param[in] prio the system handler priority mask
+ */
+void nvicSetSystemHandlerPriority(IRQn_Type handler, uint32_t prio) {
+
+ SCB->SHP[((uint32_t)(handler) & 15) - 4] = NVIC_PRIORITY_MASK(prio);
+}
+
/** @} */
diff --git a/os/halnew/platforms/common/ARMCMx/nvic.h b/os/halnew/platforms/common/ARMCMx/nvic.h index b9fa905b1..82fde801c 100644 --- a/os/halnew/platforms/common/ARMCMx/nvic.h +++ b/os/halnew/platforms/common/ARMCMx/nvic.h @@ -57,8 +57,9 @@ #ifdef __cplusplus
extern "C" {
#endif
- void nvicEnableVector(uint32_t n, uint32_t prio);
- void nvicDisableVector(uint32_t n);
+ void nvicEnableVector(IRQn_Type n, uint32_t prio);
+ void nvicDisableVector(IRQn_Type n);
+ void nvicSetSystemHandlerPriority(IRQn_Type handler, uint32_t prio);
#ifdef __cplusplus
}
#endif
|