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 2021/04/21 18:43:12 UTC
[incubator-nuttx-apps] branch master updated: netutils/iperf:
Configs were using EXAMPLES_ instead of NETUTILS_.
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 80eba3a netutils/iperf: Configs were using EXAMPLES_ instead of NETUTILS_.
80eba3a is described below
commit 80eba3aad1299ebb67fcb5df4b07e4d541254a6b
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Wed Apr 21 14:27:02 2021 +0100
netutils/iperf: Configs were using EXAMPLES_ instead of NETUTILS_.
---
netutils/iperf/Kconfig | 12 ++++++------
netutils/iperf/Make.defs | 2 +-
netutils/iperf/Makefile | 8 ++++----
netutils/iperf/README.md | 4 ----
netutils/iperf/iperf_main.c | 4 ++--
5 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/netutils/iperf/Kconfig b/netutils/iperf/Kconfig
index 0c4f008..3cebb9c 100644
--- a/netutils/iperf/Kconfig
+++ b/netutils/iperf/Kconfig
@@ -3,7 +3,7 @@
# see the file kconfig-language.txt in the NuttX tools repository.
#
-config EXAMPLES_IPERF
+config NETUTILS_IPERF
bool "iperf example"
default n
depends on NET
@@ -13,24 +13,24 @@ config EXAMPLES_IPERF
---help---
Enable the \"iperf example\"
-if EXAMPLES_IPERF
+if NETUTILS_IPERF
-config EXAMPLES_IPERF_PROGNAME
+config NETUTILS_IPERF_PROGNAME
string "Program name"
default "iperf"
---help---
This is the name of the program that will be used when the NSH ELF
program is installed.
-config EXAMPLES_IPERF_PRIORITY
+config NETUTILS_IPERF_PRIORITY
int "iperf task priority"
default 100
-config EXAMPLES_IPERF_STACKSIZE
+config NETUTILS_IPERF_STACKSIZE
int "iperf stack size"
default DEFAULT_TASK_STACKSIZE
-config EXAMPLES_IPERFTEST_DEVNAME
+config NETUTILS_IPERFTEST_DEVNAME
string "Wi-Fi Network device"
default "wlan0"
diff --git a/netutils/iperf/Make.defs b/netutils/iperf/Make.defs
index 13effb7..0e12136 100644
--- a/netutils/iperf/Make.defs
+++ b/netutils/iperf/Make.defs
@@ -19,6 +19,6 @@
#
############################################################################
-ifneq ($(CONFIG_EXAMPLES_IPERF),)
+ifneq ($(CONFIG_NETUTILS_IPERF),)
CONFIGURED_APPS += $(APPDIR)/netutils/iperf
endif
diff --git a/netutils/iperf/Makefile b/netutils/iperf/Makefile
index 437675c..9db5e0c 100644
--- a/netutils/iperf/Makefile
+++ b/netutils/iperf/Makefile
@@ -22,10 +22,10 @@ include $(APPDIR)/Make.defs
# iperf example! built-in application info
-PROGNAME = $(CONFIG_EXAMPLES_IPERF_PROGNAME)
-PRIORITY = $(CONFIG_EXAMPLES_IPERF_PRIORITY)
-STACKSIZE = $(CONFIG_EXAMPLES_IPERF_STACKSIZE)
-MODULE = $(CONFIG_EXAMPLES_IPERF)
+PROGNAME = $(CONFIG_NETUTILS_IPERF_PROGNAME)
+PRIORITY = $(CONFIG_NETUTILS_IPERF_PRIORITY)
+STACKSIZE = $(CONFIG_NETUTILS_IPERF_STACKSIZE)
+MODULE = $(CONFIG_NETUTILS_IPERF)
# Iperf Example
diff --git a/netutils/iperf/README.md b/netutils/iperf/README.md
index 7d76d80..89d95fe 100644
--- a/netutils/iperf/README.md
+++ b/netutils/iperf/README.md
@@ -92,7 +92,3 @@ Now on the host you should see something like:
This will tell you the link speed in Kbits/sec – kilobits per second. If you want kilobytes, divide by 8.
-
-
-
-
diff --git a/netutils/iperf/iperf_main.c b/netutils/iperf/iperf_main.c
index 15c1c08..39e8cfc 100644
--- a/netutils/iperf/iperf_main.c
+++ b/netutils/iperf/iperf_main.c
@@ -34,8 +34,8 @@
* Pre-processor Definitions
****************************************************************************/
-#ifdef CONFIG_EXAMPLES_IPERFTEST_DEVNAME
-# define DEVNAME CONFIG_EXAMPLES_IPERFTEST_DEVNAME
+#ifdef CONFIG_NETUTILS_IPERFTEST_DEVNAME
+# define DEVNAME CONFIG_NETUTILS_IPERFTEST_DEVNAME
#else
# define DEVNAME "wlan0"
#endif