diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-06-17 18:18:22 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-06-17 18:18:22 +0000 |
| commit | f45fefc55d6a66fbe2ebcb3c5c86b65d76ff4bb5 (patch) | |
| tree | cf6fc1b43e94fc4eb01c21c5b5dab77bc590262e | |
| parent | ae85d06989c3c75f2c405176f399418aaff553b4 (diff) | |
R14000 processors with revision 3 and above are actually R16000 revision
1 and above, so report them as such.
| -rw-r--r-- | sys/arch/mips64/mips64/cpu.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c index c26f3142b86..0d959151934 100644 --- a/sys/arch/mips64/mips64/cpu.c +++ b/sys/arch/mips64/mips64/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.11 2007/10/18 04:32:25 miod Exp $ */ +/* $OpenBSD: cpu.c,v 1.12 2009/06/17 18:18:21 miod Exp $ */ /* * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se) @@ -84,6 +84,7 @@ void cpuattach(struct device *parent, struct device *dev, void *aux) { int cpuno = dev->dv_unit; + int isr16k = 0; printf(": "); @@ -104,7 +105,11 @@ cpuattach(struct device *parent, struct device *dev, void *aux) printf("MIPS R12000 CPU"); break; case MIPS_R14000: - printf("MIPS R14000 CPU"); + if (sys_config.cpu[cpuno].vers_maj > 2) { + sys_config.cpu[cpuno].vers_maj -= 2; + isr16k = 1; + } + printf("R1%d000 CPU", isr16k ? 6 : 4); break; case MIPS_R4200: printf("NEC VR4200 CPU (ICE)"); @@ -156,7 +161,7 @@ cpuattach(struct device *parent, struct device *dev, void *aux) printf("R12000 FPU"); break; case MIPS_R14000: - printf("R14000 FPU"); + printf("R1%d000 FPU", isr16k ? 6 : 4); break; case MIPS_R4200: printf("VR4200 FPC (ICE)"); |