[src/trunk]: src/sys/arch/macppc/pci Return ~0 for all config space reads on ...

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

details:   https://anonhg.NetBSD.org/src/rev/429a7ff83707
branches:  trunk
changeset: 514954:429a7ff83707
user:      nathanw <nathanw%NetBSD.org@localhost>
date:      Fri Sep 14 21:04:58 2001 +0000

description:
Return ~0 for all config space reads on devices < 11 on the primary bus,
rather than returning ~0 for PCI_ID_REG and panicing otherwise.

diffstat:

 sys/arch/macppc/pci/bandit.c   |  10 +++-------
 sys/arch/macppc/pci/uninorth.c |  10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diffs (48 lines):

diff -r 068b5af40474 -r 429a7ff83707 sys/arch/macppc/pci/bandit.c
--- a/sys/arch/macppc/pci/bandit.c      Fri Sep 14 19:18:13 2001 +0000
+++ b/sys/arch/macppc/pci/bandit.c      Fri Sep 14 21:04:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bandit.c,v 1.16 2001/07/22 11:29:48 wiz Exp $  */
+/*     $NetBSD: bandit.c,v 1.17 2001/09/14 21:04:58 nathanw Exp $      */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -163,12 +163,8 @@
                panic("pci_conf_read: func > 7");
 
        if (bus == pc->bus) {
-               if (dev < 11) {
-                       if (reg == PCI_ID_REG)
-                               return 0xffffffff;
-                       else
-                               panic("pci_conf_read: dev < 11");
-               }
+               if (dev < 11)
+                       return 0xffffffff;
                x = (1 << dev) | (func << 8) | reg;
        } else
                x = tag | reg | 1;
diff -r 068b5af40474 -r 429a7ff83707 sys/arch/macppc/pci/uninorth.c
--- a/sys/arch/macppc/pci/uninorth.c    Fri Sep 14 19:18:13 2001 +0000
+++ b/sys/arch/macppc/pci/uninorth.c    Fri Sep 14 21:04:58 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uninorth.c,v 1.2 2001/07/22 11:29:48 wiz Exp $ */
+/*     $NetBSD: uninorth.c,v 1.3 2001/09/14 21:04:58 nathanw Exp $     */
 
 /*-
  * Copyright (c) 2000 Tsubai Masanari.  All rights reserved.
@@ -180,12 +180,8 @@
                panic("pci_conf_read: func > 7");
 
        if (bus == pc->bus) {
-               if (dev < 11) {
-                       if (reg == PCI_ID_REG)
-                               return 0xffffffff;
-                       else
-                               panic("pci_conf_read: dev < 11");
-               }
+               if (dev < 11)
+                       return 0xffffffff;
                x = (1 << dev) | (func << 8) | reg;
        } else
                x = tag | reg | 1;