[src/trunk]: src/sys/arch/hp300/stand/common Add 385 and 425e SPU detection. ...

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

details:   https://anonhg.NetBSD.org/src/rev/4400c6469c2f
branches:  trunk
changeset: 475073:4400c6469c2f
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jul 31 00:45:28 1999 +0000

description:
Add 385 and 425e SPU detection.  From OpenBSD.

diffstat:

 sys/arch/hp300/stand/common/autoconf.c |   3 ++-
 sys/arch/hp300/stand/common/machdep.c  |  26 +++++++++++++++++++++++---
 sys/arch/hp300/stand/common/srt0.S     |  11 +++++++++--
 3 files changed, 34 insertions(+), 6 deletions(-)

diffs (96 lines):

diff -r d98e51e4fa5a -r 4400c6469c2f sys/arch/hp300/stand/common/autoconf.c
--- a/sys/arch/hp300/stand/common/autoconf.c    Sat Jul 31 00:28:20 1999 +0000
+++ b/sys/arch/hp300/stand/common/autoconf.c    Sat Jul 31 00:45:28 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.1 1997/02/04 03:52:14 thorpej Exp $     */
+/*     $NetBSD: autoconf.c,v 1.2 1999/07/31 00:45:28 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -106,6 +106,7 @@
        case HP_380:
                cpuspeed = MHZ_25 * 2;  /* XXX */
                break;
+       case HP_385:
        case HP_433:
                cpuspeed = MHZ_33 * 2;  /* XXX */
                break;
diff -r d98e51e4fa5a -r 4400c6469c2f sys/arch/hp300/stand/common/machdep.c
--- a/sys/arch/hp300/stand/common/machdep.c     Sat Jul 31 00:28:20 1999 +0000
+++ b/sys/arch/hp300/stand/common/machdep.c     Sat Jul 31 00:45:28 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.4 1997/06/28 07:20:25 thorpej Exp $      */
+/*     $NetBSD: machdep.c,v 1.5 1999/07/31 00:45:28 thorpej Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -70,12 +70,32 @@
                cp = "375"; break;
        case HP_380:
                cp = "380"; break;
+       case HP_385:
+               cp = "385"; break;
        case HP_400:
                cp = "400"; break;
        case HP_425:
-               cp = "425"; break;
+               switch (mmuid) {
+               case MMUID_425_T:
+                       cp = "425t"; break;
+               case MMUID_425_S:
+                       cp = "425s"; break;
+               case MMUID_425_E:
+                       cp = "425e"; break;
+               default:
+                       cp = "425"; break;
+               }
+               break;
        case HP_433:
-               cp = "433"; break;
+               switch (mmuid) {
+               case MMUID_433_T:
+                       cp = "433t"; break;
+               case MMUID_433_S:
+                       cp = "433s"; break;
+               default:
+                       cp = "433"; break;
+               }
+               break;
        default:
                cp = "???"; break;
        }
diff -r d98e51e4fa5a -r 4400c6469c2f sys/arch/hp300/stand/common/srt0.S
--- a/sys/arch/hp300/stand/common/srt0.S        Sat Jul 31 00:28:20 1999 +0000
+++ b/sys/arch/hp300/stand/common/srt0.S        Sat Jul 31 00:45:28 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: srt0.S,v 1.5 1999/02/08 10:45:11 he Exp $      */
+/*     $NetBSD: srt0.S,v 1.6 1999/07/31 00:45:28 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -171,10 +171,14 @@
        jeq     isa425
        cmpb    #MMUID_425_S,d0         | how about 425s?
        jeq     isa425
+       cmpb    #MMUID_425_E,d0         | or maybe a 425e?
+       jeq     isa425
        cmpb    #MMUID_433_T,d0         | or a 433t?
        jeq     isa433
-       cmpb    #MMUID_433_S,d0         | last chance...
+       cmpb    #MMUID_433_S,d0         | or a 433s?
        jeq     isa433
+       cmpb    #MMUID_385,d0           | or a 385?
+       jeq     isa385
        movl    #HP_380,a0@             | guess we are a 380
        jra     ihpibcheck
 isa425:
@@ -183,6 +187,9 @@
 isa433:
        movl    #HP_433,a0@
        jra     ihpibcheck
+isa385:
+       movl    #HP_385,a0@
+       jra     ihpibcheck
 
        /*
         * End 68040 section