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

2 files changed, 1 insertions, 11 deletions

diff --git a/os/hal/include/can.h b/os/hal/include/can.h
index 6cd2f55c1..4d502c0d2 100644
--- a/os/hal/include/can.h
+++ b/os/hal/include/can.h
@@ -122,16 +122,6 @@ typedef enum {
  * @brief   Converts a mailbox index to a bit mask.

  */

 #define CAN_MAILBOX_TO_MASK(mbx) (1 << ((mbx) - 1))

-

-/**

- * @brief   Adds some flags to the CAN status mask.

- *

- * @param[in] canp      pointer to the @p CANDriver object

- * @param[in] mask      flags to be added to the status mask

- *

- * @iclass

- */

-#define canAddFlagsI(canp, mask) ((canp)->status |= (mask))

 /** @} */

 

 /*===========================================================================*/

diff --git a/os/hal/src/can.c b/os/hal/src/can.c
index a57f12356..3f1f7588f 100644
--- a/os/hal/src/can.c
+++ b/os/hal/src/can.c
@@ -131,10 +131,10 @@ void canStop(CANDriver *canp) {
   chDbgAssert((canp->state == CAN_STOP) || (canp->state == CAN_READY),

               "canStop(), #1", "invalid state");

   can_lld_stop(canp);

+  canp->state  = CAN_STOP;

   chSemResetI(&canp->rxsem, 0);

   chSemResetI(&canp->txsem, 0);

   chSchRescheduleS();

-  canp->state  = CAN_STOP;

   chSysUnlock();

 }