CVS commit: [netbsd-6] src/usr.sbin/cpuctl/arch

[Jeff Rizzo]

Module Name:    src
Committed By:   riz
Date:           Thu Apr 19 20:04:37 UTC 2012

Modified Files:
        src/usr.sbin/cpuctl/arch [netbsd-6]: i386.c

Log Message:
Pull up following revision(s) (requested by cegger in ticket #187):
        usr.sbin/cpuctl/arch/i386.c: revision 1.31
print cpu family for AMD CPU families 0x12 - 0x15


To generate a diff of this commit:
cvs rdiff -u -r1.27.2.3 -r1.27.2.4 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.27.2.3 src/usr.sbin/cpuctl/arch/i386.c:1.27.2.4
--- src/usr.sbin/cpuctl/arch/i386.c:1.27.2.3	Fri Apr  6 17:46:41 2012
+++ src/usr.sbin/cpuctl/arch/i386.c	Thu Apr 19 20:04:37 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386.c,v 1.27.2.3 2012/04/06 17:46:41 riz Exp $	*/
+/*	$NetBSD: i386.c,v 1.27.2.4 2012/04/19 20:04:37 riz 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.27.2.3 2012/04/06 17:46:41 riz Exp $");
+__RCSID("$NetBSD: i386.c,v 1.27.2.4 2012/04/19 20:04:37 riz 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;
 	}