change log for network-demos (2010-12-08)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Dec 8 11:10:06 UTC 2010
*sh*:
2010-12-08 Sebastian Huber <Sebastian.Huber at embedded-brains.de>
* networkconfig.h, networkconfig-qemu.h, networkconfig-icecube.h,
networkconfig-mpc8313erdb.h: Loop back interface will be initialized
now during normal initialization via rtems_bsdnet_initialize_network().
M 1.35 ChangeLog
M 1.4 networkconfig-icecube.h
M 1.3 networkconfig-mpc8313erdb.h
M 1.7 networkconfig-qemu.h
M 1.17 networkconfig.h
diff -u network-demos/ChangeLog:1.34 network-demos/ChangeLog:1.35
--- network-demos/ChangeLog:1.34 Fri Feb 12 11:38:30 2010
+++ network-demos/ChangeLog Wed Dec 8 04:46:45 2010
@@ -1,3 +1,9 @@
+2010-12-08 Sebastian Huber <Sebastian.Huber at embedded-brains.de>
+
+ * networkconfig.h, networkconfig-qemu.h, networkconfig-icecube.h,
+ networkconfig-mpc8313erdb.h: Loop back interface will be initialized
+ now during normal initialization via rtems_bsdnet_initialize_network().
+
2010-02-12 Joel Sherrill <joel.sherrill at oarcorp.com>
* ttcp/rtems_ttcp.c: Update timeval usage.
diff -u network-demos/networkconfig-icecube.h:1.3 network-demos/networkconfig-icecube.h:1.4
--- network-demos/networkconfig-icecube.h:1.3 Tue Feb 5 15:49:36 2008
+++ network-demos/networkconfig-icecube.h Wed Dec 8 04:46:45 2010
@@ -44,32 +44,13 @@
static char ethernet_address[6] = { 0x00, 0x04, 0x9F, 0x00, 0x5B, 0x21 };
#endif
-#ifdef RTEMS_USE_LOOPBACK
-/*
- * Loopback interface
- */
-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 */
-};
-#endif
-
/*
* Default network interface
*/
static struct rtems_bsdnet_ifconfig netdriver_config = {
RTEMS_BSP_NETWORK_DRIVER_NAME, /* name */
RTEMS_BSP_NETWORK_DRIVER_ATTACH, /* attach function */
-
-#ifdef RTEMS_USE_LOOPBACK
- &loopback_config, /* link to next interface */
-#else
NULL, /* No more interfaces */
-#endif
#if (defined (RTEMS_USE_BOOTP))
NULL, /* BOOTP supplies IP address */
diff -u network-demos/networkconfig-mpc8313erdb.h:1.2 network-demos/networkconfig-mpc8313erdb.h:1.3
--- network-demos/networkconfig-mpc8313erdb.h:1.2 Wed Sep 17 14:31:54 2008
+++ network-demos/networkconfig-mpc8313erdb.h Wed Dec 8 04:46:45 2010
@@ -43,32 +43,13 @@
static char ethernet_address[6] = { 0x00, 0x04, 0x9F, 0x00, 0x5B, 0x21 };
#endif
-#ifdef RTEMS_USE_LOOPBACK
-/*
- * Loopback interface
- */
-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 */
-};
-#endif
-
/*
* Default network interface
*/
static struct rtems_bsdnet_ifconfig netdriver_config = {
RTEMS_BSP_NETWORK_DRIVER_NAME, /* name */
RTEMS_BSP_NETWORK_DRIVER_ATTACH, /* attach function */
-
-#ifdef RTEMS_USE_LOOPBACK
- &loopback_config, /* link to next interface */
-#else
NULL, /* No more interfaces */
-#endif
#if (defined (RTEMS_USE_BOOTP))
NULL, /* BOOTP supplies IP address */
diff -u network-demos/networkconfig-qemu.h:1.6 network-demos/networkconfig-qemu.h:1.7
--- network-demos/networkconfig-qemu.h:1.6 Wed May 13 13:56:10 2009
+++ network-demos/networkconfig-qemu.h Wed Dec 8 04:46:46 2010
@@ -61,9 +61,6 @@
* must also define FIXED_NETMASK
* FIXED_NETMASK <undefined> IP netmask string
* (e.g. "255.255.255.0")
- * LO_IF_ONLY <undefined> If defined, do NOT configure
- * any ethernet driver but only the
- * loopback interface.
* MULTI_NETDRIVER <undefined> ugly hack; if defined try to probe
* a variety of PCI and ISA drivers
* (i386 ONLY) use is discouraged!
@@ -140,9 +137,7 @@
#define FIXED_NETMASK 0
#endif
-#ifdef LO_IF_ONLY
-#undef NIC_NAME
-#elif !defined(NIC_NAME)
+#if !defined(NIC_NAME)
#ifdef MULTI_NETDRIVER
@@ -230,8 +225,6 @@
#endif /* ifdef MULTI_NETDRIVER */
-#endif /* ifdef LO_IF_ONLY */
-
#ifdef NIC_NAME
extern int NIC_ATTACH();
@@ -245,30 +238,16 @@
FIXED_NETMASK
}};
#else
-#ifndef LO_IF_ONLY
-#warning "NO KNOWN NETWORK DRIVER FOR THIS BSP -- YOU MAY HAVE TO EDIT rtems_netconfig.c"
-#endif
+#warning "NO KNOWN NETWORK DRIVER FOR THIS BSP -- YOU MAY HAVE TO EDIT networkconfig.h"
#endif
-extern void rtems_bsdnet_loopattach();
-static struct rtems_bsdnet_ifconfig loopback_config = {
- "lo0", /* name */
- (int (*)(struct rtems_bsdnet_ifconfig *, int))rtems_bsdnet_loopattach, /* attach function */
-#ifdef NIC_NAME
- netdriver_config, /* link to next interface */
-#else
- 0, /* link to next interface */
-#endif
- "127.0.0.1", /* IP address */
- "255.0.0.0", /* IP net mask */
-};
-
struct rtems_bsdnet_config rtems_bsdnet_config = {
- &loopback_config, /* Network interface */
#ifdef NIC_NAME
+ netdriver_config, /* link to next interface */
RTEMS_DO_BOOTP, /* Use BOOTP to get network configuration */
#else
- 0, /* Use BOOTP to get network configuration */
+ 0,
+ 0,
#endif
NETWORK_TASK_PRIORITY, /* Network task priority */
#if defined(MEMORY_CUSTOM)
diff -u network-demos/networkconfig.h:1.16 network-demos/networkconfig.h:1.17
--- network-demos/networkconfig.h:1.16 Thu Sep 18 08:33:30 2008
+++ network-demos/networkconfig.h Wed Dec 8 04:46:46 2010
@@ -22,33 +22,10 @@
#include <bsp.h>
/*
- * Loopback interface
- */
-extern int rtems_bsdnet_loopattach();
-
-/*
- * Default network interface
- */
-static struct rtems_bsdnet_ifconfig netdriver_config = {
- "lo0", /* name */
- rtems_bsdnet_loopattach, /* attach function */
- NULL, /* No more interfaces */
- "127.0.0.1", /* IP address */
- "255.0.0.0", /* IP net mask */
- NULL, /* Driver supplies hardware address */
- 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 */
-};
-
-/*
* Network configuration
*/
struct rtems_bsdnet_config rtems_bsdnet_config = {
- &netdriver_config,
+ NULL, /* Loop back interface only */
NULL, /* do not use bootp */
0, /* Default network task priority */
0, /* Default mbuf capacity */
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20101208/48268e2d/attachment.html>
More information about the vc
mailing list