Module Name: src
Committed By: phx
Date: Tue Apr 26 08:08:40 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: brdsetup.c
Log Message:
Priority of QNAP board detection was still too high. It should be lowest,
because a Realtek chip at pci device 15 is used on several boards. Now
NH230/All6250 detection should work again.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 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.16 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.17
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.16 Mon Apr 25 18:28:47 2011
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c Tue Apr 26 08:08:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.16 2011/04/25 18:28:47 phx Exp $ */
+/* $NetBSD: brdsetup.c,v 1.17 2011/04/26 08:08:39 phx Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -229,11 +229,6 @@
/* 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(dev16, PCI_ID_REG)) == 0x1191) {
/* ACARD ATP865 (acardide) at dev 16 */
brdtype = BRD_DLINKDSM;
@@ -243,6 +238,11 @@
/* ITE (iteide) or SiI (satalink) at dev 16 */
brdtype = BRD_NH230NAS;
}
+ 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;
+ }
brdprop = brd_lookup(brdtype);
