From owner-freebsd-bugs  Thu Feb 11 03:30:04 1999
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id DAA00824
          for freebsd-bugs-outgoing; Thu, 11 Feb 1999 03:30:04 -0800 (PST)
          (envelope-from owner-freebsd-bugs@FreeBSD.ORG)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id DAA00802
          for <freebsd-bugs@FreeBSD.org>; Thu, 11 Feb 1999 03:30:01 -0800 (PST)
          (envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.2/8.9.2) id DAA18263;
	Thu, 11 Feb 1999 03:30:01 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from mana.s.notwork.org (tok075.airnet.ne.jp [210.159.88.75])
          by hub.freebsd.org (8.8.8/8.8.8) with SMTP id DAA00204
          for <freebsd-gnats-submit@freebsd.org>; Thu, 11 Feb 1999 03:24:07 -0800 (PST)
          (envelope-from mrt)
Received: (qmail 661 invoked from network); 11 Feb 1999 11:24:02 -0000
Received: from kotonoha.s.notwork.org (192.168.1.1)
  by mana.s.notwork.org with SMTP; 11 Feb 1999 11:24:02 -0000
Received: (from mrt@localhost)
	by kotonoha.s.notwork.org (8.9.2/3.7W) id UAA00936;
	Thu, 11 Feb 1999 20:24:29 +0900 (JST)
Message-Id: <199902111124.UAA00936@kotonoha.s.notwork.org>
Date: Thu, 11 Feb 1999 20:24:29 +0900 (JST)
From: mrt@notwork.org
Reply-To: mrt@notwork.org
To: FreeBSD-gnats-submit@FreeBSD.ORG
X-Send-Pr-Version: 3.2
Subject: kern/10022: kernel cannot detect WinChips correctly.
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         10022
>Category:       kern
>Synopsis:       kernel cannot detect WinChips correctly.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 11 03:30:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Murata Shuuichirou
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:
FreeBSD kotonoha.s.notwork.org 4.0-CURRENT FreeBSD 4.0-CURRENT #6: Thu Feb 11 18:24:37 JST 1999     mrt@kotonoha.s.notwork.org:/usr/src/mrt/src/sys/compile/KOTONOHA  i386
>Description:

-current kernel cannot detect IDT's WinChips correctly.

>How-To-Repeat:

Replace your Pentium with a WinChip and boot FreeBSD.

>Fix:
	
According to data sheet, WinChips (C6 and 2) are almost
compatible with Pentium and have no special features on our
use.  So all we have to do is to print the name and features
correctly.  Following patch is tested on WinChip C6.

Index: identcpu.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/i386/identcpu.c,v
retrieving revision 1.58
diff -u -r1.58 identcpu.c
--- identcpu.c	1999/02/04 16:48:25	1.58
+++ identcpu.c	1999/02/05 17:30:53
@@ -457,6 +457,17 @@
 		}
 	} else if (strcmp(cpu_vendor,"IBM") == 0)
 		strcpy(cpu_model, "Blue Lightning CPU");
+	else if (strcmp(cpu_vendor,"CentaurHauls") == 0) {
+		strcpy(cpu_model, "IDT ");
+		switch (cpu_id & 0xff0) {
+		case 0x540:
+			strcat(cpu_model, "WinChip C6");
+			break;
+		case 0x580:
+			strcat(cpu_model, "WinChip 2");
+			break;
+		}
+	}
 #endif
 
 	printf("%s (", cpu_model);
@@ -508,7 +519,8 @@
 	if (strcmp(cpu_vendor, "GenuineIntel") == 0 ||
 	    strcmp(cpu_vendor, "AuthenticAMD") == 0 ||
 		((strcmp(cpu_vendor, "CyrixInstead") == 0) &&
-		 ((cpu_id & 0xf00) > 5))) {
+		 ((cpu_id & 0xf00) > 5)) ||
+	    strcmp(cpu_vendor, "CentaurHauls") == 0) {
 		printf("  Stepping=%u", cpu_id & 0xf);
 		if (strcmp(cpu_vendor, "CyrixInstead") == 0)
 			printf("  DIR=0x%04x", cyrix_did);
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message