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/03/09 02:40:20 UTC
[incubator-nuttx-apps] branch master updated: style: unify path to files in comment section
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-apps.git
The following commit(s) were added to refs/heads/master by this push:
new f9baa42 style: unify path to files in comment section
f9baa42 is described below
commit f9baa422c180b3fa9324aa5bd2b57f684cf574bc
Author: Petro Karashchenko <pe...@gmail.com>
AuthorDate: Tue Mar 8 23:05:12 2022 +0100
style: unify path to files in comment section
Signed-off-by: Petro Karashchenko <pe...@gmail.com>
---
README.md | 4 ++--
examples/ajoystick/ajoy_main.c | 17 +++++++++-------
examples/bmi160/Make.defs | 2 +-
examples/bmi160/Makefile | 2 +-
examples/cctype/cctype_main.cxx | 2 +-
examples/charger/Make.defs | 19 ++++++++++++++++++
examples/djoystick/djoy_main.c | 2 +-
examples/elf/tests/errno/Makefile | 2 +-
examples/elf/tests/hello/Makefile | 2 +-
examples/elf/tests/helloxx/Makefile | 2 +-
examples/elf/tests/longjmp/Makefile | 2 +-
examples/elf/tests/mutex/Makefile | 2 +-
examples/elf/tests/pthread/Makefile | 2 +-
examples/elf/tests/signal/Makefile | 2 +-
examples/elf/tests/struct/Makefile | 2 +-
examples/elf/tests/task/Makefile | 2 +-
examples/fboverlay/Make.defs | 2 +-
examples/fxos8700cq_test/Kconfig | 21 --------------------
examples/fxos8700cq_test/Make.defs | 2 +-
examples/fxos8700cq_test/Makefile | 2 +-
examples/helloxx/helloxx_main.cxx | 2 +-
examples/module/drivers/chardev/Makefile | 2 +-
examples/mtdrwb/Makefile | 2 +-
examples/mtdrwb/mtdrwb_main.c | 2 +-
examples/nettest/Makefile | 2 +-
examples/null/Makefile | 2 +-
examples/nunchuck/nunchuck_main.c | 24 ++++++++++++++---------
examples/nxflat/tests/errno/Makefile | 2 +-
examples/nxflat/tests/hello++/Makefile | 2 +-
examples/nxflat/tests/hello/Makefile | 2 +-
examples/nxflat/tests/longjmp/Makefile | 2 +-
examples/nxflat/tests/mutex/Makefile | 2 +-
examples/nxflat/tests/pthread/Makefile | 2 +-
examples/nxflat/tests/signal/Makefile | 2 +-
examples/nxflat/tests/struct/Makefile | 2 +-
examples/nxflat/tests/task/Makefile | 2 +-
examples/posix_spawn/filesystem/hello/Makefile | 2 +-
examples/posix_spawn/filesystem/redirect/Makefile | 2 +-
examples/powermonitor/Makefile | 3 ++-
examples/sotest/lib/modprint/Makefile | 2 +-
examples/sotest/lib/sotest/Makefile | 2 +-
examples/tcpblaster/Makefile | 2 +-
examples/termios/Makefile | 2 +-
examples/thttpd/content/hello/Makefile | 2 +-
examples/thttpd/content/tasks/Makefile | 2 +-
examples/udgram/Makefile | 2 +-
examples/udpblaster/Makefile | 2 +-
examples/usrsocktest/Make.defs | 2 +-
examples/ustream/Makefile | 2 +-
examples/watched/Makefile | 2 +-
examples/zerocross/zerocross_main.c | 2 +-
netutils/netcat/Kconfig | 20 -------------------
nshlib/Kconfig | 1 -
system/i2c/Kconfig | 1 -
system/ubloxmodem/Kconfig | 1 -
wireless/wapi/src/network.c | 2 +-
56 files changed, 94 insertions(+), 109 deletions(-)
diff --git a/README.md b/README.md
index 0e36215..d6f72c2 100644
--- a/README.md
+++ b/README.md
@@ -107,8 +107,8 @@ CONFIG_EXAMPLES_HELLO=y
This will select the `apps/examples/hello` in the following way:
-- The top-level make will include `examples/Make.defs`
-- `examples/Make.defs` will set `CONFIGURED_APPS += $(APPDIR)/examples/hello`
+- The top-level make will include `apps/examples/Make.defs`
+- `apps/examples/Make.defs` will set `CONFIGURED_APPS += $(APPDIR)/examples/hello`
like this:
```makefile
diff --git a/examples/ajoystick/ajoy_main.c b/examples/ajoystick/ajoy_main.c
index d04d820..398a787 100644
--- a/examples/ajoystick/ajoy_main.c
+++ b/examples/ajoystick/ajoy_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * examplex/ajoystick/ajoy_main.c
+ * apps/examples/ajoystick/ajoy_main.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -37,6 +37,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+
/* Configuration ************************************************************/
#ifndef CONFIG_AJOYSTICK
@@ -56,10 +57,10 @@
/* Helpers ******************************************************************/
#ifndef MIN
-# define MIN(a,b) (a < b ? a : b)
+# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
-# define MAX(a,b) (a > b ? a : b)
+# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
/****************************************************************************
@@ -75,6 +76,7 @@ static int ajoy_calibrate(int fd);
/****************************************************************************
* Private Data
****************************************************************************/
+
/* The set of supported joystick buttons */
static ajoy_buttonset_t g_ajoysupported;
@@ -236,8 +238,9 @@ static int ajoy_read(int fd, FAR struct ajoy_sample_s *sample)
return -EIO;
}
- /* Show the joystick position and set buttons accompanying the signal */
- /* Show the set of joystick buttons that we just read */
+ /* Show the joystick position and set buttons accompanying the signal.
+ * Show the set of joystick buttons that we just read
+ */
printf("Read position and button set\n");
show_joystick(sample);
@@ -419,9 +422,9 @@ int main(int argc, char *argv[])
/* Then loop, receiving signals indicating joystick events. */
timeout.tv_sec = 0;
- timeout.tv_nsec = 600*1000*1000;
+ timeout.tv_nsec = 600 * 1000 * 1000;
- for (;;)
+ for (; ; )
{
struct ajoy_sample_s sample;
diff --git a/examples/bmi160/Make.defs b/examples/bmi160/Make.defs
index e195dbd..99413d2 100644
--- a/examples/bmi160/Make.defs
+++ b/examples/bmi160/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# sixaxis/Make.defs
+# apps/examples/bmi160/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/bmi160/Makefile b/examples/bmi160/Makefile
index 88ea40f..e71a420 100644
--- a/examples/bmi160/Makefile
+++ b/examples/bmi160/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/bmi160/Makefile
+# apps/examples/bmi160/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/cctype/cctype_main.cxx b/examples/cctype/cctype_main.cxx
index edf5573..27b885f 100644
--- a/examples/cctype/cctype_main.cxx
+++ b/examples/cctype/cctype_main.cxx
@@ -1,5 +1,5 @@
//***************************************************************************
-// examples/cctype/cctype_main.cxx
+// apps/examples/cctype/cctype_main.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/charger/Make.defs b/examples/charger/Make.defs
index 1c61bef..43855e2 100644
--- a/examples/charger/Make.defs
+++ b/examples/charger/Make.defs
@@ -1,3 +1,22 @@
+############################################################################
+# apps/examples/charger/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership. The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
ifeq ($(CONFIG_EXAMPLES_CHARGER),y)
CONFIGURED_APPS += examples/charger
diff --git a/examples/djoystick/djoy_main.c b/examples/djoystick/djoy_main.c
index 5a0cea8..40249b9 100644
--- a/examples/djoystick/djoy_main.c
+++ b/examples/djoystick/djoy_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * examplex/djoystick/djoy_main.c
+ * apps/examples/djoystick/djoy_main.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/elf/tests/errno/Makefile b/examples/elf/tests/errno/Makefile
index 94d0ecd..4432cbd 100644
--- a/examples/elf/tests/errno/Makefile
+++ b/examples/elf/tests/errno/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/errno/Makefile
+# apps/examples/elf/tests/errno/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/elf/tests/hello/Makefile b/examples/elf/tests/hello/Makefile
index a850992..cde3096 100644
--- a/examples/elf/tests/hello/Makefile
+++ b/examples/elf/tests/hello/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/hello/Makefile
+# apps/examples/elf/tests/hello/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile
index e684794..9012407 100644
--- a/examples/elf/tests/helloxx/Makefile
+++ b/examples/elf/tests/helloxx/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/helloxx/Makefile
+# apps/examples/elf/tests/helloxx/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/elf/tests/longjmp/Makefile b/examples/elf/tests/longjmp/Makefile
index f351660..17e325c 100644
--- a/examples/elf/tests/longjmp/Makefile
+++ b/examples/elf/tests/longjmp/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/longjmp/Makefile
+# apps/examples/elf/tests/longjmp/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/elf/tests/mutex/Makefile b/examples/elf/tests/mutex/Makefile
index 8124270..e95fba8 100644
--- a/examples/elf/tests/mutex/Makefile
+++ b/examples/elf/tests/mutex/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/mutex/Makefile
+# apps/examples/elf/tests/mutex/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/elf/tests/pthread/Makefile b/examples/elf/tests/pthread/Makefile
index 1fb6472..39e821e 100644
--- a/examples/elf/tests/pthread/Makefile
+++ b/examples/elf/tests/pthread/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/pthread/Makefile
+# apps/examples/elf/tests/pthread/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/elf/tests/signal/Makefile b/examples/elf/tests/signal/Makefile
index 7363537..d89e183 100644
--- a/examples/elf/tests/signal/Makefile
+++ b/examples/elf/tests/signal/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/signal/Makefile
+# apps/examples/elf/tests/signal/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/elf/tests/struct/Makefile b/examples/elf/tests/struct/Makefile
index 0276b0d..e76e5a6 100644
--- a/examples/elf/tests/struct/Makefile
+++ b/examples/elf/tests/struct/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/struct/Makefile
+# apps/examples/elf/tests/struct/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/elf/tests/task/Makefile b/examples/elf/tests/task/Makefile
index 704f449..3db9ab2 100644
--- a/examples/elf/tests/task/Makefile
+++ b/examples/elf/tests/task/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/task/Makefile
+# apps/examples/elf/tests/task/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/fboverlay/Make.defs b/examples/fboverlay/Make.defs
index 9c51c61..0fc92aa 100644
--- a/examples/fboverlay/Make.defs
+++ b/examples/fboverlay/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# apps/graphics/fboverlay/Make.defs
+# apps/examples/fboverlay/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/fxos8700cq_test/Kconfig b/examples/fxos8700cq_test/Kconfig
index 01e4284..b2cc721 100644
--- a/examples/fxos8700cq_test/Kconfig
+++ b/examples/fxos8700cq_test/Kconfig
@@ -1,25 +1,4 @@
-#############################################################################
#
-# examples/fxos8700cq_test/Kconfig
-# fxos8700cq motion sensor sample app
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-#############################################################################
-
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
diff --git a/examples/fxos8700cq_test/Make.defs b/examples/fxos8700cq_test/Make.defs
index be7c260..53a3b9b 100644
--- a/examples/fxos8700cq_test/Make.defs
+++ b/examples/fxos8700cq_test/Make.defs
@@ -1,5 +1,5 @@
#############################################################################
-# examples/fxos8700cq_test/Make.defs
+# apps/examples/fxos8700cq_test/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/fxos8700cq_test/Makefile b/examples/fxos8700cq_test/Makefile
index 82b9534..de74481 100644
--- a/examples/fxos8700cq_test/Makefile
+++ b/examples/fxos8700cq_test/Makefile
@@ -1,5 +1,5 @@
#############################################################################
-# examples/fxos8700cq/Makefile
+# apps/examples/fxos8700cq_test/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/helloxx/helloxx_main.cxx b/examples/helloxx/helloxx_main.cxx
index c9553ad..c64891d 100644
--- a/examples/helloxx/helloxx_main.cxx
+++ b/examples/helloxx/helloxx_main.cxx
@@ -1,5 +1,5 @@
//***************************************************************************
-// examples/helloxx/helloxx_main.cxx
+// apps/examples/helloxx/helloxx_main.cxx
//
// Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/module/drivers/chardev/Makefile b/examples/module/drivers/chardev/Makefile
index 39e7bc6..abf530f 100644
--- a/examples/module/drivers/chardev/Makefile
+++ b/examples/module/drivers/chardev/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/module/drivers/chardev/Makefile
+# apps/examples/module/drivers/chardev/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/mtdrwb/Makefile b/examples/mtdrwb/Makefile
index 0a657d8..53798ec 100644
--- a/examples/mtdrwb/Makefile
+++ b/examples/mtdrwb/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/examplex/mtdrwb/Makefile
+# apps/apps/examples/mtdrwb/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/mtdrwb/mtdrwb_main.c b/examples/mtdrwb/mtdrwb_main.c
index 5fe2e32..7110f11 100644
--- a/examples/mtdrwb/mtdrwb_main.c
+++ b/examples/mtdrwb/mtdrwb_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * examplex/mtdrwb/mtdrwb_main.c
+ * apps/examples/mtdrwb/mtdrwb_main.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile
index 8c29e98..9cd52ea 100644
--- a/examples/nettest/Makefile
+++ b/examples/nettest/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nettest/Makefile
+# apps/examples/nettest/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/null/Makefile b/examples/null/Makefile
index c64dad4..b5a0510 100644
--- a/examples/null/Makefile
+++ b/examples/null/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/null/Makefile
+# apps/examples/null/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nunchuck/nunchuck_main.c b/examples/nunchuck/nunchuck_main.c
index 7fa39de..2e28ebb 100644
--- a/examples/nunchuck/nunchuck_main.c
+++ b/examples/nunchuck/nunchuck_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * examplex/nunchuck/nunchuck_main.c
+ * apps/examples/nunchuck/nunchuck_main.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -37,6 +37,7 @@
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
+
/* Configuration ************************************************************/
#ifndef CONFIG_INPUT_NUNCHUCK
@@ -52,17 +53,18 @@
/* Helpers ******************************************************************/
#ifndef MIN
-# define MIN(a,b) (a < b ? a : b)
+# define MIN(a,b) ((a) < (b) ? (a) : (b))
#endif
#ifndef MAX
-# define MAX(a,b) (a > b ? a : b)
+# define MAX(a,b) ((a) > (b) ? (a) : (b))
#endif
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
-static void show_buttons(nunchuck_buttonset_t oldset, nunchuck_buttonset_t newset);
+static void show_buttons(nunchuck_buttonset_t oldset,
+ nunchuck_buttonset_t newset);
static void show_joystick(FAR const struct nunchuck_sample_s *sample);
static int nunchuck_read(int fd, FAR struct nunchuck_sample_s *sample);
static int nunchuck_calibrate(int fd);
@@ -70,6 +72,7 @@ static int nunchuck_calibrate(int fd);
/****************************************************************************
* Private Data
****************************************************************************/
+
/* The set of supported joystick buttons */
static nunchuck_buttonset_t g_nunchucksupported;
@@ -101,7 +104,8 @@ static const char *g_nunchucknames[NUNCHUCK_NBUTTONS] =
* Private Functions
****************************************************************************/
-static void show_buttons(nunchuck_buttonset_t oldset, nunchuck_buttonset_t newset)
+static void show_buttons(nunchuck_buttonset_t oldset,
+ nunchuck_buttonset_t newset)
{
nunchuck_buttonset_t chgset = oldset ^ newset;
int i;
@@ -194,8 +198,9 @@ static int nunchuck_read(int fd, FAR struct nunchuck_sample_s *sample)
}
#ifdef CONFIG_DEBUG_INPUT
- /* Show the joystick position and set buttons accompanying the signal */
- /* Show the set of joystick buttons that we just read */
+ /* Show the joystick position and set buttons accompanying the signal.
+ * Show the set of joystick buttons that we just read
+ */
printf("Read position and button set\n");
show_joystick(sample);
@@ -390,7 +395,8 @@ int main(int argc, FAR char *argv[])
ret = ioctl(fd, NUNCHUCKIOC_SUPPORTED, (unsigned long)((uintptr_t)&tmp));
if (ret < 0)
{
- fprintf(stderr, "ERROR: ioctl(NUNCHUCKIOC_SUPPORTED) failed: %d\n", errno);
+ fprintf(stderr, "ERROR: ioctl(NUNCHUCKIOC_SUPPORTED) failed: %d\n",
+ errno);
goto errout_with_fd;
}
@@ -402,7 +408,7 @@ int main(int argc, FAR char *argv[])
nunchuck_calibrate(fd);
- for (;;)
+ for (; ; )
{
struct nunchuck_sample_s sample;
diff --git a/examples/nxflat/tests/errno/Makefile b/examples/nxflat/tests/errno/Makefile
index 2d7e16f..97d707a 100644
--- a/examples/nxflat/tests/errno/Makefile
+++ b/examples/nxflat/tests/errno/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nxflat/tests/hello/Makefile
+# apps/examples/nxflat/tests/errno/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/hello++/Makefile b/examples/nxflat/tests/hello++/Makefile
index a404ee3..f34dc33 100644
--- a/examples/nxflat/tests/hello++/Makefile
+++ b/examples/nxflat/tests/hello++/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nxflat/tests/hello/Makefile
+# apps/examples/nxflat/tests/hello++/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/hello/Makefile b/examples/nxflat/tests/hello/Makefile
index 1ff6200..fb70364 100644
--- a/examples/nxflat/tests/hello/Makefile
+++ b/examples/nxflat/tests/hello/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nxflat/tests/hello/Makefile
+# apps/examples/nxflat/tests/hello/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/longjmp/Makefile b/examples/nxflat/tests/longjmp/Makefile
index 22165a0..1cb724b 100644
--- a/examples/nxflat/tests/longjmp/Makefile
+++ b/examples/nxflat/tests/longjmp/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nxflat/tests/longjmp/Makefile
+# apps/examples/nxflat/tests/longjmp/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/mutex/Makefile b/examples/nxflat/tests/mutex/Makefile
index f9511c1..6ed1f38 100644
--- a/examples/nxflat/tests/mutex/Makefile
+++ b/examples/nxflat/tests/mutex/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nxflat/tests/mutex/Makefile
+# apps/examples/nxflat/tests/mutex/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/pthread/Makefile b/examples/nxflat/tests/pthread/Makefile
index 6e20dd3..219213d 100644
--- a/examples/nxflat/tests/pthread/Makefile
+++ b/examples/nxflat/tests/pthread/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nxflat/tests/pthread/Makefile
+# apps/examples/nxflat/tests/pthread/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/signal/Makefile b/examples/nxflat/tests/signal/Makefile
index 3481673..cb20c01 100644
--- a/examples/nxflat/tests/signal/Makefile
+++ b/examples/nxflat/tests/signal/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nxflat/tests/signal/Makefile
+# apps/examples/nxflat/tests/signal/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/struct/Makefile b/examples/nxflat/tests/struct/Makefile
index 48e28a3..e765aad 100644
--- a/examples/nxflat/tests/struct/Makefile
+++ b/examples/nxflat/tests/struct/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nxflat/tests/hello/Makefile
+# apps/examples/nxflat/tests/hello/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/nxflat/tests/task/Makefile b/examples/nxflat/tests/task/Makefile
index a71e51e..712f5b1 100644
--- a/examples/nxflat/tests/task/Makefile
+++ b/examples/nxflat/tests/task/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/nxflat/tests/task/Makefile
+# apps/examples/nxflat/tests/task/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/posix_spawn/filesystem/hello/Makefile b/examples/posix_spawn/filesystem/hello/Makefile
index 05b888f..0feee90 100644
--- a/examples/posix_spawn/filesystem/hello/Makefile
+++ b/examples/posix_spawn/filesystem/hello/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/elf/tests/hello/Makefile
+# apps/examples/elf/tests/hello/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/posix_spawn/filesystem/redirect/Makefile b/examples/posix_spawn/filesystem/redirect/Makefile
index e07ff61..38bf2c1 100644
--- a/examples/posix_spawn/filesystem/redirect/Makefile
+++ b/examples/posix_spawn/filesystem/redirect/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/posix_spawn/filesystem/redirect/Makefile
+# apps/examples/posix_spawn/filesystem/redirect/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/powermonitor/Makefile b/examples/powermonitor/Makefile
index fdebd46..2de62f9 100644
--- a/examples/powermonitor/Makefile
+++ b/examples/powermonitor/Makefile
@@ -1,4 +1,5 @@
-############################################################################ # apps/examples/powermonitor/Makefile
+############################################################################
+# apps/examples/powermonitor/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/sotest/lib/modprint/Makefile b/examples/sotest/lib/modprint/Makefile
index 17d8b26..b755b8d 100644
--- a/examples/sotest/lib/modprint/Makefile
+++ b/examples/sotest/lib/modprint/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/sotest/lib/modprint/Makefile
+# apps/examples/sotest/lib/modprint/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/sotest/lib/sotest/Makefile b/examples/sotest/lib/sotest/Makefile
index 1da8fbe..55338e1 100644
--- a/examples/sotest/lib/sotest/Makefile
+++ b/examples/sotest/lib/sotest/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/sotest/lib/sotest/Makefile
+# apps/examples/sotest/lib/sotest/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/tcpblaster/Makefile b/examples/tcpblaster/Makefile
index 4f888da..c4fb38f 100644
--- a/examples/tcpblaster/Makefile
+++ b/examples/tcpblaster/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/tcpblaster/Makefile
+# apps/examples/tcpblaster/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/termios/Makefile b/examples/termios/Makefile
index c24adcb..1429523 100644
--- a/examples/termios/Makefile
+++ b/examples/termios/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/termios/Make.defs
+# apps/examples/termios/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/thttpd/content/hello/Makefile b/examples/thttpd/content/hello/Makefile
index 2a7a437..fceb1c3 100644
--- a/examples/thttpd/content/hello/Makefile
+++ b/examples/thttpd/content/hello/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/thttpd/content/hello/Makefile
+# apps/examples/thttpd/content/hello/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/thttpd/content/tasks/Makefile b/examples/thttpd/content/tasks/Makefile
index c4a2211..b1a2f40 100644
--- a/examples/thttpd/content/tasks/Makefile
+++ b/examples/thttpd/content/tasks/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/thttpd/content/tasks/Makefile
+# apps/examples/thttpd/content/tasks/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/udgram/Makefile b/examples/udgram/Makefile
index 0b23497..160dbe0 100644
--- a/examples/udgram/Makefile
+++ b/examples/udgram/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/udgram/Makefile
+# apps/examples/udgram/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/udpblaster/Makefile b/examples/udpblaster/Makefile
index dd103b1..0d4dce3 100644
--- a/examples/udpblaster/Makefile
+++ b/examples/udpblaster/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/udpblaster/Makefile
+# apps/examples/udpblaster/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/usrsocktest/Make.defs b/examples/usrsocktest/Make.defs
index 08df3f4..0ae117a 100644
--- a/examples/usrsocktest/Make.defs
+++ b/examples/usrsocktest/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# examples/usrsocktest/Make.defs
+# apps/examples/usrsocktest/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/ustream/Makefile b/examples/ustream/Makefile
index dfd1098..16206b2 100644
--- a/examples/ustream/Makefile
+++ b/examples/ustream/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/ustream/Makefile
+# apps/examples/ustream/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/watched/Makefile b/examples/watched/Makefile
index 8df4cda..7d0a746 100644
--- a/examples/watched/Makefile
+++ b/examples/watched/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# examples/watched/Makefile
+# apps/examples/watched/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
diff --git a/examples/zerocross/zerocross_main.c b/examples/zerocross/zerocross_main.c
index 7f62696..63da486 100644
--- a/examples/zerocross/zerocross_main.c
+++ b/examples/zerocross/zerocross_main.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * examplex/zerocross/zerocross_main.c
+ * apps/examples/zerocross/zerocross_main.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/netutils/netcat/Kconfig b/netutils/netcat/Kconfig
index a7e5817..9b3c86d 100644
--- a/netutils/netcat/Kconfig
+++ b/netutils/netcat/Kconfig
@@ -1,24 +1,4 @@
-#############################################################################
-# apps/netutils/netcat/Kconfig
-# netcat networking application
#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership. The
-# ASF licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-#############################################################################
-
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
diff --git a/nshlib/Kconfig b/nshlib/Kconfig
index 93cf518..64861f8 100644
--- a/nshlib/Kconfig
+++ b/nshlib/Kconfig
@@ -1,5 +1,4 @@
#
-#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
diff --git a/system/i2c/Kconfig b/system/i2c/Kconfig
index d524156..557665d 100644
--- a/system/i2c/Kconfig
+++ b/system/i2c/Kconfig
@@ -3,7 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-
menuconfig SYSTEM_I2CTOOL
tristate "I2C tool"
default n
diff --git a/system/ubloxmodem/Kconfig b/system/ubloxmodem/Kconfig
index 34a9657..9f1f596 100644
--- a/system/ubloxmodem/Kconfig
+++ b/system/ubloxmodem/Kconfig
@@ -3,7 +3,6 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-
menuconfig SYSTEM_UBLOXMODEM
tristate "u-blox modem configuration tool"
default n
diff --git a/wireless/wapi/src/network.c b/wireless/wapi/src/network.c
index 252eb09..66922bb 100644
--- a/wireless/wapi/src/network.c
+++ b/wireless/wapi/src/network.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * apps/wireless/wapi/examples/network.c
+ * apps/wireless/wapi/src/network.c
*
* Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gn...@nuttx.org>