sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/examples/tcpblaster: Fix names several configuration setting that were changed incorrectly in a recent commit.

Browse Source
This commit is contained in:
Gregory Nutt 2018-08-21 09:38:17 -06:00
parent 162fb66ecf
commit 5d72cae1d9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/tcpblaster/Kconfig
View File

@ -20,8 +20,8 @@ config EXAMPLES_TCPBLASTER_SENDSIZE
config EXAMPLES_TCPBLASTER_PROGNAME1 config EXAMPLES_TCPBLASTER_PROGNAME1
string "Target1 program name" string "Target1 program name"
default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER1 default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER
default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER1 default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER
depends on BUILD_KERNEL depends on BUILD_KERNEL
---help--- ---help---
This is the name of the program that will be use when the TcpBlaster This is the name of the program that will be use when the TcpBlaster
@ -47,7 +47,7 @@ config EXAMPLES_TCPBLASTER_LOOPBACK
if !EXAMPLES_TCPBLASTER_LOOPBACK if !EXAMPLES_TCPBLASTER_LOOPBACK
config EXAMPLES_TCPBLASTER_SERVER1 config EXAMPLES_TCPBLASTER_SERVER
bool "Target1 is server" bool "Target1 is server"
default n default n
depends on !EXAMPLES_TCPBLASTER_LOOPBACK depends on !EXAMPLES_TCPBLASTER_LOOPBACK
@ -69,8 +69,8 @@ if EXAMPLES_TCPBLASTER_TARGET2
config EXAMPLES_TCPBLASTER_PROGNAME2 config EXAMPLES_TCPBLASTER_PROGNAME2
string "Target2 program name" string "Target2 program name"
default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER2 default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER
default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER2 default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER
depends on BUILD_KERNEL depends on BUILD_KERNEL
---help--- ---help---
This is the name of the Target2 program that will be use when the This is the name of the Target2 program that will be use when the

6
examples/tcpblaster/Makefile
View File

@ -66,7 +66,7 @@ TARG_OBJS = $(TARG1_COBJS) $(TARGCMN_COBJS)
# Target 1 Application Info # Target 1 Application Info
ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER1),y) ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y)
CONFIG_EXAMPLES_TCPBLASTER_PROGNAME1 ?= tcpserver CONFIG_EXAMPLES_TCPBLASTER_PROGNAME1 ?= tcpserver
APPNAME1 = tcpserver APPNAME1 = tcpserver
else else
@ -85,7 +85,7 @@ STACKSIZE1 = $(CONFIG_EXAMPLES_TCPBLASTER_STACKSIZE1)
ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y) ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y)
TARG2_CSRCS = TARG2_CSRCS =
ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER1),y) ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y)
TARG2_CSRCS += tcpblaster_client.c TARG2_CSRCS += tcpblaster_client.c
else else
TARG2_CSRCS += tcpblaster_server.c TARG2_CSRCS += tcpblaster_server.c
@ -97,7 +97,7 @@ TARG2_MAINOBJ = $(TARG2_MAINSRC:.c=$(OBJEXT))
# Target 2 Application Info # Target 2 Application Info
ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER1),y) ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y)
CONFIG_EXAMPLES_TCPBLASTER_PROGNAME2 ?= tcpclient CONFIG_EXAMPLES_TCPBLASTER_PROGNAME2 ?= tcpclient
APPNAME2 = tcpclient APPNAME2 = tcpclient
else else