updates from Rick Macklem. Also, fix MIPS implementation defines.

SCCS-vsn: sys/pmax/include/cpu.h 7.7

diff --git a/usr/src/sys/pmax/include/cpu.h b/usr/src/sys/pmax/include/cpu.h
index ee8c111..df4e4ce 100644 (file)
--- a/usr/src/sys/pmax/include/cpu.h
+++ b/usr/src/sys/pmax/include/cpu.h
@@ -1,13 +1,13 @@
-/*
- * Copyright (c) 1992 Regents of the University of California.
+/*-
+ * Copyright (c) 1992 The Regents of the University of California.

  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by

- * Ralph Campbell.
+ * Ralph Campbell and Rick Macklem.

  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cpu.h       7.6 (Berkeley) %G%
+ *     @(#)cpu.h       7.7 (Berkeley) %G%

  */
 
 #ifndef _CPU_H_
  */
 
 #ifndef _CPU_H_


@@ -92,22 +92,20 @@ union cpuprid {
 /*
  * MIPS CPU types (cp_imp).
  */
 /*
  * MIPS CPU types (cp_imp).
  */

-#define        MIPS_R2000      0x02
-#define        MIPS_R3000      0x03
+#define        MIPS_R2000      0x01
+#define        MIPS_R3000      0x02
+#define        MIPS_R6000      0x03

 #define        MIPS_R4000      0x04
 #define        MIPS_R4000      0x04

+#define        MIPS_R6000A     0x06

 
 /*
  * MIPS FPU types
  */
 
 /*
  * MIPS FPU types
  */

-#define        MIPS_R2010      0x03
-#define        MIPS_R3010      0x04
+#define        MIPS_R2010      0x02
+#define        MIPS_R3010      0x03
+#define        MIPS_R6010      0x04

 #define        MIPS_R4010      0x05
 
 #define        MIPS_R4010      0x05
 

-struct intr_tab {
-       void    (*func)();      /* pointer to interrupt routine */
-       int     unit;           /* logical unit number */
-};
-

 #ifdef KERNEL
 union  cpuprid cpu;
 union  cpuprid fpu;
 #ifdef KERNEL
 union  cpuprid cpu;
 union  cpuprid fpu;