diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-24 14:58:29 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-24 14:58:29 +0000 |
| commit | 7aaa7099fd19d774701f7a4b60cf07d1a292fd22 (patch) | |
| tree | 0e82c22769cec405e5dbc838936a57f6b9edf501 | |
| parent | 40f413d3c97a7694703938cd031ce15912b29ff7 (diff) | |
| download | ChibiOS-7aaa7099fd19d774701f7a4b60cf07d1a292fd22.tar.gz ChibiOS-7aaa7099fd19d774701f7a4b60cf07d1a292fd22.tar.bz2 ChibiOS-7aaa7099fd19d774701f7a4b60cf07d1a292fd22.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6026 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM4-STM32F303-DISCOVERY/chconf.h | 2 | ||||
| -rw-r--r-- | os/kernel/include/chvt.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h b/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h index a2fa7a697..84efe76f6 100644 --- a/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h +++ b/demos/ARMCM4-STM32F303-DISCOVERY/chconf.h @@ -69,7 +69,7 @@ * must be set to zero in that case.
*/
#if !defined(CH_CFG_TIME_QUANTUM) || defined(__DOXYGEN__)
-#define CH_CFG_TIME_QUANTUM 20
+#define CH_CFG_TIME_QUANTUM 0
#endif
/**
diff --git a/os/kernel/include/chvt.h b/os/kernel/include/chvt.h index a499db690..39f03b995 100644 --- a/os/kernel/include/chvt.h +++ b/os/kernel/include/chvt.h @@ -49,6 +49,10 @@ #error "invalid NIL_CFG_TIMEDELTA specified"
#endif
+#if (CH_CFG_TIMEDELTA > 0) && (CH_CFG_TIME_QUANTUM > 0)
+#error "(CH_CFG_TIMEDELTA > 0) is not compatible with (CH_CFG_TIME_QUANTUM > 0)"
+#endif
+
/*===========================================================================*/
/* Module data structures and types. */
/*===========================================================================*/
|