From owner-p4-projects@FreeBSD.ORG  Sat May  3 00:35:56 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E24DE37B43D; Sat,  3 May 2003 00:35:55 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C3AA237B48C
	for <perforce@freebsd.org>; Sat,  3 May 2003 00:35:54 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 24E1E43FAF
	for <perforce@freebsd.org>; Sat,  3 May 2003 00:35:54 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h437Zr0U096457
	for <perforce@freebsd.org>; Sat, 3 May 2003 00:35:53 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h437Zrb4096454
	for perforce@freebsd.org; Sat, 3 May 2003 00:35:53 -0700 (PDT)
Date: Sat, 3 May 2003 00:35:53 -0700 (PDT)
Message-Id: <200305030735.h437Zrb4096454@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30448 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 May 2003 07:35:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=30448

Change 30448 by peter@peter_daintree on 2003/05/03 00:35:21

	Add a cheap/nasty option ("NDA") to try and avoid accidently
	cut/pasting something I shouldn't.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#7 edit
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#5 edit
.. //depot/projects/hammer/sys/conf/options.amd64#7 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/identcpu.c#7 (text+ko) ====

@@ -98,7 +98,6 @@
 	char *brand;
 
 	cpu_class = amd64_cpus[cpu].cpu_class;
-	printf("CPU: ");
 	strncpy(cpu_model, amd64_cpus[cpu].cpu_name, sizeof (cpu_model));
 
 	/* Check for extended CPUID information and a processor name. */
@@ -129,9 +128,9 @@
 		 * (also describes ``Features'' encodings.
 		 */
 		strcpy(cpu_model, "AMD ");
-		switch (cpu_id & 0xFF0) {
+		switch (cpu_id & 0xF00) {
 		case 0xf00:
-			strcat(cpu_model, "Hammer");
+			strcat(cpu_model, "AMD64 Processor");
 			break;
 		default:
 			strcat(cpu_model, "Unknown");
@@ -149,6 +148,10 @@
 	if (*brand != '\0')
 		strcpy(cpu_model, brand);
 
+#ifdef NDA
+	printf("CPU: %s AMD64 Class Processor\n", cpu_vendor);
+#else
+	printf("CPU: ");
 	printf("%s (", cpu_model);
 	switch(cpu_class) {
 	case CPUCLASS_K8:
@@ -162,6 +165,7 @@
 		printf("Unknown");	/* will panic below... */
 	}
 	printf("-class CPU)\n");
+#endif
 	if(*cpu_vendor)
 		printf("  Origin = \"%s\"",cpu_vendor);
 	if(cpu_id)

==== //depot/projects/hammer/sys/amd64/conf/GENERIC#5 (text+ko) ====

@@ -22,6 +22,7 @@
 cpu		HAMMER
 ident		GENERIC
 maxusers	0
+options		NDA			#Avoid accidental cut/paste of NDA'ed stuff
 
 makeoptions	NO_MODULES=not_yet
 

==== //depot/projects/hammer/sys/conf/options.amd64#7 (text+ko) ====

@@ -54,6 +54,7 @@
 # EOF
 # -------------------------------
 HAMMER			opt_cpu.h
+NDA			opt_cpu.h
 PPC_PROBE_CHIPSET	opt_ppc.h
 PPC_DEBUG		opt_ppc.h
 PSM_HOOKRESUME		opt_psm.h