aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/src
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-02-23 09:04:38 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-02-23 09:04:38 +0000
commit4256a9113fd16e1b8d7cef963f83931b7d9182ad (patch)
tree5d4e1692bfef3431bcb95255afc8c22915234969 /os/hal/src
parent61524c2014380d425983c269f641c6f7404fb8d9 (diff)
downloadChibiOS-4256a9113fd16e1b8d7cef963f83931b7d9182ad.tar.gz
ChibiOS-4256a9113fd16e1b8d7cef963f83931b7d9182ad.tar.bz2
ChibiOS-4256a9113fd16e1b8d7cef963f83931b7d9182ad.zip
CAN driver enhancements completed.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5303 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/src')
-rw-r--r--os/hal/src/can.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/os/hal/src/can.c b/os/hal/src/can.c
index e0d47d5c5..64aaa45c8 100644
--- a/os/hal/src/can.c
+++ b/os/hal/src/can.c
@@ -145,7 +145,7 @@ void canStop(CANDriver *canp) {
* @note Trying to transmit while in sleep mode simply enqueues the thread.
*
* @param[in] canp pointer to the @p CANDriver object
- * @param[in] mailbox mailbox number, @p CAN_ANY_TX_MAILBOX for any mailbox
+ * @param[in] mailbox mailbox number, @p CAN_ANY_MAILBOX for any mailbox
* @param[in] ctfp pointer to the CAN frame to be transmitted
* @param[in] timeout the number of ticks before the operation timeouts,
* the following special values are allowed:
@@ -164,8 +164,7 @@ msg_t canTransmit(CANDriver *canp,
const CANTxFrame *ctfp,
systime_t timeout) {
- chDbgCheck((canp != NULL) && (ctfp != NULL) &&
- (mailbox <= CAN_TX_MAILBOXES),
+ chDbgCheck((canp != NULL) && (ctfp != NULL) && (mailbox <= CAN_TX_MAILBOXES),
"canTransmit");
chSysLock();
@@ -189,7 +188,7 @@ msg_t canTransmit(CANDriver *canp,
* @note Trying to receive while in sleep mode simply enqueues the thread.
*
* @param[in] canp pointer to the @p CANDriver object
- * @param[in] mailbox mailbox number
+ * @param[in] mailbox mailbox number, @p CAN_ANY_MAILBOX for any mailbox
* @param[out] crfp pointer to the buffer where the CAN frame is copied
* @param[in] timeout the number of ticks before the operation timeouts,
* the following special values are allowed:
@@ -210,8 +209,7 @@ msg_t canReceive(CANDriver *canp,
CANRxFrame *crfp,
systime_t timeout) {
- chDbgCheck((canp != NULL) && (crfp != NULL) &&
- (mailbox >= 1) && (mailbox < CAN_RX_MAILBOXES),
+ chDbgCheck((canp != NULL) && (crfp != NULL) && (mailbox < CAN_RX_MAILBOXES),
"canReceive");
chSysLock();