You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/19 08:22:53 UTC
[incubator-nuttx] 03/03: stm32l4: correct macros
STM32L4_CAN_MCR_OFFSET, etc... to match defines.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit be2c2f8a73a8cc84301a376206f9847c060ba2a7
Author: Pavel Pisa <pp...@pikron.com>
AuthorDate: Wed Nov 18 21:57:54 2020 +0100
stm32l4: correct macros STM32L4_CAN_MCR_OFFSET, etc... to match defines.
It seems that part of the patch
stm32l4: correct build of stm32l4_can.c to respect L4 variant
has been lost on its way to mainline.
Signed-off-by: Pavel Pisa <pp...@pikron.com>
---
arch/arm/src/stm32l4/stm32l4_can.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index e56b499..5d1890b 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -1092,7 +1092,7 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
return ret;
}
- regval = stm32l4can_getreg(priv, STM32_CAN_MCR_OFFSET);
+ regval = stm32l4can_getreg(priv, STM32L4_CAN_MCR_OFFSET);
if (arg == 1)
{
regval |= CAN_MCR_NART;
@@ -1102,7 +1102,7 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
regval &= ~CAN_MCR_NART;
}
- stm32l4can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
+ stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
return stm32l4can_exitinitmode(priv);
}
break;
@@ -1116,7 +1116,7 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
return ret;
}
- regval = stm32l4can_getreg(priv, STM32_CAN_MCR_OFFSET);
+ regval = stm32l4can_getreg(priv, STM32L4_CAN_MCR_OFFSET);
if (arg == 1)
{
regval |= CAN_MCR_ABOM;
@@ -1126,7 +1126,7 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev, int cmd,
regval &= ~CAN_MCR_ABOM;
}
- stm32l4can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
+ stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
return stm32l4can_exitinitmode(priv);
}
break;