Module Name: src
Committed By: phx
Date: Mon Apr 25 18:28:47 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: brdsetup.c
Log Message:
Detect StorCenter before QNAP, otherwise the Realtek NIC will mis-detect as
StorCenter boards as QNAP.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sandpoint/stand/altboot/brdsetup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sandpoint/stand/altboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.15 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.16
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.15 Sun Apr 17 13:09:30 2011
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c Mon Apr 25 18:28:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.15 2011/04/17 13:09:30 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.16 2011/04/25 18:28:47 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -225,15 +225,15 @@
/* SKnet/Marvell (sk) at dev 15 */
brdtype = BRD_SYNOLOGY;
}
+ else if (PCI_VENDOR(pcicfgread(dev13, PCI_ID_REG)) == 0x1106) {
+ /* VIA 6410 (viaide) at dev 13 */
+ brdtype = BRD_STORCENTER;
+ }
else if (PCI_VENDOR(pcicfgread(dev15, PCI_ID_REG)) == 0x8086
|| PCI_VENDOR(pcicfgread(dev15, PCI_ID_REG)) == 0x10ec) {
/* Intel (wm) or RealTek (re) at dev 15 */
brdtype = BRD_QNAPTS;
}
- else if (PCI_VENDOR(pcicfgread(dev13, PCI_ID_REG)) == 0x1106) {
- /* VIA 6410 (viaide) at dev 13 */
- brdtype = BRD_STORCENTER;
- }
else if (PCI_VENDOR(pcicfgread(dev16, PCI_ID_REG)) == 0x1191) {
/* ACARD ATP865 (acardide) at dev 16 */
brdtype = BRD_DLINKDSM;
