d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Recognize Pentium II Xeon, Celeron and Pentium III cpus. Because CPU

Browse Source 
names are printed on their packages and shown by BIOS, kernel does not
need to show details.

PR:		8751, 9320 and 9463
This commit is contained in:
kato 1999-02-04 16:48:26 +00:00
parent 1237615cf3
commit ddf4be4f9e
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/amd64/amd64/identcpu.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
* $Id: identcpu.c,v 1.56 1999/01/09 13:07:18 bde Exp $
* $Id: identcpu.c,v 1.57 1999/01/16 13:41:33 kato Exp $
*/
#include "opt_cpu.h"
@ -99,6 +99,7 @@ static struct cpu_nameclass i386_cpus[] = {
{ "NexGen 586", CPUCLASS_386 }, /* CPU_NX586 (XXX) */
{ "Cyrix 486S/DX", CPUCLASS_486 }, /* CPU_CY486DX */
{ "Pentium II", CPUCLASS_686 }, /* CPU_PII */
{ "Pentium III", CPUCLASS_686 }, /* CPU_PIII */
};
static void
@ -199,9 +200,17 @@ printcpuinfo(void)
cpu = CPU_PII;
break;
case 0x50:
strcat(cpu_model, "Pentium II (quarter-micron)");
strcat(cpu_model, "Pentium II/Xeon/Celeron");
cpu = CPU_PII;
break;
case 0x60:
strcat(cpu_model, "Celeron");
cpu = CPU_PII;
break;
case 0x70:
strcat(cpu_model, "Pentium III");
cpu = CPU_PIII;
break;
default:
strcat(cpu_model, "Unknown 80686");
break;

3
sys/amd64/include/cputypes.h
View File

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cputypes.h,v 1.10 1997/10/28 11:43:50 bde Exp $
* $Id: cputypes.h,v 1.11 1998/05/22 00:03:23 des Exp $
*/
#ifndef _MACHINE_CPUTYPES_H_
@ -57,6 +57,7 @@
#define CPU_NX586 12 /* NexGen (now AMD) 586 */
#define CPU_CY486DX 13 /* Cyrix 486S/DX/DX2/DX4 */
#define CPU_PII 14 /* Intel Pentium II */
#define CPU_PIII 15 /* Intel Pentium III */
#ifndef LOCORE
struct cpu_nameclass {

13
sys/i386/i386/identcpu.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* from: Id: machdep.c,v 1.193 1996/06/18 01:22:04 bde Exp
* $Id: identcpu.c,v 1.56 1999/01/09 13:07:18 bde Exp $
* $Id: identcpu.c,v 1.57 1999/01/16 13:41:33 kato Exp $
*/
#include "opt_cpu.h"
@ -99,6 +99,7 @@ static struct cpu_nameclass i386_cpus[] = {
{ "NexGen 586", CPUCLASS_386 }, /* CPU_NX586 (XXX) */
{ "Cyrix 486S/DX", CPUCLASS_486 }, /* CPU_CY486DX */
{ "Pentium II", CPUCLASS_686 }, /* CPU_PII */
{ "Pentium III", CPUCLASS_686 }, /* CPU_PIII */
};
static void
@ -199,9 +200,17 @@ printcpuinfo(void)
cpu = CPU_PII;
break;
case 0x50:
strcat(cpu_model, "Pentium II (quarter-micron)");
strcat(cpu_model, "Pentium II/Xeon/Celeron");
cpu = CPU_PII;
break;
case 0x60:
strcat(cpu_model, "Celeron");
cpu = CPU_PII;
break;
case 0x70:
strcat(cpu_model, "Pentium III");
cpu = CPU_PIII;
break;
default:
strcat(cpu_model, "Unknown 80686");
break;

3
sys/i386/include/cputypes.h
View File

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: cputypes.h,v 1.10 1997/10/28 11:43:50 bde Exp $
* $Id: cputypes.h,v 1.11 1998/05/22 00:03:23 des Exp $
*/
#ifndef _MACHINE_CPUTYPES_H_
@ -57,6 +57,7 @@
#define CPU_NX586 12 /* NexGen (now AMD) 586 */
#define CPU_CY486DX 13 /* Cyrix 486S/DX/DX2/DX4 */
#define CPU_PII 14 /* Intel Pentium II */
#define CPU_PIII 15 /* Intel Pentium III */
#ifndef LOCORE
struct cpu_nameclass {