- Split out the ISA and PCCARD specific code.

- Split out the prototypes, externs and struct decls from if_epreg.h into
  if_epvar.h.

- Add support for MCA based Etherlink III (3c529) devices.

None of this code is used right now; the old if_ep driver is still
in place and used.

I will eventually get around to converting if_ep_isa.c to newbus once I've
had a talk with Peter and DFR about the DEVICE_IDENTIFY() method.

I have tested this code on my PS/2.  It works.  I would like EISA and ISA
testers since my example hardware hasn't arrived yet.

Add:

dev/ep/if_ep.c          optional ep
dev/ep/if_ep_isa.c      optional ep isa
dev/ep/if_ep_eisa.c     optional ep eisa
dev/ep/if_ep_mca.c      optional ep mca
dev/ep/if_ep_pccard.c   optional ep card

to sys/conf/files

Remove:

i386/eisa/3c5x9.c             optional        ep
i386/isa/if_ep.c              optional        ep

from sys/i386/conf/files.i386

PCCARD testers wanted!

I will switch off and cvs rm the old driver in favor of this copy once
I've had positive feedback or have the hardware to verify that it works.

1 files changed, 78 insertions, 0 deletions

diff --git a/sys/dev/ep/if_epvar.h b/sys/dev/ep/if_epvar.h
new file mode 100644
index 0000000..4ad224f
--- /dev/null
+++ b/sys/dev/ep/if_epvar.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer. 2. The name
+ * of the author may not be used to endorse or promote products derived from
+ * this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Ethernet software status per interface.
+ */
+struct ep_softc {
+	struct arpcom	arpcom;		/* Ethernet common part		 */
+	int		ep_io_addr;	/* i/o bus address		 */
+	struct mbuf *	top;
+	struct mbuf *	mcur;
+	short		cur_len;
+	u_short		ep_connectors;	/* Connectors on this card.	 */
+	u_char		ep_connector;	/* Configured connector.	 */
+	int		stat;		/* some flags */
+	int		gone;		/* adapter is not present (for PCCARD) */
+#define	F_RX_FIRST		0x1
+#define	F_PROMISC		0x8
+
+#define	F_ACCESS_32_BITS	0x100
+
+	struct ep_board *epb;
+
+	int		unit;
+
+#ifdef  EP_LOCAL_STATS
+	short		tx_underrun;
+	short		rx_no_first;
+	short		rx_no_mbuf;
+	short		rx_bpf_disc;
+	short		rx_overrunf;
+	short		rx_overrunl;
+#endif
+};
+
+struct ep_board {
+	int		epb_addr;	/* address of this board */
+	char		epb_used;	/* was this entry already used for configuring ? */
+					/* data from EEPROM for later use */
+	u_short		eth_addr[3];	/* Ethernet address */
+	u_short		prod_id;	/* product ID */
+	int		cmd_off;	/* command offset (bit shift) */
+	int		mii_trans;	/* activate MII transiever */
+	u_short		res_cfg;	/* resource configuration */
+};
+
+extern struct ep_softc*	ep_softc[];
+extern struct ep_board	ep_board[];
+extern int		ep_boards;
+extern u_long		ep_unit;
+
+extern struct ep_softc*	ep_alloc	(int, struct ep_board *);
+extern int		ep_attach	(struct ep_softc *);
+extern void		ep_free		(struct ep_softc *);
+extern void		ep_intr		(void *);
+
+extern u_int16_t	get_e		(struct ep_softc *, int);