You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2023/02/17 17:58:46 UTC

[nuttx] 01/02: samv7: fix build error in sam_mcan.c file

This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit d52e875a99811721a81326e8ab03949d99485612
Author: Michal Lenc <mi...@seznam.cz>
AuthorDate: Fri Feb 17 16:22:10 2023 +0100

    samv7: fix build error in sam_mcan.c file
    
    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 <mi...@seznam.cz>
---
 arch/arm/src/samv7/sam_mcan.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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