diff options
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/hp300/locore.s | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/machdep.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s index 898cc7aba90..78e581bdeb1 100644 --- a/sys/arch/hp300/hp300/locore.s +++ b/sys/arch/hp300/hp300/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.15 1997/04/17 10:28:38 downsj Exp $ */ +/* $OpenBSD: locore.s,v 1.16 1997/04/17 11:40:37 downsj Exp $ */ /* $NetBSD: locore.s,v 1.67 1997/03/16 10:49:43 thorpej Exp $ */ /* @@ -223,7 +223,7 @@ Lnot68030: movl d0,a0@ | save MMU ID RELOC(_machineid, a0) cmpb #7,d0 | id == 7? - jeq Lis433 | XXX 433 underclocked? + jeq Lis425 | yes, we have a 425s cmpb #6,d0 | id == 6? jeq Lis433 | yes, we have a 433s cmpb #5,d0 | id == 5? @@ -236,7 +236,7 @@ Lis425: movl #HP_425,a0@ | 425t jra Lstart1 Lis433: - movl #HP_433,a0@ | 433s (XXX 425s returns same ID, ugh!) + movl #HP_433,a0@ | 433s jra Lstart1 Lis68020: movl #1,a1@(MMUCMD) | a 68020, write HP MMU location diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c index 8f52ae476c3..e37b93cc7b7 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.23 1997/04/17 10:28:39 downsj Exp $ */ +/* $OpenBSD: machdep.c,v 1.24 1997/04/17 11:40:40 downsj Exp $ */ /* $NetBSD: machdep.c,v 1.89 1997/04/09 20:05:20 thorpej Exp $ */ /* @@ -511,14 +511,14 @@ identifycpu() t = "380 (25MHz"; break; case HP_425: - if (mmuid == 5) { + if ((mmuid & 0xff) == 5 || (mmuid & 0xff) == 7) { t = "425 (25MHz"; } else { /* == 4 */ t = "425 (33MHz"; } break; case HP_433: - if (mmuid == 6) { + if ((mmuid & 0xff) == 6) { t = "433 (33MHz"; } else { /* == 7 ??? what is this? */ t = "433 (25MHz"; |