diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-17 12:02:35 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-17 12:02:35 +0000 |
| commit | 2351e3f107404e2544da795115f5060432719c38 (patch) | |
| tree | 69d50cfc04285caa8fe1872964170febdfab6a4d /sys/arch/hp300 | |
| parent | 37e8da55a033ecd05989f28018427199358c188e (diff) | |
Latest code from Mike + slight fixes.
Diffstat (limited to 'sys/arch/hp300')
| -rw-r--r-- | sys/arch/hp300/hp300/locore.s | 22 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/machdep.c | 18 |
2 files changed, 20 insertions, 20 deletions
diff --git a/sys/arch/hp300/hp300/locore.s b/sys/arch/hp300/hp300/locore.s index 78e581bdeb1..6c0e4875bb7 100644 --- a/sys/arch/hp300/hp300/locore.s +++ b/sys/arch/hp300/hp300/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.16 1997/04/17 11:40:37 downsj Exp $ */ +/* $OpenBSD: locore.s,v 1.17 1997/04/17 12:02:32 downsj Exp $ */ /* $NetBSD: locore.s,v 1.67 1997/03/16 10:49:43 thorpej Exp $ */ /* @@ -222,21 +222,21 @@ Lnot68030: lsrl #8,d0 | get apparent ID movl d0,a0@ | save MMU ID RELOC(_machineid, a0) - cmpb #7,d0 | id == 7? - jeq Lis425 | yes, we have a 425s + cmpb #4,d0 | id == 4? + jeq Lis33mhz | yes, a 33MHz Strider (433t) cmpb #6,d0 | id == 6? - jeq Lis433 | yes, we have a 433s + jeq Lis33mhz | yes, a 33MHz Trailways (433s) cmpb #5,d0 | id == 5? - jeq Lis425 | yes, we have a 425t - cmpb #4,d0 | id == 4? - jeq Lis425 | Heh, 425t overclocked + jeq Lis25mhz | yes, a 25MHz Strider (425t) + cmpb #7,d0 | id == 7? + jeq Lis25mhz | yes, a 25MHz Trailways (425s) movl #HP_380,a0@ | no, we have a 380 jra Lstart1 -Lis425: - movl #HP_425,a0@ | 425t +Lis25mhz: + movl #HP_425,a0@ | 425 of some sort jra Lstart1 -Lis433: - movl #HP_433,a0@ | 433s +Lis33mhz: + movl #HP_433,a0@ | 433 of some sort 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 e37b93cc7b7..8003af8c0d5 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.24 1997/04/17 11:40:40 downsj Exp $ */ +/* $OpenBSD: machdep.c,v 1.25 1997/04/17 12:02:34 downsj Exp $ */ /* $NetBSD: machdep.c,v 1.89 1997/04/09 20:05:20 thorpej Exp $ */ /* @@ -511,17 +511,17 @@ identifycpu() t = "380 (25MHz"; break; case HP_425: - if ((mmuid & 0xff) == 5 || (mmuid & 0xff) == 7) { - t = "425 (25MHz"; - } else { /* == 4 */ - t = "425 (33MHz"; + if ((mmuid & 0xff) == 5) { + t = "425t (25MHz"; + } else { /* == 7 */ + t = "425s (25MHz"; } break; case HP_433: - if ((mmuid & 0xff) == 6) { - t = "433 (33MHz"; - } else { /* == 7 ??? what is this? */ - t = "433 (25MHz"; + if ((mmuid & 0xff) == 4) { + t = "433t (33MHz"; + } else { /* == 6 */ + t = "433s (33MHz"; } break; default: |