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

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


The following commit(s) were added to refs/heads/master by this push:
     new b9472129c8 arch/arm/samv7: fix typos in quadrature encoder and timer 
drivers
b9472129c8 is described below

commit b9472129c852db069fc4f11c5b682a5e1e3e831b
Author: Pavel Pisa <[email protected]>
AuthorDate: Mon Sep 11 13:06:04 2023 +0200

    arch/arm/samv7: fix typos in quadrature encoder and timer drivers
    
    The typo s/.timid/.tcid prevents to compile NuttX with
    quadrature encoder configured for timer1 (CONFIG_SAMV7_TC1_QE)
    and s/SAM_TC789_BASE/SAM_TC678_BASE prevented use of the
    of the timer 2.
    
    Signed-off-by: Pavel Pisa <[email protected]>
---
 arch/arm/src/samv7/sam_qencoder.c | 2 +-
 arch/arm/src/samv7/sam_tc.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/samv7/sam_qencoder.c 
b/arch/arm/src/samv7/sam_qencoder.c
index 690366b957..5f125057d9 100644
--- a/arch/arm/src/samv7/sam_qencoder.c
+++ b/arch/arm/src/samv7/sam_qencoder.c
@@ -118,7 +118,7 @@ static struct sam_lowerhalf_s g_tc0lower =
 static struct sam_lowerhalf_s g_tc1lower =
 {
   .ops      = &g_qecallbacks,
-  .timid    = 1,
+  .tcid     = 1,
   .inuse    = false,
 };
 #endif
diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c
index 7f77b6f345..81a49bc5be 100644
--- a/arch/arm/src/samv7/sam_tc.c
+++ b/arch/arm/src/samv7/sam_tc.c
@@ -514,7 +514,7 @@ static struct sam_tc_s g_tc345 =
 static struct sam_tc_s g_tc678 =
 {
   .lock    = NXMUTEX_INITIALIZER,
-  .base    = SAM_TC789_BASE,
+  .base    = SAM_TC678_BASE,
   .tc      = 2,
 };
 #endif

Reply via email to