[src/netbsd-1-5]: src/sys/arch/sparc/dev Pull up revision 1.81 (requested by ...

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

details:   https://anonhg.NetBSD.org/src/rev/1d484c0721e5
branches:  netbsd-1-5
changeset: 489919:1d484c0721e5
user:      he <he%NetBSD.org@localhost>
date:      Thu Oct 19 13:34:55 2000 +0000

description:
Pull up revision 1.81 (requested by pk):
  Account for the top-most 4 bits of obio addresses being zero on
  sun 4/100 machines when inferring zs PROM device numbers from the
  physical address.

diffstat:

 sys/arch/sparc/dev/zs.c |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r aa311d469c00 -r 1d484c0721e5 sys/arch/sparc/dev/zs.c
--- a/sys/arch/sparc/dev/zs.c   Thu Oct 19 13:21:57 2000 +0000
+++ b/sys/arch/sparc/dev/zs.c   Thu Oct 19 13:34:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zs.c,v 1.79.2.1 2000/07/19 02:53:14 mrg Exp $  */
+/*     $NetBSD: zs.c,v 1.79.2.2 2000/10/19 13:34:55 he Exp $   */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -337,6 +337,13 @@
                zsc->zsc_bustag = oba->oba_bustag;
                zsc->zsc_dmatag = oba->oba_dmatag;
                /* Find prom unit by physical address */
+               if (cpuinfo.cpu_type == CPUTYP_4_100)
+                       /*
+                        * On the sun4/100, the top-most 4 bits are zero
+                        * on obio addresses; force them to 1's for the
+                        * sake of the comparison here.
+                        */
+                       paddr |= 0xf0000000;
                zsc->zsc_promunit =
                        (paddr == 0xf1000000) ? 0 :
                        (paddr == 0xf0000000) ? 1 :