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 2022/01/03 14:10:31 UTC

[incubator-nuttx] branch master updated: typos: fix typos in many files

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/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 6c2b40f  typos: fix typos in many files
6c2b40f is described below

commit 6c2b40f98a69daf910bea616f97a23c090e67fb6
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Mon Jan 3 14:50:04 2022 +0200

    typos: fix typos in many files
    
    Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
 arch/arm/src/sam34/sam4cm_tc.h                        | 2 +-
 arch/arm/src/samd5e5/sam_tc.h                         | 2 +-
 arch/arm/src/samv7/Kconfig                            | 2 +-
 arch/arm/src/samv7/hardware/sam_tc.h                  | 4 ++--
 arch/arm/src/stm32/stm32_qencoder.c                   | 6 ++----
 arch/arm/src/tiva/common/tiva_qencoder.c              | 6 +++---
 boards/arm/kinetis/freedom-k28f/src/k28_automount.c   | 2 +-
 boards/arm/kinetis/freedom-k64f/src/k64_automount.c   | 2 +-
 boards/arm/kinetis/freedom-k66f/src/k66_automount.c   | 2 +-
 boards/arm/kinetis/twr-k64f120m/src/k64_automount.c   | 2 +-
 boards/arm/sama5/sama5d4-ek/src/sam_automount.c       | 2 +-
 boards/arm/samd5e5/metro-m4/src/sam_automount.c       | 2 +-
 boards/arm/samv7/common/src/sam_automount.c           | 2 +-
 boards/arm/samv7/same70-qmtech/README.txt             | 2 +-
 boards/arm/samv7/same70-xplained/README.txt           | 2 +-
 boards/arm/samv7/samv71-xult/README.txt               | 2 +-
 boards/arm/stm32/clicker2-stm32/src/stm32_automount.c | 2 +-
 drivers/analog/ad5410.c                               | 1 -
 include/nuttx/sensors/hall3ph.h                       | 2 +-
 include/nuttx/sensors/qencoder.h                      | 4 +++-
 20 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/arch/arm/src/sam34/sam4cm_tc.h b/arch/arm/src/sam34/sam4cm_tc.h
index ccc529f..1bcd3a7 100644
--- a/arch/arm/src/sam34/sam4cm_tc.h
+++ b/arch/arm/src/sam34/sam4cm_tc.h
@@ -199,7 +199,7 @@ tc_handler_t sam_tc_attach(TC_HANDLE handle, tc_handler_t handler,
  * Name: sam_tc_getpending
  *
  * Description:
- *   Return the current contents of the interrutp status register, clearing
+ *   Return the current contents of the interrupt status register, clearing
  *   all pending interrupts.
  *
  * Input Parameters:
diff --git a/arch/arm/src/samd5e5/sam_tc.h b/arch/arm/src/samd5e5/sam_tc.h
index 7402f30..4154c81 100644
--- a/arch/arm/src/samd5e5/sam_tc.h
+++ b/arch/arm/src/samd5e5/sam_tc.h
@@ -227,7 +227,7 @@ tc_handler_t sam_tc_attach(TC_HANDLE handle, tc_handler_t handler,
  * Name: sam_tc_getpending
  *
  * Description:
- *   Return the current contents of the interrutp status register, clearing
+ *   Return the current contents of the interrupt status register, clearing
  *   all pending interrupts.
  *
  * Input Parameters:
diff --git a/arch/arm/src/samv7/Kconfig b/arch/arm/src/samv7/Kconfig
index bff19e9..676b469 100644
--- a/arch/arm/src/samv7/Kconfig
+++ b/arch/arm/src/samv7/Kconfig
@@ -614,7 +614,7 @@ config SAMV7_QSPI_SPI_MODE
 	default n
 	depends on SAMV7_QSPI_IS_SPI
 	---help---
-					Use Quad SPI in SPI mode
+		Use Quad SPI in SPI mode
 
 endif
 
diff --git a/arch/arm/src/samv7/hardware/sam_tc.h b/arch/arm/src/samv7/hardware/sam_tc.h
index d4322fd..ef07b5e 100644
--- a/arch/arm/src/samv7/hardware/sam_tc.h
+++ b/arch/arm/src/samv7/hardware/sam_tc.h
@@ -417,7 +417,7 @@
 #define TC_CMR_BURST_SHIFT       (4)       /* Bits 4-5: Burst Signal Selection */
 #define TC_CMR_BURST_MASK        (3 << TC_CMR_BURST_SHIFT)
 #  define TC_CMR_BURST_NONE      (0 << TC_CMR_BURST_SHIFT) /* Clock not gated by external signal */
-#  define TC_CMR_BURST_XC0       (1 << TC_CMR_BURST_SHIFT) /* XXC0 ANDed with clock */
+#  define TC_CMR_BURST_XC0       (1 << TC_CMR_BURST_SHIFT) /* XC0 ANDed with clock */
 #  define TC_CMR_BURST_XC1       (2 << TC_CMR_BURST_SHIFT) /* XC1 ANDed with clock */
 #  define TC_CMR_BURST_XC2       (3 << TC_CMR_BURST_SHIFT) /* XC2 ANDed with clock */
 
@@ -633,7 +633,7 @@
 #define TC_QINT_DIRCHG           (1 << 1)  /* Bit 1:  Direction change */
 #define TC_QINT_QERR             (1 << 2)  /* Bit 2:  Quadrature ERRor */
 
-#define TC_QISR_DIRR             (1 << 8)  /* Bit 8: Direction */
+#define TC_QISR_DIR              (1 << 8)  /* Bit 8:  Direction */
 
 /* Fault Mode Register */
 
diff --git a/arch/arm/src/stm32/stm32_qencoder.c b/arch/arm/src/stm32/stm32_qencoder.c
index 33aa592..7df68e2 100644
--- a/arch/arm/src/stm32/stm32_qencoder.c
+++ b/arch/arm/src/stm32/stm32_qencoder.c
@@ -796,7 +796,7 @@ static int stm32_qe_index_irq(int irq, FAR void *context, FAR void *arg)
 
   if (valid == true)
     {
-      /* Force postion to index offset */
+      /* Force position to index offset */
 
       stm32_putreg32(priv, STM32_GTIM_CNT_OFFSET, priv->index_offset);
     }
@@ -1296,7 +1296,7 @@ static int stm32_reset(FAR struct qe_lowerhalf_s *lower)
  * Name: stm32_setindex
  *
  * Description:
- *   Set the index pin postion
+ *   Set the index pin position
  *
  ****************************************************************************/
 
@@ -1320,9 +1320,7 @@ static int stm32_setindex(FAR struct qe_lowerhalf_s *lower, uint32_t pos)
       goto errout;
     }
 
-#ifdef CONFIG_STM32_QENCODER_INDEX_PIN
   priv->index_offset = pos;
-#endif
 
 errout:
   return ret;
diff --git a/arch/arm/src/tiva/common/tiva_qencoder.c b/arch/arm/src/tiva/common/tiva_qencoder.c
index ac205cd..f11be1a 100644
--- a/arch/arm/src/tiva/common/tiva_qencoder.c
+++ b/arch/arm/src/tiva/common/tiva_qencoder.c
@@ -346,7 +346,7 @@ static int tiva_qe_reset(FAR struct qe_lowerhalf_s *lower)
  * Name: tiva_qe_position
  *
  * Description:
- *   Return the position mesaured by QEI.
+ *   Return the position measured by QEI.
  *
  * Input Parameters:
  *   lower - A reference to the lower half QEI driver state structure
@@ -426,7 +426,7 @@ static int tiva_qe_ioctl(FAR struct qe_lowerhalf_s *lower, int cmd,
  * Name: tiva_qe_direction
  *
  * Description:
- *   Return the direction mesaured by QEI.
+ *   Return the direction measured by QEI.
  *
  * Input Parameters:
  *   qe - A reference to the TIVA QEI structure
@@ -457,7 +457,7 @@ static int tiva_qe_direction(FAR struct tiva_qe_s *qe, unsigned long *dir)
  * Name: tiva_qe_direction
  *
  * Description:
- *   Return the velocity (A/B pulses per second) mesaured by QEI.
+ *   Return the velocity (A/B pulses per second) measured by QEI.
  *
  * Input Parameters:
  *   qe - A reference to the TIVA QEI structure
diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_automount.c b/boards/arm/kinetis/freedom-k28f/src/k28_automount.c
index f7cb8de..967b9ca 100644
--- a/boards/arm/kinetis/freedom-k28f/src/k28_automount.c
+++ b/boards/arm/kinetis/freedom-k28f/src/k28_automount.c
@@ -190,7 +190,7 @@ static void k28_sdhc_enable(FAR const struct automount_lower_s *lower,
 
   if (enable && state->pending)
     {
-      /* Yes.. perform the fake interrupt if the interrutp is attached */
+      /* Yes.. perform the fake interrupt if the interrupt is attached */
 
       if (state->handler)
         {
diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_automount.c b/boards/arm/kinetis/freedom-k64f/src/k64_automount.c
index 209b2c0..1858a20 100644
--- a/boards/arm/kinetis/freedom-k64f/src/k64_automount.c
+++ b/boards/arm/kinetis/freedom-k64f/src/k64_automount.c
@@ -190,7 +190,7 @@ static void k64_enable(FAR const struct automount_lower_s *lower,
 
   if (enable && state->pending)
     {
-      /* Yes.. perform the fake interrupt if the interrutp is attached */
+      /* Yes.. perform the fake interrupt if the interrupt is attached */
 
       if (state->handler)
         {
diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_automount.c b/boards/arm/kinetis/freedom-k66f/src/k66_automount.c
index d78a7a7..7437a38 100644
--- a/boards/arm/kinetis/freedom-k66f/src/k66_automount.c
+++ b/boards/arm/kinetis/freedom-k66f/src/k66_automount.c
@@ -190,7 +190,7 @@ static void k66_enable(FAR const struct automount_lower_s *lower,
 
   if (enable && state->pending)
     {
-      /* Yes.. perform the fake interrupt if the interrutp is attached */
+      /* Yes.. perform the fake interrupt if the interrupt is attached */
 
       if (state->handler)
         {
diff --git a/boards/arm/kinetis/twr-k64f120m/src/k64_automount.c b/boards/arm/kinetis/twr-k64f120m/src/k64_automount.c
index 8f9a396..c7c8f7f 100644
--- a/boards/arm/kinetis/twr-k64f120m/src/k64_automount.c
+++ b/boards/arm/kinetis/twr-k64f120m/src/k64_automount.c
@@ -178,7 +178,7 @@ static void k64_enable(FAR const struct automount_lower_s *lower,
 
   if (enable && state->pending)
     {
-      /* Yes.. perform the fake interrupt if the interrutp is attached */
+      /* Yes.. perform the fake interrupt if the interrupt is attached */
 
       if (state->handler)
         {
diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_automount.c b/boards/arm/sama5/sama5d4-ek/src/sam_automount.c
index 9a19d26..0f3685c 100644
--- a/boards/arm/sama5/sama5d4-ek/src/sam_automount.c
+++ b/boards/arm/sama5/sama5d4-ek/src/sam_automount.c
@@ -214,7 +214,7 @@ static void sam_enable(FAR const struct automount_lower_s *lower,
 
   if (enable && state->pending)
     {
-      /* Yes.. perform the fake interrupt if the interrutp is attached */
+      /* Yes.. perform the fake interrupt if the interrupt is attached */
 
       if (state->handler)
         {
diff --git a/boards/arm/samd5e5/metro-m4/src/sam_automount.c b/boards/arm/samd5e5/metro-m4/src/sam_automount.c
index 3e9ebab..df7b3bb 100644
--- a/boards/arm/samd5e5/metro-m4/src/sam_automount.c
+++ b/boards/arm/samd5e5/metro-m4/src/sam_automount.c
@@ -197,7 +197,7 @@ static void sam_enable(FAR const struct automount_lower_s *lower,
 
   if (enable && state->pending)
     {
-      /* Yes.. perform the fake interrupt if the interrutp is attached */
+      /* Yes.. perform the fake interrupt if the interrupt is attached */
 
       if (state->handler)
         {
diff --git a/boards/arm/samv7/common/src/sam_automount.c b/boards/arm/samv7/common/src/sam_automount.c
index 1c6dff6..66f3785 100644
--- a/boards/arm/samv7/common/src/sam_automount.c
+++ b/boards/arm/samv7/common/src/sam_automount.c
@@ -184,7 +184,7 @@ static void sam_enable(FAR const struct automount_lower_s *lower,
 
   if (enable && state->pending)
     {
-      /* Yes.. perform the fake interrupt if the interrutp is attached */
+      /* Yes.. perform the fake interrupt if the interrupt is attached */
 
       if (state->handler)
         {
diff --git a/boards/arm/samv7/same70-qmtech/README.txt b/boards/arm/samv7/same70-qmtech/README.txt
index 72d73a7..a278bc7 100644
--- a/boards/arm/samv7/same70-qmtech/README.txt
+++ b/boards/arm/samv7/same70-qmtech/README.txt
@@ -229,7 +229,7 @@ button.
 SPI Slave
 =========
 
-  An interrutp driven SPI slave driver as added on 2015-08-09 but has not
+  An interrupt driven SPI slave driver as added on 2015-08-09 but has not
   been verified as of this writing. See discussion in include/nuttx/spi/slave.h
   and below.
 
diff --git a/boards/arm/samv7/same70-xplained/README.txt b/boards/arm/samv7/same70-xplained/README.txt
index effa470..ab3aa02 100644
--- a/boards/arm/samv7/same70-xplained/README.txt
+++ b/boards/arm/samv7/same70-xplained/README.txt
@@ -752,7 +752,7 @@ MCAN1 Loopback Test
 SPI Slave
 =========
 
-  An interrutp driven SPI slave driver as added on 2015-08-09 but has not
+  An interrupt driven SPI slave driver as added on 2015-08-09 but has not
   been verified as of this writing. See discussion in include/nuttx/spi/slave.h
   and below.
 
diff --git a/boards/arm/samv7/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt
index 9dff9b7..4608515 100644
--- a/boards/arm/samv7/samv71-xult/README.txt
+++ b/boards/arm/samv7/samv71-xult/README.txt
@@ -1352,7 +1352,7 @@ MCAN1 Loopback Test
 SPI Slave
 =========
 
-  An interrutp driven SPI slave driver as added on 2015-08-09 but has not
+  An interrupt driven SPI slave driver as added on 2015-08-09 but has not
   been verified as of this writing. See discussion in include/nuttx/spi/slave.h
   and below.
 
diff --git a/boards/arm/stm32/clicker2-stm32/src/stm32_automount.c b/boards/arm/stm32/clicker2-stm32/src/stm32_automount.c
index b2a0c81..ed62a97 100644
--- a/boards/arm/stm32/clicker2-stm32/src/stm32_automount.c
+++ b/boards/arm/stm32/clicker2-stm32/src/stm32_automount.c
@@ -210,7 +210,7 @@ static void stm32_enable(FAR const struct automount_lower_s *lower,
 
   if (enable && state->pending)
     {
-      /* Yes.. perform the fake interrupt if the interrutp is attached */
+      /* Yes.. perform the fake interrupt if the interrupt is attached */
 
       if (state->handler)
         {
diff --git a/drivers/analog/ad5410.c b/drivers/analog/ad5410.c
index 486263a..27020da 100644
--- a/drivers/analog/ad5410.c
+++ b/drivers/analog/ad5410.c
@@ -104,7 +104,6 @@ static void dac_shutdown(FAR struct dac_dev_s *dev);
 static void dac_txint(FAR struct dac_dev_s *dev, bool enable);
 static int  dac_send(FAR struct dac_dev_s *dev, FAR struct dac_msg_s *msg);
 static int  dac_ioctl(FAR struct dac_dev_s *dev, int cmd, unsigned long arg);
-static int  dac_interrupt(int irq, void *context, FAR void *arg);
 
 /****************************************************************************
  * Private Data
diff --git a/include/nuttx/sensors/hall3ph.h b/include/nuttx/sensors/hall3ph.h
index d4dc2dd..93b46dc 100644
--- a/include/nuttx/sensors/hall3ph.h
+++ b/include/nuttx/sensors/hall3ph.h
@@ -46,7 +46,7 @@ enum hall3_120deg_position_e
   HALL3_120DEG_POS_6 = 0b101
 };
 
-/* 60-degree Hall effect sensors postions */
+/* 60-degree Hall effect sensors positions */
 
 enum hall3_60deg_position_e
 {
diff --git a/include/nuttx/sensors/qencoder.h b/include/nuttx/sensors/qencoder.h
index 6400cef..ba3e6e0 100644
--- a/include/nuttx/sensors/qencoder.h
+++ b/include/nuttx/sensors/qencoder.h
@@ -50,8 +50,10 @@
  *   Argument: int32_t pointer to the location to return the position.
  * QEIOC_RESET - Reset the position to zero.
  *   Argument: None
- * QEIOC_POSMAX - Set the maximum position for the encoder.
+ * QEIOC_SETPOSMAX - Set the maximum position for the encoder.
  *   Argument: uint32_t maximum position
+ * QEIOC_SETINDEX - Set the index position for the encoder.
+ *   Argument: uint32_t index position
  */
 
 #define QEIOC_POSITION     _QEIOC(0x0001) /* Arg: int32_t* pointer */