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

Fix more STM32 ethernet bugs; Fix some build issues with examples/nettest

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4171 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-12-13 19:58:24 +00:00
parent 0ff40145d7
commit aeb95a78a1
4 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.txt
View File

@ -142,3 +142,5 @@
where network addresses expected (and vice versa). where network addresses expected (and vice versa).
* apps/examples/nettest: May now be built as an NSH built-in application * apps/examples/nettest: May now be built as an NSH built-in application
by setting CONFIG_NSH_BUILTIN_APPS. by setting CONFIG_NSH_BUILTIN_APPS.
* apps/examples/nettest: Correct some build issues with the nettest is
built for performance evaluation.

11
examples/nettest/Makefile
View File

@ -66,6 +66,11 @@ ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y)
HOSTCFLAGS += -DCONFIG_EXAMPLE_NETTEST_SERVER=1 \ HOSTCFLAGS += -DCONFIG_EXAMPLE_NETTEST_SERVER=1 \
-DCONFIG_EXAMPLE_NETTEST_CLIENTIP="$(CONFIG_EXAMPLE_NETTEST_CLIENTIP)" -DCONFIG_EXAMPLE_NETTEST_CLIENTIP="$(CONFIG_EXAMPLE_NETTEST_CLIENTIP)"
endif endif
ifeq ($(CONFIG_EXAMPLE_NETTEST_PERFORMANCE),y)
HOSTCFLAGS += -DCONFIG_EXAMPLE_NETTEST_PERFORMANCE=1
endif
HOST_SRCS = host.c HOST_SRCS = host.c
ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y) ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y)
@ -89,7 +94,7 @@ STACKSIZE = 2048
VPATH = VPATH =
all: .built all: .built $(HOST_BIN)
.PHONY: clean depend disclean .PHONY: clean depend disclean
$(TARG_AOBJS): %$(OBJEXT): %.S $(TARG_AOBJS): %$(OBJEXT): %.S
@ -106,9 +111,9 @@ $(HOST_BIN): $(HOST_OBJS)
@echo "LD: $@" @echo "LD: $@"
@$(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@ @$(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@
.built: $(HOST_BIN) $(TARG_OBJS) .built: $(TARG_OBJS)
@( for obj in $(TARG_OBJS) ; do \ @( for obj in $(TARG_OBJS) ; do \
$(call ARCHIVE, $@, $${obj}); \ $(call ARCHIVE, $(TARG_BIN), $${obj}); \
done ; ) done ; )
@touch .built @touch .built

14
examples/nettest/nettest.c
View File

@ -53,6 +53,18 @@
* Definitions * Definitions
****************************************************************************/ ****************************************************************************/
/* If CONFIG_NSH_BUILTIN_APPS is defined, then it is assumed that you want
* to execute the DHCPD daemon as an NSH built-in task.
*/
#ifdef CONFIG_NSH_BUILTIN_APPS
# define MAIN_NAME nettest_main
# define MAIN_NAME_STRING "nettest_main"
#else
# define MAIN_NAME user_start
# define MAIN_NAME_STRING "user_start"
#endif
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
@ -65,7 +77,7 @@
* user_start * user_start
****************************************************************************/ ****************************************************************************/
int user_start(int argc, char *argv[]) int MAIN_NAME(int argc, char *argv[])
{ {
struct in_addr addr; struct in_addr addr;
#ifdef CONFIG_EXAMPLE_NETTEST_NOMAC #ifdef CONFIG_EXAMPLE_NETTEST_NOMAC

7
examples/nettest/nettest_client.c
View File

@ -127,15 +127,16 @@ void send_client(void)
for (;;) for (;;)
{ {
nbytessent = send(sockfd, outbuf, 512, 0); nbytessent = send(sockfd, outbuf, SENDSIZE, 0);
if (nbytessent < 0) if (nbytessent < 0)
{ {
message("client: send failed: %d\n", errno); message("client: send failed: %d\n", errno);
goto errout_with_socket; goto errout_with_socket;
} }
else if (nbytessent != 512) else if (nbytessent != SENDSIZE)
{ {
message("client: Bad send length=%d: %d\n", nbytessent); message("client: Bad send length=%d: %d of \n",
nbytessent, SENDSIZE);
goto errout_with_socket; goto errout_with_socket;
} }
} }