Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print better names for Pentium4-class processors (Xeon, Celeron, etc).

This commit is contained in:
minoura 2004-03-26 13:57:44 +00:00
parent 2f47eb75f7
commit a3a2a1ebcf
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/arch/i386/i386/identcpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: identcpu.c,v 1.9 2004/03/21 17:59:44 kim Exp $ */
/* $NetBSD: identcpu.c,v 1.10 2004/03/26 13:57:44 minoura Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.9 2004/03/21 17:59:44 kim Exp $");
__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.10 2004/03/26 13:57:44 minoura Exp $");
#include "opt_cputype.h"
@ -1110,12 +1110,18 @@ identifycpu(struct cpu_info *ci)
ci->cpu_setup = cpufam->cpu_setup;
ci->ci_info = cpufam->cpu_info;
if (vendor == CPUVENDOR_INTEL && family == 6 &&
model >= 5) {
const char *tmp = intel_family6_name(ci);
if (vendor == CPUVENDOR_INTEL) {
if (family == 6 && model >= 5) {
const char *tmp;
tmp = intel_family6_name(ci);
if (tmp != NULL)
name = tmp;
}
if (family == CPU_MAXFAMILY &&
i386_intel_brand[ci->ci_brand_id])
name =
i386_intel_brand[ci->ci_brand_id];
}
if (vendor == CPUVENDOR_AMD && family == 6 &&
model >= 6) {