Removed 2nd parameter to assertion and check macros.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6122 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 7 insertions, 9 deletions

diff --git a/os/hal/osal/chibios/osal.c b/os/hal/osal/chibios/osal.c
index 8b0398538..65912ce7e 100644
--- a/os/hal/osal/chibios/osal.c
+++ b/os/hal/osal/chibios/osal.c
@@ -96,7 +96,7 @@ void osalSysHalt(const char *reason) {
  */

 msg_t osalThreadSuspendS(thread_reference_t *trp) {

 

-  chDbgAssert(*trp == NULL, "osalThreadSuspendS(), #1", "not NULL");

+  chDbgAssert(*trp == NULL, "not NULL");

 

   *trp = (thread_reference_t)chThdSelf();

   chSchGoSleepS(CH_STATE_SUSPENDED);

@@ -118,7 +118,7 @@ void osalThreadResumeI(thread_reference_t *trp, msg_t msg) {
   if (*trp != NULL) {

 

     chDbgAssert((*trp)->p_state == CH_STATE_SUSPENDED,

-                "osalThreadResumeI(), #1", "not THD_STATE_SUSPENDED");

+                "not THD_STATE_SUSPENDED");

 

     (*trp)->p_u.rdymsg = msg;

     chSchReadyI((thread_t *)*trp);

@@ -141,8 +141,7 @@ void osalThreadResumeS(thread_reference_t *trp, msg_t msg) {
   if (*trp != NULL) {

     thread_t *tp = (thread_t *)*trp;

 

-    chDbgAssert(tp->p_state == CH_STATE_SUSPENDED,

-                "osalThreadResumeS(), #1", "not THD_STATE_SUSPENDED");

+    chDbgAssert(tp->p_state == CH_STATE_SUSPENDED, "not THD_STATE_SUSPENDED");

 

     *trp = NULL;

     chSchWakeupS(tp, msg);

diff --git a/os/hal/osal/chibios/osal.h b/os/hal/osal/chibios/osal.h
index 726782d8b..fa48f3aa6 100644
--- a/os/hal/osal/chibios/osal.h
+++ b/os/hal/osal/chibios/osal.h
@@ -188,8 +188,8 @@ typedef struct {
 

 /**

  * @brief   Condition assertion.

- * @details If the condition check fails then the OSAL panics with the

- *          specified message and halts.

+ * @details If the condition check fails then the OSAL panics with a

+ *          message and halts.

  * @note    The condition is tested only if the @p OSAL_ENABLE_ASSERTIONS

  *          switch is enabled.

  * @note    The convention for the message is the following:<br>

@@ -198,12 +198,11 @@ typedef struct {
  *          comment in the code about the assertion.

  *

  * @param[in] c         the condition to be verified to be true

- * @param[in] msg       the text message

  * @param[in] remark    a remark string

  *

  * @api

  */

-#define osalDbgAssert(c, msg, remark) chDbgAssert(c, msg, remark)

+#define osalDbgAssert(c, remark) chDbgAssert(c, remark)

 

 /**

  * @brief   Function parameters check.

@@ -215,7 +214,7 @@ typedef struct {
  *

  * @api

  */

-#define osalDbgCheck(c) chDbgCheck(c, __FUNCTION__)

+#define osalDbgCheck(c) chDbgCheck(c)

 

 /**

  * @brief   I-Class state check.