diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-10-06 09:03:00 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-10-06 09:03:00 +0000 |
| commit | b968a3f9e3bb0b4c6f294fe3933f0ab7de674cb0 (patch) | |
| tree | 1a493f730c32dad624ec9235eb6dac167fd5d090 /os/rt/ports/ARMCMx/cmsis_os | |
| parent | 955b6b0d639b8f3daca8d0002ba002eee2745b41 (diff) | |
| download | ChibiOS-b968a3f9e3bb0b4c6f294fe3933f0ab7de674cb0.tar.gz ChibiOS-b968a3f9e3bb0b4c6f294fe3933f0ab7de674cb0.tar.bz2 ChibiOS-b968a3f9e3bb0b4c6f294fe3933f0ab7de674cb0.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7376 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt/ports/ARMCMx/cmsis_os')
| -rw-r--r-- | os/rt/ports/ARMCMx/cmsis_os/cmsis_os.h | 75 |
1 files changed, 61 insertions, 14 deletions
diff --git a/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.h b/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.h index 47146f763..09013df20 100644 --- a/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.h +++ b/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.h @@ -95,13 +95,13 @@ * @brief Type of priority levels.
*/
typedef enum {
- osPriorityIdle = NORMALPRIO-3,
- osPriorityLow = NORMALPRIO-2,
- osPriorityBelowNormal = NORMALPRIO-1,
- osPriorityNormal = NORMALPRIO,
- osPriorityAboveNormal = NORMALPRIO+1,
- osPriorityHigh = NORMALPRIO+2,
- osPriorityRealtime = NORMALPRIO+3,
+ osPriorityIdle = -3,
+ osPriorityLow = -2,
+ osPriorityBelowNormal = -1,
+ osPriorityNormal = 0,
+ osPriorityAboveNormal = +1,
+ osPriorityHigh = +2,
+ osPriorityRealtime = +3,
osPriorityError = 0x84
} osPriority;
@@ -202,7 +202,7 @@ typedef struct os_semaphore_def { * @brief Convert a microseconds value to a RTOS kernel system timer value.
*/
#define osKernelSysTickMicroSec(microsec) (((uint64_t)microsec * \
- (osKernelSysTickFrequency)) /
+ (osKernelSysTickFrequency)) / \
1000000)
/**
@@ -280,18 +280,13 @@ const osTimerDef_t os_timer_def_##name = { \ #ifdef __cplusplus
extern "C" {
#endif
-osStatus osKernelInitialize(void);
- osStatus osKernelStart(void);
- int32_t osKernelRunning(void);
- uint32_t osKernelSysTick(void);
- osThreadId osThreadCreate(const osThreadDef_t *thread_def, void *argument);
osThreadId osThreadGetId(void);
osStatus osThreadTerminate(osThreadId thread_id);
osStatus osThreadYield(void);
osStatus osThreadSetPriority(osThreadId thread_id, osPriority priority);
osPriority osThreadGetPriority(osThreadId thread_id);
osStatus osDelay(uint32_t millisec);
- osEvent osWait(uint32_t millisec);
+ /*osEvent osWait(uint32_t millisec);*/
#ifdef __cplusplus
}
#endif
@@ -300,6 +295,58 @@ osStatus osKernelInitialize(void); /* Module inline functions. */
/*===========================================================================*/
+/**
+ * @brief Kernel initialization.
+ */
+static inline osStatus osKernelInitialize(void) {
+
+ chSysSuspend();
+
+ return osOK;
+}
+
+/**
+ * @brief Kernel start.
+ * @note Does nothing, under ChibiOS/RT there is no concept of starting the
+ * kernel.
+ */
+static inline osStatus osKernelStart(void) {
+
+ return osOK;
+}
+
+/**
+ * @brief To be or not to be.
+ */
+static inline int32_t osKernelRunning(void) {
+
+ if (ch.rlist.r_queue.p_next != NULL)
+ return 1;
+
+ return 0;
+}
+
+/**
+ * @brief System ticks since start.
+ */
+static inline uint32_t osKernelSysTick(void) {
+
+ return (uint32_t)chVTGetSystemTimeX();
+}
+
+/**
+ * @brief Creates a thread.
+ */
+static inline osThreadId osThreadCreate (osThreadDef_t *thread_def,
+ void *argument) {
+
+ return (osThreadId)chThdCreateFromHeap(0,
+ THD_WORKING_AREA_SIZE(thread_def->stacksize),
+ NORMALPRIO+thread_def->tpriority,
+ (tfunc_t)thread_def->pthread,
+ argument);
+}
+
#endif /* _CMSIS_OS_H_ */
/** @} */
|