diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-24 08:23:05 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-24 08:23:05 -0600 |
| commit | 645f4a745b5454572e970237ce471783097bcd7a (patch) | |
| tree | b5d1e7d785553a5f365b3e87668c6d81372ccfc8 /nuttx/arch | |
| parent | 320c8fc4dc652753f398b2df019196bb03ba528b (diff) | |
| download | px4-nuttx-645f4a745b5454572e970237ce471783097bcd7a.tar.gz px4-nuttx-645f4a745b5454572e970237ce471783097bcd7a.tar.bz2 px4-nuttx-645f4a745b5454572e970237ce471783097bcd7a.zip | |
STM32 CAN correction suggested by Max Holtzberg
Diffstat (limited to 'nuttx/arch')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_can.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_can.c b/nuttx/arch/arm/src/stm32/stm32_can.c index ddedce82e..6c1137579 100644 --- a/nuttx/arch/arm/src/stm32/stm32_can.c +++ b/nuttx/arch/arm/src/stm32/stm32_can.c @@ -820,15 +820,15 @@ static int can_send(FAR struct can_dev_s *dev, FAR struct can_msg_s *msg) /* Select one empty transmit mailbox */ regval = can_getreg(priv, STM32_CAN_TSR_OFFSET); - if ((regval & CAN_TSR_TME0) != 0) + if ((regval & CAN_TSR_TME0) != 0 && (regval & CAN_TSR_RQCP0) == 0) { txmb = 0; } - else if ((regval & CAN_TSR_TME1) != 0) + else if ((regval & CAN_TSR_TME1) != 0 && (regval & CAN_TSR_RQCP1) == 0) { txmb = 1; } - else if ((regval & CAN_TSR_TME2) != 0) + else if ((regval & CAN_TSR_TME2) != 0 && (regval & CAN_TSR_RQCP2) == 0) { txmb = 2; } |