Subject: CVS commit: [netbsd-4] src/sys/dev/pci
To: None <source-changes@NetBSD.org>
From: Liam J. Foy <liamjfoy@netbsd.org>
List: source-changes
Date: 08/26/2007 12:01:21
Module Name:	src
Committed By:	liamjfoy
Date:		Sun Aug 26 12:01:21 UTC 2007

Modified Files:
	src/sys/dev/pci [netbsd-4]: if_msk.c if_mskvar.h if_sk.c if_skreg.h
	    pcidevs

Log Message:
Pull up following revision(s) (requested by riz in ticket #816):
	sys/dev/pci/if_skreg.h: revision 1.10
	sys/dev/pci/if_skreg.h: revision 1.11
	sys/dev/pci/pcidevs: revision 1.866
	sys/dev/pci/if_skreg.h: revision 1.9
	sys/dev/pci/if_sk.c: revision 1.36
	sys/dev/pci/if_msk.c: revision 1.4
	sys/dev/pci/if_msk.c: revision 1.5
	sys/dev/pci/if_msk.c: revision 1.6
	sys/dev/pci/if_msk.c: revision 1.7
	sys/dev/pci/if_mskvar.h: revision 1.2
	sys/dev/pci/if_mskvar.h: revision 1.3
Apply OpenBSD's rev. 1.33 to shut up "msk0: phy write timed out"
Original commit message:
 > In msk_marv_miibus_writereg, wait for busy flag to clear instead of
 > continuing when busy flag set.

add some msk devices

sync with OpenBSD-current (many bugfixes, add some devices)
if_msk.c: rev. 1.42
if_mskvar.h rev. 1.3
if_skreg.h rev. 1.41

sync with if_skreg.h rev. 1.41
need more work?

apply some patches from FreeBSD
 o fix device timeout
 o add some workaround
 o TX underrun bug (grr...)
 o and some bugs

fix bit definitions for the RX FIFO Flush mode

Apply OpenBSD's rev. 1.14 via patch:
 > remove another Yukon Lite workaround.


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.3.4.1 src/sys/dev/pci/if_msk.c
cvs rdiff -r1.1 -r1.1.10.1 src/sys/dev/pci/if_mskvar.h
cvs rdiff -r1.35.2.1 -r1.35.2.2 src/sys/dev/pci/if_sk.c
cvs rdiff -r1.8 -r1.8.4.1 src/sys/dev/pci/if_skreg.h
cvs rdiff -r1.855.2.6 -r1.855.2.7 src/sys/dev/pci/pcidevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.