diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-11-05 13:22:26 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-11-05 13:22:26 +0000 |
| commit | 5dc2d488b46aea210890c144ff9e0c57ebe3c16d (patch) | |
| tree | e0de3d2e060705b64bd5bd46de4719a5eb1eb860 | |
| parent | 0519bcc61594a962fd730a846d8b65f1ee391c7d (diff) | |
| download | ChibiOS-5dc2d488b46aea210890c144ff9e0c57ebe3c16d.tar.gz ChibiOS-5dc2d488b46aea210890c144ff9e0c57ebe3c16d.tar.bz2 ChibiOS-5dc2d488b46aea210890c144ff9e0c57ebe3c16d.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7478 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/rt/include/ch.h | 2 | ||||
| -rw-r--r-- | os/rt/include/chsystypes.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h index d49aa21fb..c88d39578 100644 --- a/os/rt/include/ch.h +++ b/os/rt/include/ch.h @@ -64,8 +64,8 @@ /* Core headers.*/
#include "chtypes.h"
-#include "chsystypes.h"
#include "chconf.h"
+#include "chsystypes.h"
#include "chcore.h"
#include "chdebug.h"
#include "chtm.h"
diff --git a/os/rt/include/chsystypes.h b/os/rt/include/chsystypes.h index 74a45b8a2..2a64488db 100644 --- a/os/rt/include/chsystypes.h +++ b/os/rt/include/chsystypes.h @@ -50,8 +50,10 @@ */
#if (CH_CFG_ST_RESOLUTION == 32) || defined(__DOXYGEN__)
typedef uint32_t systime_t;
-#else
+#elif CH_CFG_ST_RESOLUTION == 16
typedef uint16_t systime_t;
+#else
+#error "invalid CH_CFG_ST_RESOLUTION setting"
#endif
/**
|