summaryrefslogtreecommitdiffstats
path: root/rpc_demo
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2007-06-21 18:00:33 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2007-06-21 18:00:33 +0000
commitbb264e091c76ea1216bcf96c4f3414144eb8d769 (patch)
tree37ba9393a0952a5b20cb75ebd0fa5b187102debf /rpc_demo
parent2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com> (diff)
downloadnetwork-demos-bb264e091c76ea1216bcf96c4f3414144eb8d769.tar.bz2
2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com>
* init.c: Now compiles reasonably cleanly with CVS head.
Diffstat (limited to 'rpc_demo')
-rw-r--r--rpc_demo/ChangeLog4
-rw-r--r--rpc_demo/init.c17
2 files changed, 8 insertions, 13 deletions
diff --git a/rpc_demo/ChangeLog b/rpc_demo/ChangeLog
index 127312c..db8b351 100644
--- a/rpc_demo/ChangeLog
+++ b/rpc_demo/ChangeLog
@@ -1,5 +1,9 @@
2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * init.c: Now compiles reasonably cleanly with CVS head.
+
+2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* init.c: confdefs.h should be rtems/confdefs.h
2007-06-21 Joel Sherrill <joel.sherrill@OARcorp.com>
diff --git a/rpc_demo/init.c b/rpc_demo/init.c
index 940f084..568c806 100644
--- a/rpc_demo/init.c
+++ b/rpc_demo/init.c
@@ -6,6 +6,7 @@
#include <rtems/error.h>
#include <rtems/rtems_bsdnet.h>
#include <stdio.h>
+#include <stdlib.h>
#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 20
@@ -31,17 +32,7 @@ rtems_task Init(rtems_task_argument argument);
/*
* Network configuration
*/
-#define NETWORK_TASK_PRIORITY 50
-static struct rtems_bsdnet_ifconfig netdriver_config = {
- RTEMS_BSP_NETWORK_DRIVER_NAME,
- RTEMS_BSP_NETWORK_DRIVER_ATTACH,
-};
-
-struct rtems_bsdnet_config rtems_bsdnet_config = {
- &netdriver_config, /* Network interface */
- rtems_bsdnet_do_bootp, /* Use BOOTP to get network configuration */
- NETWORK_TASK_PRIORITY, /* Network task priority */
-};
+#include "../networkconfig.h"
#ifdef SERVER
#define T(x) __TXT(x)
@@ -76,5 +67,5 @@ Init (rtems_task_argument ignored)
/*
* Dummy portmapper routines
*/
-pmap_set () { ; }
-pmap_unset () { ; }
+void pmap_set () { ; }
+void pmap_unset () { ; }