sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

samv7: fix build error in sam_mcan.c file

Browse Source 
Commit d07792a caused a build error in sam_mcan.c file. This commit fixes
the build. The file now succesfully compiles and CAN works.

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
This commit is contained in:
Michal Lenc 2023-02-17 16:22:10 +01:00 committed by Alan Carvalho de Assis
parent 77f6319268
commit d52e875a99
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/src/samv7/sam_mcan.c
View File

@ -4220,6 +4220,7 @@ static int mcan_hw_initialize(struct sam_mcan_s *priv)
struct can_dev_s *sam_mcan_initialize(int port) struct can_dev_s *sam_mcan_initialize(int port)
{ {
struct sam_mcan_s *priv; struct sam_mcan_s *priv;
struct can_dev_s *dev;
uint32_t regval; uint32_t regval;
caninfo("MCAN%d\n", port); caninfo("MCAN%d\n", port);
@ -4243,13 +4244,14 @@ struct can_dev_s *sam_mcan_initialize(int port)
{ {
/* Select the MCAN0 device structure */ /* Select the MCAN0 device structure */
priv = &g_mcan0priv; dev = &g_mcan0dev;
priv = dev->cd_priv;
/* Configure MCAN0 Message RAM Base Address */ /* Configure MCAN0 Message RAM Base Address */
regval = getreg32(SAM_MATRIX_CAN0); regval = getreg32(SAM_MATRIX_CAN0);
regval &= MATRIX_CAN0_RESERVED; regval &= MATRIX_CAN0_RESERVED;
regval |= (uint32_t)config->msgram.stdfilters & regval |= (uint32_t)priv->config->msgram.stdfilters &
MATRIX_CAN0_CAN0DMABA_MASK; MATRIX_CAN0_CAN0DMABA_MASK;
putreg32(regval, SAM_MATRIX_CAN0); putreg32(regval, SAM_MATRIX_CAN0);
} }
@ -4260,13 +4262,14 @@ struct can_dev_s *sam_mcan_initialize(int port)
{ {
/* Select the MCAN1 device structure */ /* Select the MCAN1 device structure */
priv = &g_mcan1priv; dev = &g_mcan1dev;
priv = dev->cd_priv;
/* Configure MCAN1 Message RAM Base Address */ /* Configure MCAN1 Message RAM Base Address */
regval = getreg32(SAM_MATRIX_CCFG_SYSIO); regval = getreg32(SAM_MATRIX_CCFG_SYSIO);
regval &= ~MATRIX_CCFG_CAN1DMABA_MASK; regval &= ~MATRIX_CCFG_CAN1DMABA_MASK;
regval |= (uint32_t)config->msgram.stdfilters & regval |= (uint32_t)priv->config->msgram.stdfilters &
MATRIX_CCFG_CAN1DMABA_MASK; MATRIX_CCFG_CAN1DMABA_MASK;
putreg32(regval, SAM_MATRIX_CCFG_SYSIO); putreg32(regval, SAM_MATRIX_CCFG_SYSIO);
} }