PERFORCE change 133434 for review
Warner Losh
imp at FreeBSD.org
Wed Jan 16 14:32:30 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=133434
Change 133434 by imp at imp_lighthouse on 2008/01/16 22:31:49
Pull in some more PRIDs from NetBSD.
Affected files ...
.. //depot/projects/mips2/src/sys/mips/include/locore.h#2 edit
.. //depot/projects/mips2/src/sys/mips/mips/cpu.c#21 edit
Differences ...
==== //depot/projects/mips2/src/sys/mips/include/locore.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.62 2002/06/01 13:45:45 simonb Exp $ */
+/* $NetBSD: locore.h,v 1.78 2007/10/17 19:55:36 garbled Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -34,24 +34,31 @@
/*
* CPU identification, from PRID register.
*/
+typedef int mips_prid_t;
-#define MIPS_PRID_REV(x) (((x) >> 0) & 0x00ff)
-#define MIPS_PRID_IMPL(x) (((x) >> 8) & 0x00ff)
+#define MIPS_PRID_REV(x) (((x) >> 0) & 0x00ff)
+#define MIPS_PRID_IMPL(x) (((x) >> 8) & 0x00ff)
/* pre-MIPS32/64 */
-#define MIPS_PRID_RSVD(x) (((x) >> 16) & 0xffff)
-#define MIPS_PRID_REV_MIN(x) ((MIPS_PRID_REV(x) >> 0) & 0x0f)
-#define MIPS_PRID_REV_MAJ(x) ((MIPS_PRID_REV(x) >> 4) & 0x0f)
+#define MIPS_PRID_RSVD(x) (((x) >> 16) & 0xffff)
+#define MIPS_PRID_REV_MIN(x) ((MIPS_PRID_REV(x) >> 0) & 0x0f)
+#define MIPS_PRID_REV_MAJ(x) ((MIPS_PRID_REV(x) >> 4) & 0x0f)
/* MIPS32/64 */
-#define MIPS_PRID_CID(x) (((x) >> 16) & 0x00ff) /* Company ID */
-#define MIPS_PRID_CID_PREHISTORIC 0x00 /* Not MIPS32/64 */
-#define MIPS_PRID_CID_MTI 0x01 /* MIPS Technologies, Inc. */
-#define MIPS_PRID_CID_BROADCOM 0x02 /* Broadcom */
-#define MIPS_PRID_CID_ALCHEMY 0x03 /* Alchemy Semiconductor */
-#define MIPS_PRID_CID_SIBYTE 0x04 /* SiByte */
-#define MIPS_PRID_CID_SANDCRAFT 0x05 /* SandCraft */
-#define MIPS_PRID_COPTS(x) (((x) >> 24) & 0x00ff) /* Company Options */
+#define MIPS_PRID_CID(x) (((x) >> 16) & 0x00ff) /* Company ID */
+#define MIPS_PRID_CID_PREHISTORIC 0x00 /* Not MIPS32/64 */
+#define MIPS_PRID_CID_MTI 0x01 /* MIPS Technologies, Inc. */
+#define MIPS_PRID_CID_BROADCOM 0x02 /* Broadcom */
+#define MIPS_PRID_CID_ALCHEMY 0x03 /* Alchemy Semiconductor */
+#define MIPS_PRID_CID_SIBYTE 0x04 /* SiByte */
+#define MIPS_PRID_CID_SANDCRAFT 0x05 /* SandCraft */
+#define MIPS_PRID_CID_PHILIPS 0x06 /* Philips */
+#define MIPS_PRID_CID_TOSHIBA 0x07 /* Toshiba */
+#define MIPS_PRID_CID_LSI 0x08 /* LSI */
+ /* 0x09 unannounced */
+ /* 0x0a unannounced */
+#define MIPS_PRID_CID_LEXRA 0x0b /* Lexra */
+#define MIPS_PRID_COPTS(x) (((x) >> 24) & 0x00ff) /* Company Options */
#ifdef _KERNEL
#ifdef __HAVE_MIPS_MACHDEP_CACHE_CONFIG
==== //depot/projects/mips2/src/sys/mips/mips/cpu.c#21 (text+ko) ====
@@ -209,6 +209,18 @@
case MIPS_PRID_CID_SANDCRAFT:
printf("Sandcraft");
break;
+ case MIPS_PRID_CID_PHILIPS:
+ printf("Philips");
+ break;
+ case MIPS_PRID_CID_TOSHIBA:
+ printf("Toshiba");
+ break;
+ case MIPS_PRID_CID_LSI:
+ printf("LSI");
+ break;
+ case MIPS_PRID_CID_LEXRA:
+ printf("Lexra");
+ break;
case MIPS_PRID_CID_PREHISTORIC:
default:
printf("Unknown");
More information about the p4-projects
mailing list