Tue Apr 26 08:08:40 2011 UTC ()
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.


(phx)
diff -r1.16 -r1.17 src/sys/arch/sandpoint/stand/altboot/brdsetup.c

cvs diff -r1.16 -r1.17 src/sys/arch/sandpoint/stand/altboot/brdsetup.c (expand / switch to context diff)
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c 2011/04/25 18:28:47 1.16
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c 2011/04/26 08:08:39 1.17
@@ -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;
@@ -242,6 +237,11 @@
 	    || PCI_VENDOR(pcicfgread(dev16, PCI_ID_REG)) == 0x1095) {
 		/* 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);