aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-02-22 13:24:19 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-02-22 13:24:19 +0000
commit6e5915850c1429af78fafacaee399c5114892538 (patch)
tree0aa330fdfba2a8d14854a229fc2076e76b1ad453
parent27261ab8a6ade925246c1dec80ead3f4a9c651c2 (diff)
downloadChibiOS-6e5915850c1429af78fafacaee399c5114892538.tar.gz
ChibiOS-6e5915850c1429af78fafacaee399c5114892538.tar.bz2
ChibiOS-6e5915850c1429af78fafacaee399c5114892538.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6717 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--demos/rt/RT-STM32F407-DISCOVERY/chconf.h16
-rw-r--r--os/hal/ports/common/ARMCMx/nvic.c4
2 files changed, 10 insertions, 10 deletions
diff --git a/demos/rt/RT-STM32F407-DISCOVERY/chconf.h b/demos/rt/RT-STM32F407-DISCOVERY/chconf.h
index 7ff9a1440..48c553101 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY/chconf.h
+++ b/demos/rt/RT-STM32F407-DISCOVERY/chconf.h
@@ -56,7 +56,7 @@
* The value one is not valid, timeouts are rounded up to
* this value.
*/
-#define CH_CFG_ST_TIMEDELTA 2
+#define CH_CFG_ST_TIMEDELTA 0
/** @} */
@@ -324,7 +324,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_STATISTICS FALSE
+#define CH_DBG_STATISTICS TRUE
/**
* @brief Debug option, system state check.
@@ -333,7 +333,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_SYSTEM_STATE_CHECK FALSE
+#define CH_DBG_SYSTEM_STATE_CHECK TRUE
/**
* @brief Debug option, parameters checks.
@@ -342,7 +342,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_ENABLE_CHECKS FALSE
+#define CH_DBG_ENABLE_CHECKS TRUE
/**
* @brief Debug option, consistency checks.
@@ -352,7 +352,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_ENABLE_ASSERTS FALSE
+#define CH_DBG_ENABLE_ASSERTS TRUE
/**
* @brief Debug option, trace buffer.
@@ -361,7 +361,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_ENABLE_TRACE FALSE
+#define CH_DBG_ENABLE_TRACE TRUE
/**
* @brief Debug option, stack checks.
@@ -373,7 +373,7 @@
* @note The default failure mode is to halt the system with the global
* @p panic_msg variable set to @p NULL.
*/
-#define CH_DBG_ENABLE_STACK_CHECK FALSE
+#define CH_DBG_ENABLE_STACK_CHECK TRUE
/**
* @brief Debug option, stacks initialization.
@@ -383,7 +383,7 @@
*
* @note The default is @p FALSE.
*/
-#define CH_DBG_FILL_THREADS FALSE
+#define CH_DBG_FILL_THREADS TRUE
/**
* @brief Debug option, threads profiling.
diff --git a/os/hal/ports/common/ARMCMx/nvic.c b/os/hal/ports/common/ARMCMx/nvic.c
index dbd165a9f..b469e7cf1 100644
--- a/os/hal/ports/common/ARMCMx/nvic.c
+++ b/os/hal/ports/common/ARMCMx/nvic.c
@@ -80,9 +80,9 @@ void nvicDisableVector(uint32_t n) {
*/
void nvicSetSystemHandlerPriority(uint32_t handler, uint32_t prio) {
- osalDbgCheck((handler >= 4) && (handler <= 15));
+ osalDbgCheck(handler <= 12);
- SCB->SHP[handler - 4] = NVIC_PRIORITY_MASK(prio);
+ SCB->SHP[handler] = NVIC_PRIORITY_MASK(prio);
}
/** @} */