From 8bd5eb3a68db1570f9043a42a23ef59f184417ab Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 5 Jul 2013 10:03:21 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5928
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/include/can.h         | 10 ----------
 os/hal/src/can.c             |  2 +-
 os/kernel/include/chevents.h |  2 +-
 os/kernel/src/chevents.c     |  2 +-
 4 files changed, 3 insertions(+), 13 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();
 }
 
diff --git a/os/kernel/include/chevents.h b/os/kernel/include/chevents.h
index ec5c1cb93..d8bd269ea 100644
--- a/os/kernel/include/chevents.h
+++ b/os/kernel/include/chevents.h
@@ -120,7 +120,7 @@ typedef void (*evhandler_t)(eventid_t);
  * @note    This function can be invoked before the kernel is initialized
  *          because it just prepares a @p EventSource structure.
  *
- * @param[in] esp       pointer to the @p EventSource structure
+ * @param[out] esp      pointer to the @p EventSource structure
  *
  * @init
  */
diff --git a/os/kernel/src/chevents.c b/os/kernel/src/chevents.c
index 1a2285779..51c626bf9 100644
--- a/os/kernel/src/chevents.c
+++ b/os/kernel/src/chevents.c
@@ -69,7 +69,7 @@
  *          different threads.
  *
  * @param[in] esp       pointer to the  @p EventSource structure
- * @param[in] elp       pointer to the @p EventListener structure
+ * @param[out] elp      pointer to the @p EventListener structure
  * @param[in] mask      the mask of event flags to be ORed to the thread when
  *                      the event source is broadcasted
  *
-- 
cgit v1.2.3