Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reload sc_ctrl in wm_reset(). 

Add an ICH10 entry.

Remove some obsolete comments.
This commit is contained in:
msaitoh 2009-04-07 18:42:30 +00:00
parent e1c695ebf8
commit eb993d20f8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/pci/if_wm.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_wm.c,v 1.173 2009/04/07 18:23:37 msaitoh Exp $ */
/* $NetBSD: if_wm.c,v 1.174 2009/04/07 18:42:30 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@ -73,13 +73,10 @@
* TODO (in order of importance):
*
* - Rework how parameters are loaded from the EEPROM.
* - Figure out what to do with the i82545GM and i82546GB
* SERDES controllers.
* - Fix hw VLAN assist.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.173 2009/04/07 18:23:37 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.174 2009/04/07 18:42:30 msaitoh Exp $");
#include "bpfilter.h"
#include "rnd.h"
@ -886,6 +883,9 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82567LF_3,
"82567LF-3 LAN Controller",
WM_T_ICH10, WMP_F_1000T },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801J_D_BM_LF,
"i82801J (LF) LAN Controller",
WM_T_ICH10, WMP_F_1000T },
{ 0, 0,
NULL,
0, 0 },
@ -3077,6 +3077,9 @@ wm_reset(struct wm_softc *sc)
wm_get_auto_rd_done(sc);
}
/* reload sc_ctrl */
sc->sc_ctrl = CSR_READ(sc, WMREG_CTRL);
#if 0
for (i = 0; i < 1000; i++) {
if ((CSR_READ(sc, WMREG_CTRL) & CTRL_RST) == 0) {