svn commit: r221568 - head/sys/dev/xl

Pyun YongHyeon yongari at FreeBSD.org
Sat May 7 00:25:13 UTC 2011


Author: yongari
Date: Sat May  7 00:25:12 2011
New Revision: 221568
URL: http://svn.freebsd.org/changeset/base/221568

Log:
  XL_DMACTL is 32bit register, use 32bit write macro.
  While I'm here add more bits for the register.

Modified:
  head/sys/dev/xl/if_xl.c
  head/sys/dev/xl/if_xlreg.h

Modified: head/sys/dev/xl/if_xl.c
==============================================================================
--- head/sys/dev/xl/if_xl.c	Sat May  7 00:18:58 2011	(r221567)
+++ head/sys/dev/xl/if_xl.c	Sat May  7 00:25:12 2011	(r221568)
@@ -2969,7 +2969,7 @@ xl_init_locked(struct xl_softc *sc)
 
 	/* Set the RX early threshold */
 	CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_SET_THRESH|(XL_PACKET_SIZE >>2));
-	CSR_WRITE_2(sc, XL_DMACTL, XL_DMACTL_UP_RX_EARLY);
+	CSR_WRITE_4(sc, XL_DMACTL, XL_DMACTL_UP_RX_EARLY);
 
 	/* Enable receiver and transmitter. */
 	CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_TX_ENABLE);

Modified: head/sys/dev/xl/if_xlreg.h
==============================================================================
--- head/sys/dev/xl/if_xlreg.h	Sat May  7 00:18:58 2011	(r221567)
+++ head/sys/dev/xl/if_xlreg.h	Sat May  7 00:25:12 2011	(r221568)
@@ -124,6 +124,11 @@
 #define XL_DMACTL_DOWN_INPROG		0x00000080
 #define XL_DMACTL_COUNTER_SPEED		0x00000100
 #define XL_DMACTL_DOWNDOWN_MODE		0x00000200
+#define XL_DMACTL_UP_ALTSEQ_DIS		0x00010000	/* 3c90xB/3c90xC */
+#define XL_DMACTL_DOWN_ALTSEQ_DIS	0x00020000	/* 3c90xC only */
+#define XL_DMACTL_DEFEAT_MWI		0x00100000	/* 3c90xB/3c90xC */
+#define XL_DMACTL_DEFEAT_MRL		0x00100000	/* 3c90xB/3c90xC */
+#define XL_DMACTL_UP_OVERRUN_DISC_DIS	0x00200000	/* 3c90xB/3c90xC */
 #define XL_DMACTL_TARGET_ABORT		0x40000000
 #define XL_DMACTL_MASTER_ABORT		0x80000000
 


More information about the svn-src-head mailing list