- The ASIX AX88796 is an NE2000 compatible ethernet chip, but doesn't seem

to have "remote DMA complete bit" is ISR.  So, don't wait for ISR.RDC bit
after writing a packet.

From bsh@NetBSD

- Figure out whether the shared memory region is word-accessible in the same
place we figure out its size, and store this in the softc, rather than using
a series of comparisons later.

From mycroft@NetBSD

- support for the NE2000 type AX88790.

From Yong-Jhen Hong <yongjhen at alqualonde dot org> via NetBSD

Tested by deraadt@ and Adriaan <misc dot adriaan at gmail dot com>
ok deraadt@

2 files changed, 48 insertions, 44 deletions

diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c
index d0b0a554496..67fd2e21a70 100644
--- a/sys/dev/ic/ne2000.c
+++ b/sys/dev/ic/ne2000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ne2000.c,v 1.22 2006/10/20 18:27:25 brad Exp $	*/
+/*	$OpenBSD: ne2000.c,v 1.23 2006/11/07 01:46:59 brad Exp $	*/
 /*	$NetBSD: ne2000.c,v 1.12 1998/06/10 01:15:50 thorpej Exp $	*/
 
 /*-
@@ -113,18 +113,36 @@ ne2000_attach(struct ne2000_softc *nsc, u_int8_t *myea)
 	 * Detect it again unless caller specified it; this gives us
 	 * the memory size.
 	 */
-	if (nsc->sc_type == 0) {
+	if (nsc->sc_type == NE2000_TYPE_UNKNOWN)
 		nsc->sc_type = ne2000_detect(nsc);
-		if (nsc->sc_type == 0) {
-			printf(": where did the card go?\n");
-			return (1);
-		}
-	}
 
-	useword = NE2000_USE_WORD(nsc);
+	/*
+	 * 8k of memory for NE1000, 16k otherwise.
+	 */
+	switch (nsc->sc_type) {
+	case NE2000_TYPE_UNKNOWN:
+	default:
+		printf(": where did the card go?\n");
+		return (1);
+	case NE2000_TYPE_NE1000:
+		memsize = 8192;
+		useword = 0;
+		break;
+	case NE2000_TYPE_NE2000:
+	case NE2000_TYPE_AX88190:		/* XXX really? */
+	case NE2000_TYPE_AX88790:
+	case NE2000_TYPE_DL10019:
+	case NE2000_TYPE_DL10022:
+		memsize = 8192 * 2;
+		useword = 1;
+		break;
+ 	}
+
+	nsc->sc_useword = useword;
 
 	dsc->cr_proto = ED_CR_RD2;
-	if (nsc->sc_type == NE2000_TYPE_AX88190) {
+	if (nsc->sc_type == NE2000_TYPE_AX88190 ||
+	    nsc->sc_type == NE2000_TYPE_AX88790) {
 		dsc->rcr_proto = ED_RCR_INTT;
 		dsc->sc_flags |= DP8390_DO_AX88190_WORKAROUND;
 	} else
@@ -150,21 +168,6 @@ ne2000_attach(struct ne2000_softc *nsc, u_int8_t *myea)
 		dsc->sc_reg_map[i] = i;
 
 	/*
-	 * 8k of memory for NE1000, 16k otherwise.
-	 */
-	switch (nsc->sc_type) {
-	case NE2000_TYPE_NE1000:
-		memsize = 8192;
-		break;
-	case NE2000_TYPE_NE2000:
-	case NE2000_TYPE_AX88190:		/* XXX really? */
-	case NE2000_TYPE_DL10019:
-	case NE2000_TYPE_DL10022:
-		memsize = 8192 * 2;
-		break;
-	}
-
-	/*
 	 * NIC memory doens't start at zero on an NE board.
 	 * The start address is tied to the bus width.
 	 * (It happens to be computed the same way as mem size.)
@@ -242,7 +245,8 @@ ne2000_attach(struct ne2000_softc *nsc, u_int8_t *myea)
 
 	if (myea == NULL) {
 		/* Read the station address. */
-		if (nsc->sc_type == NE2000_TYPE_AX88190) {
+		if (nsc->sc_type == NE2000_TYPE_AX88190 ||
+		    nsc->sc_type == NE2000_TYPE_AX88790) {
 			/* Select page 0 registers. */
 			NIC_BARRIER(nict, nich);
 			bus_space_write_1(nict, nich, ED_P0_CR,
@@ -252,8 +256,8 @@ ne2000_attach(struct ne2000_softc *nsc, u_int8_t *myea)
 			bus_space_write_1(nict, nich, ED_P0_DCR, ED_DCR_WTS);
 			NIC_BARRIER(nict, nich);
 			ne2000_readmem(nict, nich, asict, asich,
-			    AX88190_NODEID_OFFSET,
-			    dsc->sc_arpcom.ac_enaddr, ETHER_ADDR_LEN, useword);
+			    AX88190_NODEID_OFFSET, dsc->sc_arpcom.ac_enaddr,
+			    ETHER_ADDR_LEN, useword);
 		} else {
 			ne2000_readmem(nict, nich, asict, asich, 0, romdata,
 			    sizeof(romdata), useword);
@@ -584,6 +588,10 @@ ne2000_write_mbuf(struct dp8390_softc *sc, struct mbuf *m, int buf)
 	}
 	NIC_BARRIER(nict, nich);
 
+	/* AX88796 doesn't seem to have remote DMA complete */
+	if (sc->sc_flags & DP8390_NO_REMOTE_DMA_COMPLETE)
+		return (savelen);
+
 	/*
 	 * Wait for remote DMA to complete.  This is necessary because on the
 	 * transmit side, data is handled internally by the NIC in bursts, and
@@ -624,7 +632,7 @@ ne2000_ring_copy(struct dp8390_softc *sc, int src, caddr_t dst,
 	bus_space_tag_t asict = nsc->sc_asict;
 	bus_space_handle_t asich = nsc->sc_asich;
 	u_short tmp_amount;
-	int useword = NE2000_USE_WORD(nsc);
+	int useword = nsc->sc_useword;
 
 	/* Does copy wrap to lower addr in ring buffer? */
 	if (src + amount > sc->mem_end) {
@@ -652,7 +660,7 @@ ne2000_read_hdr(struct dp8390_softc *sc, int buf, struct dp8390_ring *hdr)
 
 	ne2000_readmem(sc->sc_regt, sc->sc_regh, nsc->sc_asict, nsc->sc_asich,
 	    buf, (u_int8_t *)hdr, sizeof(struct dp8390_ring),
-	    NE2000_USE_WORD(nsc));
+	    nsc->sc_useword);
 #if BYTE_ORDER == BIG_ENDIAN
 	hdr->count = swap16(hdr->count);
 #endif
diff --git a/sys/dev/ic/ne2000var.h b/sys/dev/ic/ne2000var.h
index 85f2932593f..1ddf434d299 100644
--- a/sys/dev/ic/ne2000var.h
+++ b/sys/dev/ic/ne2000var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ne2000var.h,v 1.7 2002/03/14 01:26:55 millert Exp $	*/
+/*	$OpenBSD: ne2000var.h,v 1.8 2006/11/07 01:46:59 brad Exp $	*/
 /*	$NetBSD: ne2000var.h,v 1.2 1997/10/14 22:54:12 thorpej Exp $	*/
 
 /*-
@@ -47,22 +47,18 @@ struct ne2000_softc {
 	bus_space_tag_t sc_asict;	/* space tag for ASIC */
 	bus_space_handle_t sc_asich;	/* space handle for ASIC */
 
-	int sc_type;
+	enum {
+		NE2000_TYPE_UNKNOWN = 0,
+		NE2000_TYPE_NE1000,
+		NE2000_TYPE_NE2000,
+		NE2000_TYPE_DL10019,
+		NE2000_TYPE_DL10022,
+		NE2000_TYPE_AX88190,
+		NE2000_TYPE_AX88790
+	} sc_type;
+	int sc_useword;
 };
 
-/* sc_type */
-#define	NE2000_TYPE_NE1000	1
-#define	NE2000_TYPE_NE2000	2
-#define	NE2000_TYPE_DL10019	3
-#define	NE2000_TYPE_DL10022	4
-#define	NE2000_TYPE_AX88190	5
-
-#define	NE2000_USE_WORD(sc)				\
-	(((sc)->sc_type == NE2000_TYPE_NE2000) ||	\
-	((sc)->sc_type == NE2000_TYPE_DL10019) ||	\
-	((sc)->sc_type == NE2000_TYPE_DL10022) ||	\
-	((sc)->sc_type == NE2000_TYPE_AX88190))
-
 int	ne2000_attach(struct ne2000_softc *, u_int8_t *);
 int	ne2000_detect(struct ne2000_softc *);
 int	ne2000_detach(struct ne2000_softc *, int);