[src/trunk]: src/sys/arch/hp300/hp300 Identify the 385 and 425e. Partially f...

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

details:   https://anonhg.NetBSD.org/src/rev/859cde73f490
branches:  trunk
changeset: 475074:859cde73f490
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Jul 31 01:26:04 1999 +0000

description:
Identify the 385 and 425e.  Partially from OpenBSD.

diffstat:

 sys/arch/hp300/hp300/genassym.cf |   4 +++-
 sys/arch/hp300/hp300/locore.s    |  11 +++++++++--
 sys/arch/hp300/hp300/machdep.c   |  40 +++++++++++++++++++++++++---------------
 3 files changed, 37 insertions(+), 18 deletions(-)

diffs (125 lines):

diff -r 4400c6469c2f -r 859cde73f490 sys/arch/hp300/hp300/genassym.cf
--- a/sys/arch/hp300/hp300/genassym.cf  Sat Jul 31 00:45:28 1999 +0000
+++ b/sys/arch/hp300/hp300/genassym.cf  Sat Jul 31 01:26:04 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.15 1999/04/19 21:22:58 kleink Exp $
+#      $NetBSD: genassym.cf,v 1.16 1999/07/31 01:26:04 thorpej Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -107,6 +107,7 @@
 define HP_370                  HP_370
 define HP_375                  HP_375
 define HP_380                  HP_380
+define HP_385                  HP_385
 define HP_400                  HP_400
 define HP_425                  HP_425
 define HP_433                  HP_433
@@ -118,6 +119,7 @@
 define MMUID_425_S             MMUID_425_S
 define MMUID_433_T             MMUID_433_T
 define MMUID_433_S             MMUID_433_S
+define MMUID_425_E             MMUID_425_E
 
 define MMUID_SHIFT             MMUID_SHIFT
 define MMUID_MASK              MMUID_MASK
diff -r 4400c6469c2f -r 859cde73f490 sys/arch/hp300/hp300/locore.s
--- a/sys/arch/hp300/hp300/locore.s     Sat Jul 31 00:45:28 1999 +0000
+++ b/sys/arch/hp300/hp300/locore.s     Sat Jul 31 01:26:04 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.96 1999/05/01 19:11:34 kleink Exp $       */
+/*     $NetBSD: locore.s,v 1.97 1999/07/31 01:26:04 thorpej Exp $      */
 
 /*
  * Copyright (c) 1994, 1995 Gordon W. Ross
@@ -243,10 +243,14 @@
        jeq     Lisa425
        cmpb    #MMUID_425_S,d0         | how about 425s?
        jeq     Lisa425
+       cmpb    #MMUID_425_E,d0         | or maybe a 425e?
+       jeq     Lisa425
        cmpb    #MMUID_433_T,d0         | or a 433t?
        jeq     Lisa433
-       cmpb    #MMUID_433_S,d0         | last chance...
+       cmpb    #MMUID_433_S,d0         | or a 433s?
        jeq     Lisa433
+       cmpb    #MMUID_385,d0           | or a 385?
+       jeq     Lisa385
        movl    #HP_380,a0@             | guess we're a 380
        jra     Lstart1
 Lisa425:
@@ -255,6 +259,9 @@
 Lisa433:
        movl    #HP_433,a0@
        jra     Lstart1
+Lisa385:
+       movl    #HP_385,a0@
+       jra     Lstart1
 
        /*
         * End of 68040 section
diff -r 4400c6469c2f -r 859cde73f490 sys/arch/hp300/hp300/machdep.c
--- a/sys/arch/hp300/hp300/machdep.c    Sat Jul 31 00:45:28 1999 +0000
+++ b/sys/arch/hp300/hp300/machdep.c    Sat Jul 31 01:26:04 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.127 1999/05/26 19:16:30 thorpej Exp $    */
+/*     $NetBSD: machdep.c,v 1.128 1999/07/31 01:26:04 thorpej Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -447,24 +447,31 @@
 
 struct hp300_model {
        int id;
+       int mmuid;
        const char *name;
        const char *speed;
 };
 
-struct hp300_model hp300_models[] = {
-       { HP_320,       "320",          "16.67" },
-       { HP_330,       "318/319/330",  "16.67" },
-       { HP_340,       "340",          "16.67" },
-       { HP_345,       "345",          "50"    },
-       { HP_350,       "350",          "25"    },
-       { HP_360,       "360",          "25"    },
-       { HP_370,       "370",          "33.33" },
-       { HP_375,       "375",          "50"    },
-       { HP_380,       "380",          "25"    },
-       { HP_400,       "400",          "50"    },
-       { HP_425,       "425",          "25"    },
-       { HP_433,       "433",          "33"    },
-       { 0,            NULL,           NULL    },
+const struct hp300_model hp300_models[] = {
+       { HP_320,       -1,             "320",          "16.67" },
+       { HP_330,       -1,             "318/319/330",  "16.67" },
+       { HP_340,       -1,             "340",          "16.67" },
+       { HP_345,       -1,             "345",          "50"    },
+       { HP_350,       -1,             "350",          "25"    },
+       { HP_360,       -1,             "360",          "25"    },
+       { HP_370,       -1,             "370",          "33.33" },
+       { HP_375,       -1,             "375",          "50"    },
+       { HP_380,       -1,             "380",          "25"    },
+       { HP_385,       -1,             "385",          "33"    },
+       { HP_400,       -1,             "400",          "50"    },
+       { HP_425,       MMUID_425_T,    "425t",         "25"    },
+       { HP_425,       MMUID_425_S,    "425s",         "25"    },
+       { HP_425,       MMUID_425_E,    "425e",         "25"    },
+       { HP_425,       -1,             "425",          "25"    },
+       { HP_433,       MMUID_433_T,    "433t",         "33"    },
+       { HP_433,       MMUID_433_S,    "433s",         "33"    },
+       { HP_433,       -1,             "433",          "33"    },
+       { 0,            -1,             NULL,           NULL    },
 };
 
 void
@@ -478,6 +485,9 @@
         */
        for (t = s = NULL, i = 0; hp300_models[i].name != NULL; i++) {
                if (hp300_models[i].id == machineid) {
+                       if (hp300_models[i].mmuid != -1 &&
+                           hp300_models[i].mmuid != mmuid)
+                               continue;
                        t = hp300_models[i].name;
                        s = hp300_models[i].speed;
                }