From owner-freebsd-bugs Wed Jun 23 9:17:18 1999 Delivered-To: freebsd-bugs@freebsd.org Received: from roma.s.notwork.org (tok093.airnet.ne.jp [210.159.88.93]) by hub.freebsd.org (Postfix) with SMTP id 095F3153F8 for ; Wed, 23 Jun 1999 09:17:06 -0700 (PDT) (envelope-from mrt@notwork.org) Received: (qmail 15656 invoked from network); 23 Jun 1999 16:17:05 -0000 Received: from fons-adae.s.notwork.org (192.168.1.1) by roma.s.notwork.org with SMTP; 23 Jun 1999 16:17:05 -0000 To: Cc: freebsd-bugs@FreeBSD.org Subject: Re: kern/10022: kernel cannot detect WinChips correctly. X-cite: xcite 1.20 References: <199906221050.DAA29480@freefall.freebsd.org> MIME-Version: 1.0 (generated by REMI 1.13.0 - "Saigata") Content-Type: text/plain; charset=US-ASCII From: Murata Shuuichirou Date: 24 Jun 1999 01:16:42 +0900 In-Reply-To: <199906221050.DAA29480@freefall.freebsd.org> (sheldonh@FreeBSD.org's message of "Tue, 22 Jun 1999 03:50:27 -0700 (PDT)") Message-ID: <87ogi6opsl.fsf@fons-adae.s.notwork.org> Lines: 52 User-Agent: ET-gnus/6.11.03 (revision 03) (based on Pterodactyl Gnus v0.88) REMI/1.13.0 (Saigata) FLIM/1.13.0 (Iwami) MULE XEmacs/21.2 (beta17) (Chiyoda) (i386-unknown-freebsd4.0) Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org In message <199906221050.DAA29480@freefall.freebsd.org>, `' wrote: > Could you provide feedback as to whether your patch still works when > modified as per Kevin Day's suggestion. Alternatively, let us know > why you changed the bit-value test for cpu_id . Kevin Day's suggestion is not related to my change, but it's correct and already in identcpu.c. So, my previous patch is now cannot be applied cleanly. I'll attach the diff from current identcpu.c (rev. 1.63). -- Murata, Shuuichirou Index: identcpu.c =================================================================== RCS file: /home/ncvs/src/sys/i386/i386/identcpu.c,v retrieving revision 1.63 diff -u -r1.63 identcpu.c --- identcpu.c 1999/05/29 06:57:38 1.63 +++ identcpu.c 1999/06/23 16:07:02 @@ -460,6 +460,20 @@ } } 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; + default: + strcat(cpu_model, "Unknown"); + break; + } + } #endif printf("%s (", cpu_model); @@ -511,7 +525,8 @@ if (strcmp(cpu_vendor, "GenuineIntel") == 0 || strcmp(cpu_vendor, "AuthenticAMD") == 0 || ((strcmp(cpu_vendor, "CyrixInstead") == 0) && - ((cpu_id & 0xf00) > 0x500))) { + ((cpu_id & 0xf00) > 0x500)) || + strcmp(cpu_vendor, "CentaurHauls") == 0) { printf(" Stepping=%u", cpu_id & 0xf); if (strcmp(cpu_vendor, "CyrixInstead") == 0) printf(" DIR=0x%04x", cyrix_did); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message