From ff109ac9e64f0f107a21343cd82d603b04c35aaf Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sat, 10 Feb 2018 11:25:29 +0000
Subject: MISRA-related changes.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11473 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/hal/osal/nil/osal.h            | 2 +-
 os/hal/osal/os-less/ARMCMx/osal.c | 8 ++++----
 os/hal/osal/os-less/ARMCMx/osal.h | 8 ++++----
 os/hal/osal/rt/osal.h             | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'os/hal/osal')

diff --git a/os/hal/osal/nil/osal.h b/os/hal/osal/nil/osal.h
index 9fd0b4192..6cc0325d9 100644
--- a/os/hal/osal/nil/osal.h
+++ b/os/hal/osal/nil/osal.h
@@ -162,7 +162,7 @@ typedef uint32_t systime_t;
 
 #if 0
 /**
- * @brief   Type of system time counter.
+ * @brief   Type of system time interval.
  */
 typedef uint32_t sysinterval_t;
 #endif
diff --git a/os/hal/osal/os-less/ARMCMx/osal.c b/os/hal/osal/os-less/ARMCMx/osal.c
index 3f8a7ea62..5c62069e4 100644
--- a/os/hal/osal/os-less/ARMCMx/osal.c
+++ b/os/hal/osal/os-less/ARMCMx/osal.c
@@ -162,7 +162,7 @@ systime_t osalOsGetSystemTimeX(void) {
  *
  * @sclass
  */
-void osalThreadSleepS(systime_t time) {
+void osalThreadSleepS(sysinterval_t time) {
   virtual_timer_t vt;
   thread_reference_t tr;
 
@@ -183,7 +183,7 @@ void osalThreadSleepS(systime_t time) {
  *
  * @api
  */
-void osalThreadSleep(systime_t time) {
+void osalThreadSleep(sysinterval_t time) {
 
   osalSysLock();
   osalThreadSleepS(time);
@@ -236,7 +236,7 @@ msg_t osalThreadSuspendS(thread_reference_t *trp) {
  *
  * @sclass
  */
-msg_t osalThreadSuspendTimeoutS(thread_reference_t *trp, systime_t timeout) {
+msg_t osalThreadSuspendTimeoutS(thread_reference_t *trp, sysinterval_t timeout) {
   msg_t msg;
   virtual_timer_t vt;
 
@@ -316,7 +316,7 @@ void osalThreadResumeS(thread_reference_t *trp, msg_t msg) {
  *
  * @sclass
  */
-msg_t osalThreadEnqueueTimeoutS(threads_queue_t *tqp, systime_t timeout) {
+msg_t osalThreadEnqueueTimeoutS(threads_queue_t *tqp, sysinterval_t timeout) {
   msg_t msg;
   virtual_timer_t vt;
 
diff --git a/os/hal/osal/os-less/ARMCMx/osal.h b/os/hal/osal/os-less/ARMCMx/osal.h
index 1bf98ab32..248af8831 100644
--- a/os/hal/osal/os-less/ARMCMx/osal.h
+++ b/os/hal/osal/os-less/ARMCMx/osal.h
@@ -177,7 +177,7 @@ typedef int32_t msg_t;
 typedef uint32_t systime_t;
 
 /**
- * @brief   Type of system time counter.
+ * @brief   Type of system time interval.
  */
 typedef uint32_t sysinterval_t;
 
@@ -366,7 +366,7 @@ typedef struct {
  * @api
  */
 #define OSAL_S2I(secs)                                                      \
-  ((systime_t)((uint32_t)(secs) * (uint32_t)OSAL_ST_FREQUENCY))
+  ((sysinterval_t)((uint32_t)(secs) * (uint32_t)OSAL_ST_FREQUENCY))
 
 /**
  * @brief   Milliseconds to system ticks.
@@ -379,7 +379,7 @@ typedef struct {
  * @api
  */
 #define OSAL_MS2I(msecs)                                                    \
-  ((systime_t)((((((uint32_t)(msecs)) *                                     \
+  ((sysinterval_t)((((((uint32_t)(msecs)) *                                 \
                   ((uint32_t)OSAL_ST_FREQUENCY)) - 1UL) / 1000UL) + 1UL))
 
 /**
@@ -393,7 +393,7 @@ typedef struct {
  * @api
  */
 #define OSAL_US2I(usecs)                                                    \
-  ((systime_t)((((((uint32_t)(usecs)) *                                     \
+  ((sysinterval_t)((((((uint32_t)(usecs)) *                                 \
                   ((uint32_t)OSAL_ST_FREQUENCY)) - 1UL) / 1000000UL) + 1UL))
 /** @} */
 
diff --git a/os/hal/osal/rt/osal.h b/os/hal/osal/rt/osal.h
index 75dc19c45..73e8e3fa9 100644
--- a/os/hal/osal/rt/osal.h
+++ b/os/hal/osal/rt/osal.h
@@ -150,7 +150,7 @@ typedef uint32_t systime_t;
 
 #if 0
 /**
- * @brief   Type of system time counter.
+ * @brief   Type of system time interval.
  */
 typedef uint32_t sysinterval_t;
 #endif
-- 
cgit v1.2.3