use aprint_*_dev

OK joerg
This commit is contained in:
cegger 2008-04-04 20:31:50 +00:00
parent e34ebae1b0
commit 8dd00d48ab
1 changed files with 8 additions and 13 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: identcpu.c,v 1.34 2008/01/01 20:32:11 yamt Exp $ */
/* $NetBSD: identcpu.c,v 1.35 2008/04/04 20:31:50 cegger Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.34 2008/01/01 20:32:11 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.35 2008/04/04 20:31:50 cegger Exp $");
#include "opt_enhanced_speedstep.h"
#include "opt_intel_coretemp.h"
@ -97,7 +97,7 @@ identifycpu(struct cpu_info *ci)
cpu_get_tsc_freq(ci);
amd_cpu_cacheinfo(ci);
aprint_normal("%s: %s", ci->ci_dev->dv_xname, cpu_model);
aprint_normal_dev(ci->ci_dev, "%s", cpu_model);
if (ci->ci_tsc_freq != 0)
aprint_normal(", %lu.%02lu MHz",
@ -118,35 +118,30 @@ identifycpu(struct cpu_info *ci)
if ((ci->ci_feature_flags & CPUID_MASK1) != 0) {
bitmask_snprintf(ci->ci_feature_flags,
feature_str[0], buf, sizeof(buf));
aprint_verbose("%s: features: %s\n",
ci->ci_dev->dv_xname, buf);
aprint_verbose_dev(ci->ci_dev, "features: %s\n", buf);
}
if ((ci->ci_feature_flags & CPUID_MASK2) != 0) {
bitmask_snprintf(ci->ci_feature_flags,
feature_str[1], buf, sizeof(buf));
aprint_verbose("%s: features: %s\n",
ci->ci_dev->dv_xname, buf);
aprint_verbose_dev(ci->ci_dev, "features: %s\n", buf);
}
if ((ci->ci_feature_flags & CPUID_MASK3) != 0) {
bitmask_snprintf(ci->ci_feature_flags,
feature_str[2], buf, sizeof(buf));
aprint_verbose("%s: features: %s\n",
ci->ci_dev->dv_xname, buf);
aprint_verbose_dev(ci->ci_dev, "features: %s\n", buf);
}
if (ci->ci_feature2_flags) {
bitmask_snprintf(ci->ci_feature2_flags,
CPUID2_FLAGS, buf, sizeof(buf));
aprint_verbose("%s: features2: %s\n",
ci->ci_dev->dv_xname, buf);
aprint_verbose_dev(ci->ci_dev, "features2: %s\n", buf);
}
if (cpu_vendor == CPUVENDOR_INTEL &&
(ci->ci_feature_flags & CPUID_MASK4) != 0) {
bitmask_snprintf(ci->ci_feature_flags,
CPUID_FLAGS4, buf, sizeof(buf));
aprint_verbose("%s: features3: %s\n",
ci->ci_dev->dv_xname, buf);
aprint_verbose_dev(ci->ci_dev, "features3: %s\n", buf);
}
x86_print_cacheinfo(ci);