From 9cd3e3a4e65b85e24ec15ffcde8be3f0152ed603 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 5 Feb 2008 21:49:36 +0000 Subject: 2008-02-05 Joel Sherrill * networkconfig-icecube.h, networkconfig-qemu.h, networkconfig.h: Updated to include new fields and expand tabs. --- ChangeLog | 5 +++ networkconfig-icecube.h | 81 +++++++++++++++++++++++++++---------------------- networkconfig-qemu.h | 71 ++++++++++++++++++++----------------------- networkconfig.h | 7 ++++- 4 files changed, 89 insertions(+), 75 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19a38fc..81e95d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-05 Joel Sherrill + + * networkconfig-icecube.h, networkconfig-qemu.h, networkconfig.h: + Updated to include new fields and expand tabs. + 2007-09-25 Joel Sherrill * Makefile: Added telnetd test. diff --git a/networkconfig-icecube.h b/networkconfig-icecube.h index 04d76ae..ade7e7b 100644 --- a/networkconfig-icecube.h +++ b/networkconfig-icecube.h @@ -50,13 +50,11 @@ */ extern void rtems_bsdnet_loopattach(); static struct rtems_bsdnet_ifconfig loopback_config = { - "lo0", /* name */ - rtems_bsdnet_loopattach, /* attach function */ - - NULL, /* link to next interface */ - - "127.0.0.1", /* IP address */ - "255.0.0.0", /* IP net mask */ + "lo0", /* name */ + rtems_bsdnet_loopattach, /* attach function */ + NULL, /* link to next interface */ + "127.0.0.1", /* IP address */ + "255.0.0.0", /* IP net mask */ }; #endif @@ -64,34 +62,34 @@ static struct rtems_bsdnet_ifconfig loopback_config = { * Default network interface */ static struct rtems_bsdnet_ifconfig netdriver_config = { - RTEMS_BSP_NETWORK_DRIVER_NAME, /* name */ - RTEMS_BSP_NETWORK_DRIVER_ATTACH, /* attach function */ + RTEMS_BSP_NETWORK_DRIVER_NAME, /* name */ + RTEMS_BSP_NETWORK_DRIVER_ATTACH, /* attach function */ #ifdef RTEMS_USE_LOOPBACK - &loopback_config, /* link to next interface */ + &loopback_config, /* link to next interface */ #else - NULL, /* No more interfaces */ + NULL, /* No more interfaces */ #endif #if (defined (RTEMS_USE_BOOTP)) - NULL, /* BOOTP supplies IP address */ - NULL, /* BOOTP supplies IP net mask */ + NULL, /* BOOTP supplies IP address */ + NULL, /* BOOTP supplies IP net mask */ #else - "192.168.1.244", /* IP address */ - "255.255.255.0", /* IP net mask */ + "192.168.1.244", /* IP address */ + "255.255.255.0", /* IP net mask */ #endif /* !RTEMS_USE_BOOTP */ #if (defined (RTEMS_SET_ETHERNET_ADDRESS)) - ethernet_address, /* Ethernet hardware address */ + ethernet_address, /* Ethernet hardware address */ #else - NULL, /* Driver supplies hardware address */ + NULL, /* Driver supplies hardware address */ #endif - 0, /* Use default driver parameters */ - 0, /* mtu */ - 0, /* rbuf_count */ - 0, /* xbuf_count */ - 0, /* port */ - 0 /* irq */ + 0, /* Use default driver parameters */ + 0, /* mtu */ + 0, /* rbuf_count */ + 0, /* xbuf_count */ + 0, /* port */ + 0 /* irq */ }; @@ -99,27 +97,38 @@ static struct rtems_bsdnet_ifconfig netdriver_config = { * Network configuration */ struct rtems_bsdnet_config rtems_bsdnet_config = { - &netdriver_config, + &netdriver_config, #if (defined (RTEMS_USE_BOOTP)) - rtems_bsdnet_do_bootp, + rtems_bsdnet_do_bootp, #else - NULL, + NULL, #endif - 0, /* Default network task priority */ - 256 * 1024, /* Default mbuf capacity */ - 256 * 1024, /* Default mbuf cluster capacity */ + 0, /* Default network task priority */ + 256 * 1024, /* Default mbuf capacity */ + 256 * 1024, /* Default mbuf cluster capacity */ #if (!defined (RTEMS_USE_BOOTP)) - "rtems", /* Host name */ - "nodomain.com", /* Domain name */ - "192.168.1.14", /* Gateway */ - "192.168.1.1", /* Log host */ - {"192.168.1.1" }, /* Name server(s) */ - {"192.168.1.1" }, /* NTP server(s) */ + "rtems", /* Host name */ + "nodomain.com", /* Domain name */ + "192.168.1.14", /* Gateway */ + "192.168.1.1", /* Log host */ + {"192.168.1.1" }, /* Name server(s) */ + {"192.168.1.1" }, /* NTP server(s) */ +#else + NULL, /* Host name */ + NULL, /* Domain name */ + NULL, /* Gateway */ + NULL, /* Log host */ + { NULL }, /* Name server(s) */ + { NULL }, /* NTP server(s) */ #endif /* !RTEMS_USE_BOOTP */ - + 0, /* efficiency */ + 0, /* udp TX buffer */ + 0, /* udp RX buffer */ + 0, /* tcp TX buffer */ + 0, /* tcp RX buffer */ }; /* diff --git a/networkconfig-qemu.h b/networkconfig-qemu.h index 760bf6f..076aae0 100644 --- a/networkconfig-qemu.h +++ b/networkconfig-qemu.h @@ -57,13 +57,11 @@ static char ethernet_address[6] = { 0x00, 0x80, 0x7F, 0x22, 0x61, 0x77 }; */ extern void rtems_bsdnet_loopattach(); static struct rtems_bsdnet_ifconfig loopback_config = { - "lo0", /* name */ - rtems_bsdnet_loopattach, /* attach function */ - - NULL, /* link to next interface */ - - "127.0.0.1", /* IP address */ - "255.0.0.0", /* IP net mask */ + "lo0", /* name */ + rtems_bsdnet_loopattach, /* attach function */ + NULL, /* link to next interface */ + "127.0.0.1", /* IP address */ + "255.0.0.0", /* IP net mask */ }; #endif @@ -71,60 +69,57 @@ static struct rtems_bsdnet_ifconfig loopback_config = { * Default network interface */ static struct rtems_bsdnet_ifconfig netdriver_config = { - RTEMS_BSP_NETWORK_DRIVER_NAME, /* name */ - RTEMS_BSP_NETWORK_DRIVER_ATTACH, /* attach function */ + RTEMS_BSP_NETWORK_DRIVER_NAME, /* name */ + RTEMS_BSP_NETWORK_DRIVER_ATTACH, /* attach function */ #ifdef RTEMS_USE_LOOPBACK - &loopback_config, /* link to next interface */ + &loopback_config, /* link to next interface */ #else - NULL, /* No more interfaces */ + NULL, /* No more interfaces */ #endif #if (defined (RTEMS_USE_BOOTP)) - NULL, /* BOOTP supplies IP address */ - NULL, /* BOOTP supplies IP net mask */ + NULL, /* BOOTP supplies IP address */ + NULL, /* BOOTP supplies IP net mask */ #else - "10.0.2.5", /* IP address */ - "255.255.255.0", /* IP net mask */ + "10.0.2.5", /* IP address */ + "255.255.255.0", /* IP net mask */ #endif /* !RTEMS_USE_BOOTP */ #if (defined (RTEMS_SET_ETHERNET_ADDRESS)) - ethernet_address, /* Ethernet hardware address */ + ethernet_address, /* Ethernet hardware address */ #else - NULL, /* Driver supplies hardware address */ + NULL, /* Driver supplies hardware address */ #endif - 0, /* Use default driver parameters */ - 0, /* mtu */ - 0, /* rbuf_count */ - 0, /* xbuf_count */ - 0, /* port */ - 9 /* irq */ + 0, /* Use default driver parameters */ + 0, /* mtu */ + 0, /* rbuf_count */ + 0, /* xbuf_count */ + 0, /* port */ + 9 /* irq */ }; /* * Network configuration */ struct rtems_bsdnet_config rtems_bsdnet_config = { - &netdriver_config, + &netdriver_config, #if (defined (RTEMS_USE_BOOTP)) - rtems_bsdnet_do_bootp, + rtems_bsdnet_do_bootp, #else - NULL, + NULL, #endif - - 0, /* Default network task priority */ - 256 * 1024, /* Default mbuf capacity */ - 256 * 1024, /* Default mbuf cluster capacity */ - + 0, /* Default network task priority */ + 256 * 1024, /* 256K - not default mbuf capacity */ + 256 * 1024, /* 256K - not default mbuf cluster capacity */ #if (!defined (RTEMS_USE_BOOTP)) - "rtems", /* Host name */ - "", /* Domain name */ - "10.0.2.1", /* Gateway */ - "10.0.0.1", /* Log host */ - {"10.0.2.3" }, /* Name server(s) */ - {"" }, /* NTP server(s) */ - + "rtems", /* Host name */ + "", /* Domain name */ + "10.0.2.1", /* Gateway */ + "10.0.0.1", /* Log host */ + {"10.0.2.3" }, /* Name server(s) */ + {"" }, /* NTP server(s) */ #endif /* !RTEMS_USE_BOOTP */ }; diff --git a/networkconfig.h b/networkconfig.h index 4ff3dd5..96a4461 100644 --- a/networkconfig.h +++ b/networkconfig.h @@ -36,7 +36,12 @@ static struct rtems_bsdnet_ifconfig netdriver_config = { "127.0.0.1", /* IP address */ "255.0.0.0", /* IP net mask */ NULL, /* Driver supplies hardware address */ - 0 /* Use default driver parameters */ + 0, /* Use default driver parameters */ + 0, /* default efficiency multiplier */ + 0, /* default udp TX socket buffer size */ + 0, /* default udp RX socket buffer size */ + 0, /* default tcp TX socket buffer size */ + 0, /* default tcp RX socket buffer size */ }; /* -- cgit v1.2.3