[src/trunk]: src/sys/arch/sandpoint/stand/altboot Detect StorCenter before QN...

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

details:   https://anonhg.NetBSD.org/src/rev/4c55a3cbe2c2
branches:  trunk
changeset: 764484:4c55a3cbe2c2
user:      phx <phx%NetBSD.org@localhost>
date:      Mon Apr 25 18:28:47 2011 +0000

description:
Detect StorCenter before QNAP, otherwise the Realtek NIC will mis-detect as
StorCenter boards as QNAP.

diffstat:

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

diffs (29 lines):

diff -r e826b239ca5d -r 4c55a3cbe2c2 sys/arch/sandpoint/stand/altboot/brdsetup.c
--- a/sys/arch/sandpoint/stand/altboot/brdsetup.c       Mon Apr 25 17:01:54 2011 +0000
+++ b/sys/arch/sandpoint/stand/altboot/brdsetup.c       Mon Apr 25 18:28:47 2011 +0000
@@ -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;