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 2020/01/14 14:47:47 UTC

[incubator-nuttx] 04/07: Fix a few errors concerning use of section block comments in .c files: (#95)

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

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

commit b85c035b5038078791bf7dcb280b231e89b96232
Author: patacongo <sp...@yahoo.com>
AuthorDate: Mon Jan 13 17:37:54 2020 -0600

    Fix a few errors concerning use of section block comments in .c files: (#95)
    
    1. No .c file should include a "Public Types" section.  Only a header file can define a public type.  A .c file can only define a private type.  Several files contained private type definitions.  The section that they were defined in, however, was incorrectly named "Public Types."  Those were easilty changed to "Private Types" which is what they are.
    
    2. No .c file should include a "Public Function Prototypes" section.  All global function prototypes should be provided via a header file and never declared with a .c file.
    
    For No. 2, I corrected as many cases as was reasonable for the time that I had available.  But there are still a dozen or so .c files that declare "Public Function Prototypes" within a .c file.  This is bad programming style.  These declarations should all be moved to the proper header files.
---
 arch/arm/src/cxd56xx/cxd56_dmac.c                  |  2 +-
 arch/arm/src/cxd56xx/cxd56_udmac.c                 |  2 +-
 arch/arm/src/efm32/efm32_dma.c                     |  3 ++-
 arch/arm/src/efm32/efm32_gpioirq.c                 |  2 +-
 arch/arm/src/imx1/imx_boot.c                       |  2 +-
 arch/arm/src/stm32/stm32_ccm.c                     |  2 +-
 arch/arm/src/stm32f7/stm32_dtcm.c                  | 10 +--------
 arch/hc/src/m9s12/m9s12_dumpgpio.c                 |  2 +-
 arch/renesas/src/rx65n/rx65n_eth.c                 |  2 +-
 arch/sim/src/sim/up_testset.c                      |  4 +++-
 boards/arm/cxd56xx/drivers/audio/cxd56_audio.c     |  4 ----
 .../arm/cxd56xx/drivers/audio/cxd56_audio_ac_reg.c |  8 --------
 boards/arm/cxd56xx/drivers/audio/cxd56_audio_aca.c |  8 --------
 .../arm/cxd56xx/drivers/audio/cxd56_audio_analog.c |  6 +++---
 .../cxd56xx/drivers/audio/cxd56_audio_bca_reg.c    |  8 --------
 .../arm/cxd56xx/drivers/audio/cxd56_audio_beep.c   |  8 --------
 .../arm/cxd56xx/drivers/audio/cxd56_audio_config.c |  9 +-------
 .../cxd56xx/drivers/audio/cxd56_audio_digital.c    | 20 ------------------
 boards/arm/cxd56xx/drivers/audio/cxd56_audio_dma.c | 20 +++++-------------
 .../arm/cxd56xx/drivers/audio/cxd56_audio_filter.c | 20 ------------------
 boards/arm/cxd56xx/drivers/audio/cxd56_audio_irq.c | 16 ---------------
 boards/arm/cxd56xx/drivers/audio/cxd56_audio_mic.c | 16 ---------------
 .../arm/cxd56xx/drivers/audio/cxd56_audio_power.c  | 16 ---------------
 .../arm/cxd56xx/drivers/audio/cxd56_audio_volume.c |  8 --------
 boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h | 14 +++++++++++--
 boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c |  8 --------
 boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c   |  2 +-
 boards/arm/stm32/omnibusf4/src/omnibusf4.h         | 24 ++++++++++++++++++++++
 boards/arm/stm32/omnibusf4/src/stm32_bringup.c     | 16 ---------------
 fs/nxffs/nxffs_cache.c                             | 16 ---------------
 fs/nxffs/nxffs_pack.c                              |  6 +-----
 tools/bdf-converter.c                              | 19 +++++++++--------
 wireless/bluetooth/bt_ioctl.c                      |  2 +-
 33 files changed, 71 insertions(+), 234 deletions(-)

diff --git a/arch/arm/src/cxd56xx/cxd56_dmac.c b/arch/arm/src/cxd56xx/cxd56_dmac.c
index b40d35d..1554c75 100644
--- a/arch/arm/src/cxd56xx/cxd56_dmac.c
+++ b/arch/arm/src/cxd56xx/cxd56_dmac.c
@@ -269,7 +269,7 @@ static int (*intc_handler[])(int irq, FAR void *context, FAR void *arg) = {
 };
 
 /****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
 
 /* This structure describes one DMA channel */
diff --git a/arch/arm/src/cxd56xx/cxd56_udmac.c b/arch/arm/src/cxd56xx/cxd56_udmac.c
index 67f0f53..258b4bd 100644
--- a/arch/arm/src/cxd56xx/cxd56_udmac.c
+++ b/arch/arm/src/cxd56xx/cxd56_udmac.c
@@ -65,7 +65,7 @@
 #define ALIGN_UP(v, m)   (((v) + (m)) & ~m)
 
 /****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
 
 /* This structure describes one DMA channel */
diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c
index 7afe854..6d8e238 100644
--- a/arch/arm/src/efm32/efm32_dma.c
+++ b/arch/arm/src/efm32/efm32_dma.c
@@ -63,8 +63,9 @@
 #define ALIGN_UP(v,m)   (((v) + (m)) & ~m)
 
 /****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
+
 /* This structure describes one DMA channel */
 
 struct dma_channel_s
diff --git a/arch/arm/src/efm32/efm32_gpioirq.c b/arch/arm/src/efm32/efm32_gpioirq.c
index dd31f63..fe2ec8c 100644
--- a/arch/arm/src/efm32/efm32_gpioirq.c
+++ b/arch/arm/src/efm32/efm32_gpioirq.c
@@ -152,7 +152,7 @@ static int efm32_odd_interrupt(int irq, void *context, FAR void *arg)
 }
 
 /************************************************************************************
- * Public Function Prototypes
+ * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/arch/arm/src/imx1/imx_boot.c b/arch/arm/src/imx1/imx_boot.c
index c429a31..d4d44d7 100644
--- a/arch/arm/src/imx1/imx_boot.c
+++ b/arch/arm/src/imx1/imx_boot.c
@@ -102,7 +102,7 @@ static const struct section_mapping_s section_mapping[] =
  ************************************************************************************/
 
 /* All i.MX architectures must provide the following entry point.  This entry point
- * is called early in the intitialization -- after all memory has been configured
+ * is called early in the initialization -- after all memory has been configured
  * and mapped but before any devices have been initialized.
  */
 
diff --git a/arch/arm/src/stm32/stm32_ccm.c b/arch/arm/src/stm32/stm32_ccm.c
index 95d5b3a..635f2a6 100644
--- a/arch/arm/src/stm32/stm32_ccm.c
+++ b/arch/arm/src/stm32/stm32_ccm.c
@@ -51,7 +51,7 @@
 struct mm_heap_s g_ccm_heap;
 
 /****************************************************************************
- * Public Function Prototypes
+ * Public Functions
  ****************************************************************************/
 
 #endif /* HAVE_CCM_HEAP */
diff --git a/arch/arm/src/stm32f7/stm32_dtcm.c b/arch/arm/src/stm32f7/stm32_dtcm.c
index 07dc04e..0044946 100644
--- a/arch/arm/src/stm32f7/stm32_dtcm.c
+++ b/arch/arm/src/stm32f7/stm32_dtcm.c
@@ -44,21 +44,13 @@
 #ifdef HAVE_DTCM_HEAP
 
 /****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
  * Public Data
  ****************************************************************************/
 
 struct mm_heap_s g_dtcm_heap;
 
 /****************************************************************************
- * Public Function Prototypes
+ * Public Functions
  ****************************************************************************/
 
 #endif /* HAVE_DTCM_HEAP */
\ No newline at end of file
diff --git a/arch/hc/src/m9s12/m9s12_dumpgpio.c b/arch/hc/src/m9s12/m9s12_dumpgpio.c
index 4a7d386..30fd869 100644
--- a/arch/hc/src/m9s12/m9s12_dumpgpio.c
+++ b/arch/hc/src/m9s12/m9s12_dumpgpio.c
@@ -110,7 +110,7 @@
 #define MEBIPORT_K   2
 
 /****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
 
 struct gpio_piminfo_s
diff --git a/arch/renesas/src/rx65n/rx65n_eth.c b/arch/renesas/src/rx65n/rx65n_eth.c
index 742479e..2a80765 100644
--- a/arch/renesas/src/rx65n/rx65n_eth.c
+++ b/arch/renesas/src/rx65n/rx65n_eth.c
@@ -386,7 +386,7 @@
 #define NX_ALIGN32 __attribute__((aligned(32)))
 
 /****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
 
 /* Ethernet TX DMA Descriptor */
diff --git a/arch/sim/src/sim/up_testset.c b/arch/sim/src/sim/up_testset.c
index ec185c1..38d53b9 100644
--- a/arch/sim/src/sim/up_testset.c
+++ b/arch/sim/src/sim/up_testset.c
@@ -43,14 +43,16 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* Must match definitions in arch/sim/include/spinlock.h */
 
 #define SP_UNLOCKED 0   /* The Un-locked state */
 #define SP_LOCKED   1   /* The Locked state */
 
 /****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
+
 /* Must match definitions in arch/sim/include/spinlock.h */
 
 typedef uint8_t spinlock_t;
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio.c
index ed2ae11..818f778 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio.c
@@ -67,10 +67,6 @@
 #define AUDIO_VOL_ID_NUM      (CXD56_AUDIO_VOLID_MIXER_OUT + 1)
 
 /***************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/***************************************************************************
  * Private Types
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_ac_reg.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_ac_reg.c
index aefb27b..1bd9bbf 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_ac_reg.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_ac_reg.c
@@ -115,10 +115,6 @@
 #define SRCIN_SEL_CODECDSP_MIX 3
 
 /****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
  * Private Data
  ****************************************************************************/
 
@@ -450,10 +446,6 @@ const struct audio_ac_reg_s g_ac_reg[RI_REG_MAX_ENTRY] =
 };
 
 /****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
  * Private Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_aca.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_aca.c
index e629464..30816ce 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_aca.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_aca.c
@@ -357,14 +357,6 @@ typedef enum
 extern uint32_t as_aca_control(uint8_t type, uint32_t param);
 
 /****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
  * Private Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c
index c8ee809..dea2f42 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c
@@ -64,9 +64,9 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-  inline void cxd56_audio_clock_enable(uint32_t clk, uint32_t div);
-  inline void cxd56_audio_clock_disable(void);
-  inline bool cxd56_audio_clock_is_enabled(void);
+inline void cxd56_audio_clock_enable(uint32_t clk, uint32_t div);
+inline void cxd56_audio_clock_disable(void);
+inline bool cxd56_audio_clock_is_enabled(void);
 
 /****************************************************************************
  * Private Data
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.c
index 266cf90..4b98536 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_bca_reg.c
@@ -71,14 +71,6 @@ enum dma_i2s_out_sel_e
 #define BCA_REG_MAX_BIT 32
 
 /***************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/***************************************************************************
- * Private Data
- ****************************************************************************/
-
-/***************************************************************************
  * Public Data
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_beep.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_beep.c
index 7fd86b9..cba8773 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_beep.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_beep.c
@@ -64,10 +64,6 @@
 #define VOL_MIN         -90
 
 /***************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/***************************************************************************
  * Private Data
  ****************************************************************************/
 
@@ -84,10 +80,6 @@ static const uint16_t g_beepfreqtable[] =
 };
 
 /***************************************************************************
- * Public Data
- ****************************************************************************/
-
-/***************************************************************************
  * Private Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_config.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_config.c
index a856c00..8270bee 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_config.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_config.c
@@ -48,10 +48,6 @@
 #define MIC_CH_BITMAP  0xf
 
 /****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
  * Private Data
  ****************************************************************************/
 
@@ -64,6 +60,7 @@ struct cxd56_audio_cfg_s
   cxd56_audio_clkmode_t clk_mode;
   cxd56_audio_sp_drv_t  sp_driver;
 };
+
 static struct cxd56_audio_cfg_s g_audio_cfg =
 {
   1,
@@ -75,10 +72,6 @@ static struct cxd56_audio_cfg_s g_audio_cfg =
 };
 
 /****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
  * Private Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_digital.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_digital.c
index 1cd679f..e96f0bd 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_digital.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_digital.c
@@ -46,26 +46,6 @@
 #include "cxd56_audio_digital.h"
 
 /***************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/***************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/***************************************************************************
- * Private Data
- ****************************************************************************/
-
-/***************************************************************************
- * Public Data
- ****************************************************************************/
-
-/***************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/***************************************************************************
  * Public Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_dma.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_dma.c
index 8ea096e..ee734c2 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_dma.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_dma.c
@@ -92,9 +92,11 @@ enum audio_irq_reg_type_e
 #define DMA_SMP_WAIT_HIRES   10 /* usec per sample. */
 #define DMA_SMP_WAIT_NORMALT 40 /* usec per sample. */
 
-/***************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
+/* Private Macros */
+
+#define SET_DMA_ACT(_path_)  g_dma_act_status |= (1 << _path_)
+#define CLR_DMA_ACT(_path_)  g_dma_act_status &= ~(1 << _path_)
+#define IS_DMA_ACT(_path_)   ((g_dma_act_status & (1 << _path_)) != 0)
 
 /***************************************************************************
  * Private Data
@@ -111,18 +113,6 @@ static bool s_work_arroud_dmac[DMA_HANDLE_MAX_NUM] =
 };
 
 /***************************************************************************
- * Private Macro
- ****************************************************************************/
-
-#define SET_DMA_ACT(_path_)  g_dma_act_status |= (1 << _path_)
-#define CLR_DMA_ACT(_path_)  g_dma_act_status &= ~(1 << _path_)
-#define IS_DMA_ACT(_path_)   ((g_dma_act_status & (1 << _path_)) != 0)
-
-/***************************************************************************
- * Public Data
- ****************************************************************************/
-
-/***************************************************************************
  * Private Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_filter.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_filter.c
index 6db6b1a..cb26439 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_filter.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_filter.c
@@ -44,26 +44,6 @@
 #include "cxd56_audio_ac_reg.h"
 
 /***************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/***************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/***************************************************************************
- * Private Data
- ****************************************************************************/
-
-/***************************************************************************
- * Public Data
- ****************************************************************************/
-
-/***************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/***************************************************************************
  * Public Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_irq.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_irq.c
index d047976..10390a7 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_irq.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_irq.c
@@ -44,28 +44,12 @@
 #include "cxd56_audio_irq.h"
 
 /***************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/***************************************************************************
  * Public Function Prototypes
  ****************************************************************************/
 
 extern void cxd56_audio_dma_int_handler(void);
 
 /***************************************************************************
- * Private Data
- ****************************************************************************/
-
-/***************************************************************************
- * Public Data
- ****************************************************************************/
-
-/***************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/***************************************************************************
  * Public Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_mic.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_mic.c
index 8ce972b..68d4e4e 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_mic.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_mic.c
@@ -55,22 +55,6 @@
 #define MIC_CH_BITMAP  0xf
 
 /***************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/***************************************************************************
- * Private Data
- ****************************************************************************/
-
-/***************************************************************************
- * Public Data
- ****************************************************************************/
-
-/***************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/***************************************************************************
  * Public Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_power.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_power.c
index 9f38c1a..a6092a0 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_power.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_power.c
@@ -51,22 +51,6 @@
 #include "cxd56_audio_bca_reg.h"
 
 /***************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/***************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/***************************************************************************
- * Private Data
- ****************************************************************************/
-
-/***************************************************************************
- * Public Data
- ****************************************************************************/
-
-/***************************************************************************
  * Private Functions
  ****************************************************************************/
 
diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_volume.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_volume.c
index b1ec052..0d48cb5 100644
--- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_volume.c
+++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_volume.c
@@ -76,10 +76,6 @@
   (((VOL_TO_REG(vol) - MUTE_VOL_REG) & 0xff) * (n_cycle + 1) * 4 / 48 * 1000)
 
 /****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-/****************************************************************************
  * Private Type
  ****************************************************************************/
 
@@ -101,10 +97,6 @@ static struct set_vol_prm_s g_volparam[VOLUME_NUM] =
 };
 
 /****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
  * Private Functions
  ****************************************************************************/
 
diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h b/boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h
index 29eeeb9..b09cee4 100644
--- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h
+++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt1020-evk.h
@@ -174,8 +174,6 @@ int imxrt_mmcsd_spi_initialize(int minor);
 void imxrt_autoled_initialize(void);
 #endif
 
-#ifdef CONFIG_DEV_GPIO
-
 /****************************************************************************
  * Name: imxrt_gpio_initialize
  *
@@ -184,8 +182,20 @@ void imxrt_autoled_initialize(void);
  *
  ****************************************************************************/
 
+#ifdef CONFIG_DEV_GPIO
 int imxrt_gpio_initialize(void);
 #endif
 
+/****************************************************************************
+ * Name: imxrt_usbhost_initialize
+ *
+ * Description:
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_USBHOST
+int imxrt_usbhost_initialize(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __BOARDS_ARM_IMXRT_IMXRT1020_EVK_SRC_IMXRT1020_EVK_H */
diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c
index 3393ab1..4205646 100644
--- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c
+++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c
@@ -83,14 +83,6 @@
 #endif
 
 /****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#ifdef CONFIG_USBHOST
-int imxrt_usbhost_initialize(void);
-#endif
-
-/****************************************************************************
  * Private Functions
  ****************************************************************************/
 
diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c
index 1925b00..d6aa9fd 100644
--- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c
+++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c
@@ -51,7 +51,7 @@
 #include "bambino-200e.h"
 
 /****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
 
 enum devid_e
diff --git a/boards/arm/stm32/omnibusf4/src/omnibusf4.h b/boards/arm/stm32/omnibusf4/src/omnibusf4.h
index 057892e..afe1244 100644
--- a/boards/arm/stm32/omnibusf4/src/omnibusf4.h
+++ b/boards/arm/stm32/omnibusf4/src/omnibusf4.h
@@ -210,5 +210,29 @@ int stm32_can_setup(void);
 int stm32_timer_driver_setup(FAR const char *devpath, int timer);
 #endif
 
+/****************************************************************************
+ * Name: stm32_mpu6000_initialize
+ *
+ * Description:
+ *  Initialize the MPU6000 device.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_SENSORS_MPU60X0
+int stm32_mpu6000_initialize(void);
+#endif
+
+/****************************************************************************
+ * Name: stm32_max7456_initialize
+ *
+ * Description:
+ *  Initialize the MAX7456 OSD device.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_VIDEO_MAX7456
+int stm32_max7456_initialize(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __BOARDS_ARM_STM32_OMNIBUSF4_SRC_OMNIBUSF4_H */
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_bringup.c b/boards/arm/stm32/omnibusf4/src/stm32_bringup.c
index 819e06d..0957344 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_bringup.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_bringup.c
@@ -79,22 +79,6 @@
 #endif
 
 /****************************************************************************
- * Public Function Prototypes
- ****************************************************************************/
-
-#ifdef CONFIG_SENSORS_MPU60X0
-/* Initialize the MPU6000 device. */
-
-int stm32_mpu6000_initialize(void);
-#endif
-
-#ifdef CONFIG_VIDEO_MAX7456
-/* Initialize the MAX7456 OSD device. */
-
-int stm32_max7456_initialize(void);
-#endif
-
-/****************************************************************************
  * Public Functions
  ****************************************************************************/
 
diff --git a/fs/nxffs/nxffs_cache.c b/fs/nxffs/nxffs_cache.c
index 6a5c4c0..63bf071 100644
--- a/fs/nxffs/nxffs_cache.c
+++ b/fs/nxffs/nxffs_cache.c
@@ -50,22 +50,6 @@
 #include "nxffs.h"
 
 /****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
  * Public Functions
  ****************************************************************************/
 
diff --git a/fs/nxffs/nxffs_pack.c b/fs/nxffs/nxffs_pack.c
index 42ae428..08d04cb 100644
--- a/fs/nxffs/nxffs_pack.c
+++ b/fs/nxffs/nxffs_pack.c
@@ -52,11 +52,7 @@
 #include "nxffs.h"
 
 /****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
 
 /* This structure supports access to one inode data stream */
diff --git a/tools/bdf-converter.c b/tools/bdf-converter.c
index d1e935a..bcca5c5 100644
--- a/tools/bdf-converter.c
+++ b/tools/bdf-converter.c
@@ -54,15 +54,16 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-/*
-#define VERBOSE
-#define DBG
-*/
+#if 0
+#  define VERBOSE
+#  define DBG
+#endif
 
-// BDF Specification Version 2.2:
-// This version lifts the restriction on line length. In this version, the new
-// maximum length of a value of the type string is 65535 characters, and hence
-// lines may now be at least this long.
+/* BDF Specification Version 2.2:
+ * This version lifts the restriction on line length. In this version, the new
+ * maximum length of a value of the type string is 65535 characters, and hence
+ * lines may now be at least this long.
+ */
 
 #define BDF_MAX_LINE_LENGTH 65535
 
@@ -75,7 +76,7 @@
 #define NXFONT_MAX8BIT 255
 
 /****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
 
 /* This structure holds information about a glyph */
diff --git a/wireless/bluetooth/bt_ioctl.c b/wireless/bluetooth/bt_ioctl.c
index a1d1053..e82e0b4 100644
--- a/wireless/bluetooth/bt_ioctl.c
+++ b/wireless/bluetooth/bt_ioctl.c
@@ -59,7 +59,7 @@
 #ifdef CONFIG_NETDEV_IOCTL  /* Not optional! */
 
 /****************************************************************************
- * Public Types
+ * Private Types
  ****************************************************************************/
 
 /* These structures encapsulate all globals used by the IOCTL logic. */