From owner-svn-src-all@FreeBSD.ORG  Sat May  7 00:25:12 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F0EF71065689;
	Sat,  7 May 2011 00:25:12 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E0EF58FC14;
	Sat,  7 May 2011 00:25:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p470PCKP073070;
	Sat, 7 May 2011 00:25:12 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p470PC4k073067;
	Sat, 7 May 2011 00:25:12 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201105070025.p470PC4k073067@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Sat, 7 May 2011 00:25:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221568 - head/sys/dev/xl
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 May 2011 00:25:13 -0000

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