From bb264e091c76ea1216bcf96c4f3414144eb8d769 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 21 Jun 2007 18:00:33 +0000 Subject: 2007-06-21 Joel Sherrill * init.c: Now compiles reasonably cleanly with CVS head. --- rpc_demo/ChangeLog | 4 ++++ rpc_demo/init.c | 17 ++++------------- 2 files changed, 8 insertions(+), 13 deletions(-) (limited to 'rpc_demo') diff --git a/rpc_demo/ChangeLog b/rpc_demo/ChangeLog index 127312c..db8b351 100644 --- a/rpc_demo/ChangeLog +++ b/rpc_demo/ChangeLog @@ -1,3 +1,7 @@ +2007-06-21 Joel Sherrill + + * init.c: Now compiles reasonably cleanly with CVS head. + 2007-06-21 Joel Sherrill * init.c: confdefs.h should be rtems/confdefs.h 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 #include #include +#include #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 () { ; } -- cgit v1.2.3