summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-21 14:00:06 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-09-21 14:00:06 +0000
commited13346130e127a28aa93f78cb2182dd01c98102 (patch)
tree0d583aadcc4bb7cd3087a262ec35ff9448836913
parent2001-09-14 Fernando Ruiz <fernando.ruiz@ctv.es> (diff)
downloadrtems-ed13346130e127a28aa93f78cb2182dd01c98102.tar.bz2
2001-09-14 Joel Sherrill <joel@OARcorp.com>
* network/Makefile.am: Fixed typo on file name. * network/i82586.c: Commented out line 318 which is referencing a member of a structure that is not currently there. This needs to be worked out with Chris Johns <ccj@acm.org>. Switched C++ style comments to C style.
-rw-r--r--c/src/libchip/ChangeLog8
-rw-r--r--c/src/libchip/network/Makefile.am2
-rw-r--r--c/src/libchip/network/i82586.c7
3 files changed, 13 insertions, 4 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog
index cbfce62249..50413c1415 100644
--- a/c/src/libchip/ChangeLog
+++ b/c/src/libchip/ChangeLog
@@ -1,3 +1,11 @@
+2001-09-14 Joel Sherrill <joel@OARcorp.com>
+
+ * network/Makefile.am: Fixed typo on file name.
+ * network/i82586.c: Commented out line 318 which is referencing
+ a member of a structure that is not currently there. This
+ needs to be worked out with Chris Johns <ccj@acm.org>.
+ Switched C++ style comments to C style.
+
2001-09-19 Chris Johns <ccj@acm.org>
* network/README.i82586, network/i82586.c, network/i82586reg.h,
diff --git a/c/src/libchip/network/Makefile.am b/c/src/libchip/network/Makefile.am
index f8ced4bf2e..85c6e6d45e 100644
--- a/c/src/libchip/network/Makefile.am
+++ b/c/src/libchip/network/Makefile.am
@@ -10,7 +10,7 @@ LIBNAME = libnetchip
LIB = $(ARCH)/$(LIBNAME).a
# add cs8900.c to work with it and make it compile
-C_FILES = dec21140.c i82586.h sonic.c
+C_FILES = dec21140.c i82586.c sonic.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
include_libchip_HEADERS = cs8900.h i82586var.h sonic.h
diff --git a/c/src/libchip/network/i82586.c b/c/src/libchip/network/i82586.c
index 6d0006272b..d74d91c8a2 100644
--- a/c/src/libchip/network/i82586.c
+++ b/c/src/libchip/network/i82586.c
@@ -316,7 +316,8 @@ i82586_attach(struct rtems_bsdnet_ifconfig *config, int attaching)
if ((unit = rtems_bsdnet_parse_driver_name (config, &name)) < 0)
return 0;
- sc = config->drv_ctrl;
+ sc = 0; /* config->drv_ctrl; */
+#warning "undo this hack"
ifp = &sc->arpcom.ac_if;
#if I82586_DEBUG
@@ -1048,7 +1049,7 @@ i82586_tint(struct ie_softc *sc, int scbstatus)
printf("i82586_tint: (%d) command still busy; status=0x%x; tail=%d\n",
sc->trace_flow_in / 2, status, sc->xctail);
printf("iestatus = 0x%x\n", scbstatus);
-// sc->sc_debug = IED_ALL;
+/* sc->sc_debug = IED_ALL; */
}
if (status & IE_STAT_OK) {
@@ -1964,7 +1965,7 @@ int
i82586_ioctl(struct ifnet *ifp, int cmd, caddr_t data)
{
struct ie_softc *sc = ifp->if_softc;
-// struct ifreq *ifr = (struct ifreq *)data;
+/* struct ifreq *ifr = (struct ifreq *)data; */
int s;
int error = 0;