* Revision 2.16 1993/11/29 16:55:56 davidg

 * merged in Garrett Wollman's strict prototype changes
 *
 * Revision 2.15  1993/11/29  16:32:58  davidg
 * From Thomas Sandford <t.d.g.sandford@comp.brad.ac.uk>
 * Add support for the 8013W board type

4 files changed, 56 insertions, 20 deletions

diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 47c0664..30d37e6 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -20,12 +20,19 @@
  */
 
 /*
- * $Id: if_ed.c,v 1.23 1993/11/22 11:08:14 davidg Exp $
+ * $Id: if_ed.c,v 2.16 1993/11/29 16:55:56 davidg Exp davidg $
  */
 
 /*
  * Modification history
  *
+ * Revision 2.16  1993/11/29  16:55:56  davidg
+ * merged in Garrett Wollman's strict prototype changes
+ *
+ * Revision 2.15  1993/11/29  16:32:58  davidg
+ * From Thomas Sandford <t.d.g.sandford@comp.brad.ac.uk>
+ * Add support for the 8013W board type
+ *
  * Revision 2.14  1993/11/22  10:55:30  davidg
  * change all splnet's to splimp's
  *
@@ -185,14 +192,15 @@ struct	ed_softc {
 	u_char	next_packet;	/* pointer to next unread RX packet */
 } ed_softc[NED];
 
-int ed_attach(struct isa_device *);
-void ed_init(int);
-void edintr(int);
-int ed_ioctl(struct ifnet *, int, caddr_t);
-int ed_probe(struct isa_device *);
-void ed_start(struct ifnet *);
-void ed_reset(int, int);
-void ed_watchdog(int);
+int	ed_attach(struct isa_device *);
+void	ed_init(int);
+void	edintr(int);
+int	ed_ioctl(struct ifnet *, int, caddr_t);
+int	ed_probe(struct isa_device *);
+void	ed_start(struct ifnet *);
+void	ed_reset(int, int);
+void	ed_watchdog(int);
+
 static void ed_get_packet(struct ed_softc *, char *, int /*u_short*/);
 static void ed_stop(int);
 
@@ -378,6 +386,11 @@ ed_probe_WD80x3(isa_dev)
 		memsize = 16384;
 		isa16bit = 1;
 		break;
+	case ED_TYPE_WD8013W:
+		sc->type_str = "WD8013W";
+		memsize = 16384;
+		isa16bit = 1;
+		break;
 	case ED_TYPE_WD8013EP:		/* also WD8003EP */
 		if (inb(sc->asic_addr + ED_WD_ICR)
 			& ED_WD_ICR_16BIT) {
diff --git a/sys/dev/ed/if_edreg.h b/sys/dev/ed/if_edreg.h
index 428b567..a8899f6 100644
--- a/sys/dev/ed/if_edreg.h
+++ b/sys/dev/ed/if_edreg.h
@@ -1,10 +1,14 @@
 /*
  * National Semiconductor DS8390 NIC register definitions 
  *
- * $Id: if_edreg.h,v 2.1 1993/11/22 10:52:33 davidg Exp davidg $
+ * $Id: if_edreg.h,v 2.2 1993/11/29 16:33:39 davidg Exp davidg $
  *
  * Modification history
  *
+ * Revision 2.2  1993/11/29  16:33:39  davidg
+ * From Thomas Sandford <t.d.g.sandford@comp.brad.ac.uk>
+ * Add support for the 8013W board type
+ *
  * Revision 2.1  1993/11/22  10:52:33  davidg
  * patch to add support for SMC8216 (Elite-Ultra) boards
  * from Glen H. Lowe
@@ -674,6 +678,7 @@ struct ed_ring	{
 #define ED_TYPE_WD8003S		0x02
 #define ED_TYPE_WD8003E		0x03
 #define ED_TYPE_WD8013EBT	0x05
+#define ED_TYPE_WD8013W		0x26
 #define ED_TYPE_WD8013EP	0x27
 #define ED_TYPE_WD8013WC	0x28
 #define ED_TYPE_WD8013EBP	0x2c
diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 47c0664..30d37e6 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -20,12 +20,19 @@
  */
 
 /*
- * $Id: if_ed.c,v 1.23 1993/11/22 11:08:14 davidg Exp $
+ * $Id: if_ed.c,v 2.16 1993/11/29 16:55:56 davidg Exp davidg $
  */
 
 /*
  * Modification history
  *
+ * Revision 2.16  1993/11/29  16:55:56  davidg
+ * merged in Garrett Wollman's strict prototype changes
+ *
+ * Revision 2.15  1993/11/29  16:32:58  davidg
+ * From Thomas Sandford <t.d.g.sandford@comp.brad.ac.uk>
+ * Add support for the 8013W board type
+ *
  * Revision 2.14  1993/11/22  10:55:30  davidg
  * change all splnet's to splimp's
  *
@@ -185,14 +192,15 @@ struct	ed_softc {
 	u_char	next_packet;	/* pointer to next unread RX packet */
 } ed_softc[NED];
 
-int ed_attach(struct isa_device *);
-void ed_init(int);
-void edintr(int);
-int ed_ioctl(struct ifnet *, int, caddr_t);
-int ed_probe(struct isa_device *);
-void ed_start(struct ifnet *);
-void ed_reset(int, int);
-void ed_watchdog(int);
+int	ed_attach(struct isa_device *);
+void	ed_init(int);
+void	edintr(int);
+int	ed_ioctl(struct ifnet *, int, caddr_t);
+int	ed_probe(struct isa_device *);
+void	ed_start(struct ifnet *);
+void	ed_reset(int, int);
+void	ed_watchdog(int);
+
 static void ed_get_packet(struct ed_softc *, char *, int /*u_short*/);
 static void ed_stop(int);
 
@@ -378,6 +386,11 @@ ed_probe_WD80x3(isa_dev)
 		memsize = 16384;
 		isa16bit = 1;
 		break;
+	case ED_TYPE_WD8013W:
+		sc->type_str = "WD8013W";
+		memsize = 16384;
+		isa16bit = 1;
+		break;
 	case ED_TYPE_WD8013EP:		/* also WD8003EP */
 		if (inb(sc->asic_addr + ED_WD_ICR)
 			& ED_WD_ICR_16BIT) {
diff --git a/sys/i386/isa/if_edreg.h b/sys/i386/isa/if_edreg.h
index 428b567..a8899f6 100644
--- a/sys/i386/isa/if_edreg.h
+++ b/sys/i386/isa/if_edreg.h
@@ -1,10 +1,14 @@
 /*
  * National Semiconductor DS8390 NIC register definitions 
  *
- * $Id: if_edreg.h,v 2.1 1993/11/22 10:52:33 davidg Exp davidg $
+ * $Id: if_edreg.h,v 2.2 1993/11/29 16:33:39 davidg Exp davidg $
  *
  * Modification history
  *
+ * Revision 2.2  1993/11/29  16:33:39  davidg
+ * From Thomas Sandford <t.d.g.sandford@comp.brad.ac.uk>
+ * Add support for the 8013W board type
+ *
  * Revision 2.1  1993/11/22  10:52:33  davidg
  * patch to add support for SMC8216 (Elite-Ultra) boards
  * from Glen H. Lowe
@@ -674,6 +678,7 @@ struct ed_ring	{
 #define ED_TYPE_WD8003S		0x02
 #define ED_TYPE_WD8003E		0x03
 #define ED_TYPE_WD8013EBT	0x05
+#define ED_TYPE_WD8013W		0x26
 #define ED_TYPE_WD8013EP	0x27
 #define ED_TYPE_WD8013WC	0x28
 #define ED_TYPE_WD8013EBP	0x2c