[src/trunk]: src/sys/arch/sandpoint/stand/altboot Priority of QNAP board dete...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/08465b5bf701
branches:  trunk
changeset: 764526:08465b5bf701
user:      phx <phx%NetBSD.org@localhost>
date:      Tue Apr 26 08:08:39 2011 +0000

description:
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.

diffstat:

 sys/arch/sandpoint/stand/altboot/brdsetup.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 8b157dfab064 -r 08465b5bf701 sys/arch/sandpoint/stand/altboot/brdsetup.c
--- a/sys/arch/sandpoint/stand/altboot/brdsetup.c       Tue Apr 26 07:41:18 2011 +0000
+++ b/sys/arch/sandpoint/stand/altboot/brdsetup.c       Tue Apr 26 08:08:39 2011 +0000
@@ -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);