diff options
| author | kato <kato@FreeBSD.org> | 2000-01-29 07:49:02 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 2000-01-29 07:49:02 +0000 |
| commit | e191625e3fee3ef8d221420f34c000007cdd9c9d (patch) | |
| tree | c58b23ad51adae9cffb7ee6d519ddc851f7d1100 /sys | |
| parent | b86abe9ca2064983ff2478c2af83c97ac7cce95e (diff) | |
| download | FreeBSD-src-e191625e3fee3ef8d221420f34c000007cdd9c9d.zip FreeBSD-src-e191625e3fee3ef8d221420f34c000007cdd9c9d.tar.gz | |
Simplify messages of Pentium II, Pentium II Xeon, Celeron, Pentium III
and Pentium III Xeon CPUs. If a CPU is one of Pentium II, Pentium II
Xeon and Celeron, the message is always "Pentium II/Pentium II
Xeon/Celeron". If a CPU is one of Pentium III and Pentium III Xeon,
the message is always "Pentium III/Pentium III Xeon".
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/identcpu.c | 15 | ||||
| -rw-r--r-- | sys/i386/i386/identcpu.c | 15 |
2 files changed, 8 insertions, 22 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index 5945729..8928fc9 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -199,23 +199,16 @@ printcpuinfo(void) strcat(cpu_model, "Pentium Pro"); break; case 0x30: - strcat(cpu_model, "Pentium II"); - cpu = CPU_PII; - break; case 0x50: - strcat(cpu_model, "Pentium II/Xeon/Celeron"); - cpu = CPU_PII; - break; case 0x60: - strcat(cpu_model, "Pentium II/Celeron"); + strcat(cpu_model, + "Pentium II/Pentium II Xeon/Celeron"); cpu = CPU_PII; break; case 0x70: - strcat(cpu_model, "Pentium III/Xeon"); - cpu = CPU_PIII; - break; case 0x80: - strcat(cpu_model, "Pentium III"); + strcat(cpu_model, + "Pentium III/Pentium III Xeon"); cpu = CPU_PIII; break; default: diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index 5945729..8928fc9 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -199,23 +199,16 @@ printcpuinfo(void) strcat(cpu_model, "Pentium Pro"); break; case 0x30: - strcat(cpu_model, "Pentium II"); - cpu = CPU_PII; - break; case 0x50: - strcat(cpu_model, "Pentium II/Xeon/Celeron"); - cpu = CPU_PII; - break; case 0x60: - strcat(cpu_model, "Pentium II/Celeron"); + strcat(cpu_model, + "Pentium II/Pentium II Xeon/Celeron"); cpu = CPU_PII; break; case 0x70: - strcat(cpu_model, "Pentium III/Xeon"); - cpu = CPU_PIII; - break; case 0x80: - strcat(cpu_model, "Pentium III"); + strcat(cpu_model, + "Pentium III/Pentium III Xeon"); cpu = CPU_PIII; break; default: |
