diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-12 23:06:16 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-08-12 23:06:16 +0000 |
| commit | 7c81a8b5fe6a203e81f9108a684263730fe50d18 (patch) | |
| tree | b4e11e000e96087f96db761dad07501d9b3347e7 /netdemo | |
| parent | Added info on telnet servers needed by netdemo. (diff) | |
| download | network-demos-7c81a8b5fe6a203e81f9108a684263730fe50d18.tar.bz2 | |
Cleaned up USE_BOOTP conditional for initialization.
Get info from usercfg.h now.
Added message indicating test is exitting.
Diffstat (limited to 'netdemo')
| -rw-r--r-- | netdemo/init.c | 7 | ||||
| -rw-r--r-- | netdemo/test.c | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/netdemo/init.c b/netdemo/init.c index b6d42a8..cb6437f 100644 --- a/netdemo/init.c +++ b/netdemo/init.c @@ -85,14 +85,11 @@ Init (rtems_task_argument ignored) * Hook up drivers */ puts( "Attaching to the network" ); -#if (defined (USE_BOOTP)) - if (rtems_ka9q_execute_command ("attach rtems broadcast y" - " ether " MY_ETHERNET_ADDRESS)) -#else if (rtems_ka9q_execute_command ("attach rtems broadcast y" +#if !(defined (USE_BOOTP)) " ip " MY_IP_ADDRESS - " ether " MY_ETHERNET_ADDRESS)) #endif + " ether " MY_ETHERNET_ADDRESS)) rtems_panic ("Can't attach Ethernet driver.\n"); #if (defined (TRACE_NETWORK_DRIVER)) diff --git a/netdemo/test.c b/netdemo/test.c index c3d2b15..b1ab46c 100644 --- a/netdemo/test.c +++ b/netdemo/test.c @@ -24,10 +24,7 @@ #include <netuser.h> #include <rtems_ka9q.h> -#define NSERVER 2 -#define BASE_PORT 24742 - -#define DATA_SINK_HOST "128.233.14.1" +#include "../usercfg.h" /* * Display the contents of several KA9Q tables @@ -290,6 +287,7 @@ doSocket (void) for (;;) { switch (getchar ()) { case '\004': + printf( "Exiting test\n" ); return; case 't': |