Module Name: src
Committed By: msaitoh
Date: Mon May 4 06:44:13 UTC 2015
Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h
Log Message:
Remove WMREG_TQSA_LO and WMREG_TQSA_HIGH. Those registers
are not described in documents and other OS's drivers don't
access it.
(I have no the first chip(82542)'s document. Those registers
might be described in the document).
To generate a diff of this commit:
cvs rdiff -u -r1.316 -r1.317 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pci/if_wmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.316 src/sys/dev/pci/if_wm.c:1.317
--- src/sys/dev/pci/if_wm.c:1.316 Fri Apr 17 02:54:15 2015
+++ src/sys/dev/pci/if_wm.c Mon May 4 06:44:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.316 2015/04/17 02:54:15 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.317 2015/05/04 06:44:13 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.316 2015/04/17 02:54:15 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.317 2015/05/04 06:44:13 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3988,8 +3988,6 @@ wm_init_locked(struct ifnet *ifp)
RXDCTL_HTHRESH(0) | RXDCTL_WTHRESH(1));
}
}
- CSR_WRITE(sc, WMREG_TQSA_LO, 0);
- CSR_WRITE(sc, WMREG_TQSA_HI, 0);
/* Initialize the transmit job descriptors. */
for (i = 0; i < WM_TXQUEUELEN(sc); i++)
Index: src/sys/dev/pci/if_wmreg.h
diff -u src/sys/dev/pci/if_wmreg.h:1.66 src/sys/dev/pci/if_wmreg.h:1.67
--- src/sys/dev/pci/if_wmreg.h:1.66 Sun Feb 15 21:32:33 2015
+++ src/sys/dev/pci/if_wmreg.h Mon May 4 06:44:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmreg.h,v 1.66 2015/02/15 21:32:33 msaitoh Exp $ */
+/* $NetBSD: if_wmreg.h,v 1.67 2015/05/04 06:44:13 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -582,9 +582,6 @@ struct livengood_tcpip_ctxdesc {
#define DEFAULT_80003ES2LAN_TCTL_EXT_GCEX 0x00010000
-#define WMREG_TQSA_LO 0x0408
-#define WMREG_TQSA_HI 0x040c
-
#define WMREG_TIPG 0x0410 /* Transmit IPG Register */
#define TIPG_IPGT(x) (x) /* IPG transmit time */
#define TIPG_IPGR1(x) ((x) << 10) /* IPG receive time 1 */
