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

1 files changed, 4 insertions, 8 deletions

diff --git a/os/hal/platforms/STM32/can_lld.c b/os/hal/platforms/STM32/can_lld.c
index 2febf5bc9..a53a8fe27 100644
--- a/os/hal/platforms/STM32/can_lld.c
+++ b/os/hal/platforms/STM32/can_lld.c
@@ -404,8 +404,7 @@ void can_lld_start(CANDriver *canp) {
 #if STM32_CAN_USE_CAN2

   if (&CAND2 == canp) {

 

-    osalDbgAssert(CAND1.state != CAN_STOP,

-                  "can_lld_start(), #1", "CAN1 must be started");

+    osalDbgAssert(CAND1.state != CAN_STOP, "CAN1 must be started");

 

     nvicEnableVector(STM32_CAN2_TX_NUMBER, STM32_CAN_CAN2_IRQ_PRIORITY);

     nvicEnableVector(STM32_CAN2_RX0_NUMBER, STM32_CAN_CAN2_IRQ_PRIORITY);

@@ -447,8 +446,7 @@ void can_lld_stop(CANDriver *canp) {
     if (&CAND1 == canp) {

 

 #if STM32_CAN_USE_CAN2

-      osalDbgAssert(CAND2.state == CAN_STOP,

-                    "can_lld_stop(), #1", "CAN2 must be stopped");

+      osalDbgAssert(CAND2.state == CAN_STOP, "CAN2 must be stopped");

 #endif

 

       CAN1->MCR = 0x00010002;                   /* Register reset value.    */

@@ -690,12 +688,10 @@ void canSTM32SetFilters(uint32_t can2sb, uint32_t num, const CANFilter *cfp) {
                (num < STM32_CAN_MAX_FILTERS));

 

 #if STM32_CAN_USE_CAN1

-  osalDbgAssert(CAND1.state == CAN_STOP,

-                "canSTM32SetFilters(), #1", "invalid state");

+  osalDbgAssert(CAND1.state == CAN_STOP, "invalid state");

 #endif

 #if STM32_CAN_USE_CAN2

-  osalDbgAssert(CAND2.state == CAN_STOP,

-                "canSTM32SetFilters(), #2", "invalid state");

+  osalDbgAssert(CAND2.state == CAN_STOP, "invalid state");

 #endif

 

   can_lld_set_filters(can2sb, num, cfp);