aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-03 12:12:28 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-03 12:12:28 +0000
commit1d8a7907bd3416502440c509d1ce82744bb8ead0 (patch)
tree5ea155a3342ebea3f9e483bf540beb0462aa0239 /os
parent6059ca8a0444f026f1e6b5f343e7b389a9c4267c (diff)
downloadChibiOS-1d8a7907bd3416502440c509d1ce82744bb8ead0.tar.gz
ChibiOS-1d8a7907bd3416502440c509d1ce82744bb8ead0.tar.bz2
ChibiOS-1d8a7907bd3416502440c509d1ce82744bb8ead0.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6253 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s9
-rw-r--r--os/nil/ports/ARMCMx/compilers/GCC/niltypes.h27
-rw-r--r--os/nil/ports/ARMCMx/nilcore_timer.h12
-rw-r--r--os/rt/ports/ARMCMx/chcore_timer.h6
4 files changed, 22 insertions, 32 deletions
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s b/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s
index 06f7d7cee..7ab0f0432 100644
--- a/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s
+++ b/os/nil/ports/ARMCMx/compilers/GCC/nilcoreasm_v6m.s
@@ -1,15 +1,14 @@
/*
- ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
- 2011,2012,2013 Giovanni Di Sirio.
+ ChibiOS/NIL - Copyright (C) 2012,2013 Giovanni Di Sirio.
- This file is part of ChibiOS/RT.
+ This file is part of ChibiOS/NIL.
- ChibiOS/RT is free software; you can redistribute it and/or modify
+ ChibiOS/NIL is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
- ChibiOS/RT is distributed in the hope that it will be useful,
+ ChibiOS/NIL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/os/nil/ports/ARMCMx/compilers/GCC/niltypes.h b/os/nil/ports/ARMCMx/compilers/GCC/niltypes.h
index bc33d2e10..59cd42606 100644
--- a/os/nil/ports/ARMCMx/compilers/GCC/niltypes.h
+++ b/os/nil/ports/ARMCMx/compilers/GCC/niltypes.h
@@ -1,15 +1,14 @@
/*
- ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
- 2011,2012,2013 Giovanni Di Sirio.
+ ChibiOS/NIL - Copyright (C) 2012,2013 Giovanni Di Sirio.
- This file is part of ChibiOS/RT.
+ This file is part of ChibiOS/NIL.
- ChibiOS/RT is free software; you can redistribute it and/or modify
+ ChibiOS/NIL is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
- ChibiOS/RT is distributed in the hope that it will be useful,
+ ChibiOS/NIL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -19,15 +18,15 @@
*/
/**
- * @file ARMCMx/GCC/chtypes.h
+ * @file ARMCMx/GCC/niltypes.h
* @brief ARM Cortex-Mx port system types.
*
* @addtogroup ARMCMx_CORE
* @{
*/
-#ifndef _CHTYPES_H_
-#define _CHTYPES_H_
+#ifndef _NILTYPES_H_
+#define _NILTYPES_H_
#include <stddef.h>
#include <stdint.h>
@@ -51,19 +50,11 @@
#endif
/** @} */
+typedef uint32_t syssts_t; /**< System status word. */
typedef uint32_t systime_t; /**< System time. */
typedef uint32_t rtcnt_t; /**< Realtime counter. */
-typedef uint64_t rttime_t; /**< Time accumulator. */
-typedef uint32_t syssts_t; /**< System status word. */
-typedef uint8_t tmode_t; /**< Thread flags. */
typedef uint8_t tstate_t; /**< Thread state. */
-typedef uint8_t trefs_t; /**< Thread references counter. */
-typedef uint8_t tslices_t; /**< Thread time slices counter. */
-typedef uint32_t tprio_t; /**< Thread priority. */
typedef int32_t msg_t; /**< Inter-thread message. */
-typedef int32_t eventid_t; /**< Numeric event identifier. */
-typedef uint32_t eventmask_t; /**< Mask of event identifiers. */
-typedef uint32_t eventflags_t; /**< Mask of event flags. */
typedef int32_t cnt_t; /**< Generic signed counter. */
typedef uint32_t ucnt_t; /**< Generic unsigned counter. */
@@ -80,6 +71,6 @@ typedef uint32_t ucnt_t; /**< Generic unsigned counter. */
*/
#define NOINLINE __attribute__((noinline))
-#endif /* _CHTYPES_H_ */
+#endif /* _NILTYPES_H_ */
/** @} */
diff --git a/os/nil/ports/ARMCMx/nilcore_timer.h b/os/nil/ports/ARMCMx/nilcore_timer.h
index 1a0f98ac0..166610b2c 100644
--- a/os/nil/ports/ARMCMx/nilcore_timer.h
+++ b/os/nil/ports/ARMCMx/nilcore_timer.h
@@ -26,16 +26,16 @@
* @{
*/
-#ifndef _CHCORE_TIMER_H_
-#define _CHCORE_TIMER_H_
+#ifndef _NILCORE_TIMER_H_
+#define _NILCORE_TIMER_H_
-#if defined(CH_PORT_DO_NOT_USE_ST)
+#if defined(PORT_DO_NOT_USE_ST)
/* If, for some reason, the use of the HAL-provided ST timer port interface
is not wanted, it is possible to provide the timer interface into a custom
module.*/
#include "chcore_timer_ext.h"
-#else /* !defined(CH_PORT_DO_NOT_USE_ST) */
+#else /* !defined(PORT_DO_NOT_USE_ST) */
/* This is the only header in the HAL designed to be include-able alone.*/
#include "st.h"
@@ -128,8 +128,8 @@ static inline systime_t port_timer_get_alarm(void) {
return stGetAlarm();
}
-#endif /* !defined(CH_PORT_DO_NOT_USE_ST) */
+#endif /* !defined(PORT_DO_NOT_USE_ST) */
-#endif /* _CHCORE_TIMER_H_ */
+#endif /* _NILCORE_TIMER_H_ */
/** @} */
diff --git a/os/rt/ports/ARMCMx/chcore_timer.h b/os/rt/ports/ARMCMx/chcore_timer.h
index 1a0f98ac0..e0cacabdd 100644
--- a/os/rt/ports/ARMCMx/chcore_timer.h
+++ b/os/rt/ports/ARMCMx/chcore_timer.h
@@ -29,13 +29,13 @@
#ifndef _CHCORE_TIMER_H_
#define _CHCORE_TIMER_H_
-#if defined(CH_PORT_DO_NOT_USE_ST)
+#if defined(PORT_DO_NOT_USE_ST)
/* If, for some reason, the use of the HAL-provided ST timer port interface
is not wanted, it is possible to provide the timer interface into a custom
module.*/
#include "chcore_timer_ext.h"
-#else /* !defined(CH_PORT_DO_NOT_USE_ST) */
+#else /* !defined(PORT_DO_NOT_USE_ST) */
/* This is the only header in the HAL designed to be include-able alone.*/
#include "st.h"
@@ -128,7 +128,7 @@ static inline systime_t port_timer_get_alarm(void) {
return stGetAlarm();
}
-#endif /* !defined(CH_PORT_DO_NOT_USE_ST) */
+#endif /* !defined(PORT_DO_NOT_USE_ST) */
#endif /* _CHCORE_TIMER_H_ */