Module Name: src Committed By: cegger Date: Tue Apr 17 13:00:10 UTC 2012
Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: print cpu family for AMD CPU families 0x12 - 0x15 To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/cpuctl/arch/i386.c diff -u src/usr.sbin/cpuctl/arch/i386.c:1.30 src/usr.sbin/cpuctl/arch/i386.c:1.31 --- src/usr.sbin/cpuctl/arch/i386.c:1.30 Thu Apr 5 11:05:53 2012 +++ src/usr.sbin/cpuctl/arch/i386.c Tue Apr 17 13:00:09 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: i386.c,v 1.30 2012/04/05 11:05:53 cegger Exp $ */ +/* $NetBSD: i386.c,v 1.31 2012/04/17 13:00:09 cegger Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: i386.c,v 1.30 2012/04/05 11:05:53 cegger Exp $"); +__RCSID("$NetBSD: i386.c,v 1.31 2012/04/17 13:00:09 cegger Exp $"); #endif /* not lint */ #include <sys/types.h> @@ -959,24 +959,22 @@ amd_amd64_name(struct cpu_info *ci) } break; case 0x01: - switch (model) { - case 0x02: - ret = "Family 10h"; - break; - default: - ret = "Unknown AMD64 CPU"; - break; - } + ret = "Family 10h"; break; case 0x02: - switch (model) { - case 0x03: - ret = "Family 11h"; - break; - default: - ret = "Unknown AMD64 CPU"; - break; - } + ret = "Family 11h"; + break; + case 0x03: + ret = "Family 12h"; + break; + case 0x05: + ret = "Family 14h"; + break; + case 0x06: + ret = "Family 15h"; + break; + default: + ret = "Unknown AMD64 CPU"; break; }