I'll create a PR for this one.
The patch didn't apply cleanly so I did a search/replace.
On Fri, Nov 6, 2020 at 1:07 PM Gregory Nutt <spudan...@gmail.com> wrote:
>
> In case the attachment does not make it through the mailing list. I put
> the content inline below:
>
> Problem was introduced by patch "Re-rename the stm32l4 can driver functions"
> probably.
>
> Signed-off-by: Pavel Pisa<pp...@pikron.com>
> ---
> arch/arm/src/stm32l4/stm32l4_can.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/src/stm32l4/stm32l4_can.c
> b/arch/arm/src/stm32l4/stm32l4_can.c
> index 3caca66823..1f761d488e 100644
> --- a/arch/arm/src/stm32l4/stm32l4_can.c
> +++ b/arch/arm/src/stm32l4/stm32l4_can.c
> @@ -1076,12 +1076,12 @@ static int stm32l4can_ioctl(FAR struct can_dev_s
> *dev, int cmd,
> case CANIOC_SET_NART:
> {
> uint32_t regval;
> - ret = stm32can_enterinitmode(priv);
> + ret = stm32l4can_enterinitmode(priv);
> if (ret != 0)
> {
> return ret;
> }
> - regval = stm32can_getreg(priv, STM32_CAN_MCR_OFFSET);
> + regval = stm32l4can_getreg(priv, STM32L4_CAN_MCR_OFFSET);
> if (arg == 1)
> {
> regval |= CAN_MCR_NART;
> @@ -1090,20 +1090,20 @@ static int stm32l4can_ioctl(FAR struct can_dev_s
> *dev, int cmd,
> {
> regval &= ~CAN_MCR_NART;
> }
> - stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
> - return stm32can_exitinitmode(priv);
> + stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
> + return stm32l4can_exitinitmode(priv);
> }
> break;
>
> case CANIOC_SET_ABOM:
> {
> uint32_t regval;
> - ret = stm32can_enterinitmode(priv);
> + ret = stm32l4can_enterinitmode(priv);
> if (ret != 0)
> {
> return ret;
> }
> - regval = stm32can_getreg(priv, STM32_CAN_MCR_OFFSET);
> + regval = stm32l4can_getreg(priv, STM32L4_CAN_MCR_OFFSET);
> if (arg == 1)
> {
> regval |= CAN_MCR_ABOM;
> @@ -1112,8 +1112,8 @@ static int stm32l4can_ioctl(FAR struct can_dev_s *dev,
> int cmd,
> {
> regval &= ~CAN_MCR_ABOM;
> }
> - stm32can_putreg(priv, STM32_CAN_MCR_OFFSET, regval);
> - return stm32can_exitinitmode(priv);
> + stm32l4can_putreg(priv, STM32L4_CAN_MCR_OFFSET, regval);
> + return stm32l4can_exitinitmode(priv);
> }
> break;
>
> -- 2.20.1
>
> On 11/3/2020 6:40 PM, Gregory Nutt wrote:
> >
> > Hi, Pavel,
> >
> > I know longer deal with patches and changes directly. These are
> > handled only by the development team and usually only by PRs to
> > github/apache/inclubator NuttX.
> >
> > I am putting dev@nuttx.apache.org on distribution. Because of list
> > security, the attachment could be lost.
> >
> > Greg
> >
> >
> >
> > -------- Forwarded Message --------
> > Subject: Fwd: [PATCH 1/1] stm32l4: correct build of stm32l4_can.c to
> > respect L4 variant.
> > Date: Wed, 4 Nov 2020 00:26:36 +0100
> > From: Pavel Pisa <pp...@pikron.com>
> > Organization: PiKRON Ltd.
> > To: Gregory Nutt <spudan...@gmail.com>
> >
> >
> >
> > Hello Greg,
> >
> > I hope that you are doing well.
> > I am happy that Michal Lenc has succeed to run NuttX
> > on Teensy 4.0/1. There is chance that Electroline
> > would use that support and I expect use at university
> > as well. By the way, how it is with copyright,
> > if the copyright preamble assigns right to Apache,
> > is it still possible to write name of the real author/
> > person into the file. I would be happy if Michal Lenc
> > credit for his CAN FD and Teensy work is shown somewhere.
> > It is important to motivate him and even more future
> > studnets.
> > I have tried to update BSP for their previous
> > STM32L$ based board an I have found problem
> > with names missmatch in arch/arm/src/stm32l4/stm32l4_can.c
> > I have sent patch but received no reply till now,
> > have you seen attached e/mail/patch?
> > Please, can you check it and commit.
> > I cannot use CAN on STM32L4 based board without this fix.
> >
> > Best wishes,
> >
> > Pavel
> >
