MC88110 header modifications.

2 files changed, 25 insertions, 11 deletions

diff --git a/sys/arch/mvme88k/include/reg.h b/sys/arch/mvme88k/include/reg.h
index b68adfc6428..a74923844ff 100644
--- a/sys/arch/mvme88k/include/reg.h
+++ b/sys/arch/mvme88k/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.10 2001/12/16 23:49:46 miod Exp $ */
+/*	$OpenBSD: reg.h,v 1.11 2001/12/20 06:20:26 smurph Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -41,20 +41,30 @@ struct reg {
     unsigned fpsr;
     unsigned fpcr;
     unsigned sxip;
-#define exip sxip
+#define exip sxip	/* mc88110 */
     unsigned snip;
-#define enip snip
+#define enip snip	/* mc88110 */
     unsigned sfip;
     unsigned ssbr;
+#define duap ssbr	/* mc88110 */
     unsigned dmt0;
+#define dsr dmt0	/* mc88110 */
     unsigned dmd0;
+#define dlar dmd0	/* mc88110 */
     unsigned dma0;
+#define dpar dma0	/* mc88110 */
     unsigned dmt1;
+#define isr dmt1	/* mc88110 */
     unsigned dmd1;
+#define ilar dmd1	/* mc88110 */
     unsigned dma1;
+#define ipar dma1	/* mc88110 */
     unsigned dmt2;
+#define isap dmt2	/* mc88110 */
     unsigned dmd2;
+#define dsap dmd2	/* mc88110 */
     unsigned dma2;
+#define iuap dma2	/* mc88110 */
     unsigned fpecr;
     unsigned fphs1;
     unsigned fpls1;
@@ -70,12 +80,6 @@ struct reg {
     unsigned scratch1;	   /* used by locore trap handling code */
     unsigned ipfsr;        /* P BUS status - used in inst fault handling */
     unsigned dpfsr;        /* P BUS status - used in data fault handling */
-    unsigned dsr;          /* MVME197 */
-    unsigned dlar;         /* MVME197 */
-    unsigned dpar;         /* MVME197 */
-    unsigned isr;          /* MVME197 */
-    unsigned ilar;         /* MVME197 */
-    unsigned ipar;         /* MVME197 */
     unsigned cpu;          /* cpu number */
 };
 
diff --git a/sys/arch/mvme88k/include/signal.h b/sys/arch/mvme88k/include/signal.h
index faf251b5874..6d81692b990 100644
--- a/sys/arch/mvme88k/include/signal.h
+++ b/sys/arch/mvme88k/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.8 2001/12/16 23:49:46 miod Exp $ */
+/*	$OpenBSD: signal.h,v 1.9 2001/12/20 06:20:26 smurph Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -55,15 +55,25 @@ struct  sigcontext {
 	int	sc_fpsr;
 	int	sc_fpcr;
 	int	sc_ssbr;
+#define sc_duap	sc_ssbr	/* mc88110 */
 	int	sc_dmt0;
+#define sc_dsr	sc_dmt0	/* mc88110 */
 	int	sc_dmd0;
+#define sc_dlar	sc_dmd0	/* mc88110 */
 	int	sc_dma0;
+#define sc_dpar	sc_dma0	/* mc88110 */
 	int	sc_dmt1;
+#define sc_isr	sc_dmt1	/* mc88110 */
 	int	sc_dmd1;
+#define sc_ilar	sc_dmd1	/* mc88110 */
 	int	sc_dma1;
+#define sc_ipar	sc_dma1	/* mc88110 */
 	int	sc_dmt2;
+#define sc_isap sc_dmt2	/* mc88110 */
 	int	sc_dmd2;
+#define sc_dsap sc_dmd2	/* mc88110 */
 	int	sc_dma2;
+#define sc_iuap sc_dma2	/* mc88110 */
 	int	sc_fpecr;
 	int	sc_fphs1;
 	int	sc_fpls1;
@@ -73,6 +83,6 @@ struct  sigcontext {
 	int	sc_fprh;
 	int	sc_fprl;
 	int	sc_fpit;
-	int	sc_xxxx;	/* padd to double word boundary */
+	int	sc_xxxx;	/* pad to double word boundary */
 };
 #endif /* __MACHINE_SIGNAL_H__ */