[src/trunk]: src/sys/arch/sandpoint/pci Detect QNAP board last, because a Rea...

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

details:   https://anonhg.NetBSD.org/src/rev/76b72224bde5
branches:  trunk
changeset: 764671:76b72224bde5
user:      phx <phx%NetBSD.org@localhost>
date:      Sat Apr 30 11:12:58 2011 +0000

description:
Detect QNAP board last, because a Realtek chip at pci device 15 is used
on several boards.

diffstat:

 sys/arch/sandpoint/pci/pci_machdep.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r c025e116d1ac -r 76b72224bde5 sys/arch/sandpoint/pci/pci_machdep.c
--- a/sys/arch/sandpoint/pci/pci_machdep.c      Sat Apr 30 06:20:37 2011 +0000
+++ b/sys/arch/sandpoint/pci/pci_machdep.c      Sat Apr 30 11:12:58 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_machdep.c,v 1.26 2011/04/04 20:37:53 dyoung Exp $  */
+/*     $NetBSD: pci_machdep.c,v 1.27 2011/04/30 11:12:58 phx Exp $     */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.26 2011/04/04 20:37:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.27 2011/04/30 11:12:58 phx Exp $");
 
 #include "opt_pci.h"
 
@@ -135,12 +135,6 @@
        }
        tag = pci_make_tag(pba->pba_pc, pba->pba_bus, 15, 0);
        dev15 = pci_conf_read(pba->pba_pc, tag, PCI_ID_REG);
-       if (PCI_VENDOR(dev15) == PCI_VENDOR_INTEL
-           || PCI_VENDOR(dev15) == PCI_VENDOR_REALTEK) {
-               /* Intel or Realtek GbE at dev 15 */
-               brdtype = BRD_QNAPTS;
-               return;
-       }
        if (PCI_VENDOR(dev15) == PCI_VENDOR_MARVELL) {
                /* Marvell GbE at dev 15 */
                brdtype = BRD_SYNOLOGY;
@@ -165,6 +159,12 @@
                brdtype = BRD_NH230NAS;
                return;
        }
+       if (PCI_VENDOR(dev15) == PCI_VENDOR_INTEL
+           || PCI_VENDOR(dev15) == PCI_VENDOR_REALTEK) {
+               /* Intel or Realtek GbE at dev 15 */
+               brdtype = BRD_QNAPTS;
+               return;
+       }
 
        brdtype = BRD_UNKNOWN;
 }