Kill struct md_p, which was really only necessary for mvme88k; on

luna88k it disappears completely, while mvme88k keeps 3 global variables,
one of them scheduled to disappear very soon.

10 files changed, 133 insertions, 178 deletions

diff --git a/sys/arch/luna88k/include/cpu.h b/sys/arch/luna88k/include/cpu.h
index 127ca471884..7221d9e103b 100644
--- a/sys/arch/luna88k/include/cpu.h
+++ b/sys/arch/luna88k/include/cpu.h
@@ -1,3 +1,13 @@
-/* $OpenBSD: cpu.h,v 1.3 2004/04/26 14:31:08 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.4 2004/11/08 16:39:28 miod Exp $ */
 /* public domain */
+#ifndef	_LUNA88K_CPU_H_
+#define	_LUNA88k_CPU_H_
+
 #include <m88k/cpu.h>
+
+#ifdef _KERNEL
+void luna88k_ext_int(u_int v, struct trapframe *eframe);
+#define	md_interrupt_func	luna88k_ext_int
+#endif	/* _KERNEL */
+
+#endif	/* _LUNA88k_CPU_H_ */
diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c
index a26b48430f8..104dc41c60c 100644
--- a/sys/arch/luna88k/luna88k/machdep.c
+++ b/sys/arch/luna88k/luna88k/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.15 2004/10/03 19:47:25 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.16 2004/11/08 16:39:31 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -132,7 +132,6 @@ extern void load_u_area(struct proc *);
 extern void save_u_area(struct proc *, vaddr_t);
 
 vaddr_t size_memory(void);
-void luna88k_ext_int(u_int v, struct trapframe *eframe);
 void powerdown(void);
 void get_fuse_rom_data(void);
 void get_nvram_data(void);
@@ -142,9 +141,6 @@ int clockintr(void *);				/* in clock.c */
 
 vaddr_t interrupt_stack[MAX_CPUS];
 
-/* machine dependent function pointers. */
-struct md_p md;
-
 /*
  * *int_mask_reg[CPU]
  * Points to the hardware interrupt status register for each CPU.
@@ -1161,18 +1157,8 @@ luna88k_bootstrap()
 	curproc = &proc0;
 	curpcb = &proc0paddr->u_pcb;
 
-	/* zero out the machine dependant function pointers */
-	bzero(&md, sizeof(struct md_p));
-
-	/* 
-	 * set up interrupt and fp exception handlers 
-	 * based on the machine.
-	 */
 	cmmu = &cmmu8820x;
-	md.interrupt_func = &luna88k_ext_int;
-	md.intr_mask = NULL;
-	md.intr_ipl = NULL;
-	md.intr_src = NULL;
+
 	/* clear and disable all interrupts */
 	*int_mask_reg[0] = 0;
 	*int_mask_reg[1] = 0;
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index 8e34d692561..b1a00496a60 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.4 2004/08/02 08:34:59 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.5 2004/11/08 16:39:31 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -129,20 +129,6 @@ struct switchframe {
 	void	*sf_proc;		/* proc pointer */
 };
 
-/* This struct defines the machine dependent pointers */
-struct md_p {
-	void (*clock_init_func)(void);      /* interval clock init function */
-	void (*statclock_init_func)(void);  /* statistics clock init function */
-	void (*delayclock_init_func)(void); /* delay clock init function */
-	void (*delay_func)(void);           /* delay clock function */
-	void (*interrupt_func)(u_int, struct trapframe *);       /* interrupt func */
-	u_char *volatile intr_mask;
-	u_char *volatile intr_ipl;
-	u_char *volatile intr_src;
-};
-
-extern struct md_p md;
-
 int badvaddr(vaddr_t, int);
 void nmihand(void *);
 
diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c
index 271b9131d74..57e7df4af7d 100644
--- a/sys/arch/m88k/m88k/trap.c
+++ b/sys/arch/m88k/m88k/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.12 2004/10/01 20:20:34 miod Exp $	*/
+/*	$OpenBSD: trap.c,v 1.13 2004/11/08 16:39:31 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -263,7 +263,7 @@ m88100_trap(unsigned type, struct trapframe *frame)
 		/* This function pointer is set in machdep.c
 		   It calls m188_ext_int or sbc_ext_int depending
 		   on the value of brdtyp - smurph */
-		(*md.interrupt_func)(T_INT, frame);
+		md_interrupt_func(T_INT, frame);
 		return;
 
 	case T_MISALGNFLT:
@@ -738,11 +738,11 @@ m88110_trap(unsigned type, struct trapframe *frame)
 		break;
 	case T_NON_MASK:
 	case T_NON_MASK+T_USER:
-		(*md.interrupt_func)(T_NON_MASK, frame);
+		md_interrupt_func(T_NON_MASK, frame);
 		return;
 	case T_INT:
 	case T_INT+T_USER:
-		(*md.interrupt_func)(T_INT, frame);
+		md_interrupt_func(T_INT, frame);
 		return;
 	case T_MISALGNFLT:
 		printf("kernel mode misaligned access exception @ 0x%08x\n",
diff --git a/sys/arch/mvme88k/dev/clock.c b/sys/arch/mvme88k/dev/clock.c
index a68832f3242..50436c966a2 100644
--- a/sys/arch/mvme88k/dev/clock.c
+++ b/sys/arch/mvme88k/dev/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.42 2004/08/25 21:47:54 miod Exp $ */
+/*	$OpenBSD: clock.c,v 1.43 2004/11/08 16:39:31 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1995 Theo de Raadt
@@ -105,10 +105,8 @@
 int	clockmatch(struct device *, void *, void *);
 void	clockattach(struct device *, struct device *, void *);
 
-void	sbc_initclock(void);
-void	sbc_initstatclock(void);
-void	m188_initclock(void);
-void	m188_initstatclock(void);
+void	sbc_init_clocks(void);
+void	m188_init_clocks(void);
 void	m188_cio_init(unsigned);
 u_int	read_cio(int);
 void	write_cio(int, u_int);
@@ -193,14 +191,13 @@ clockattach(struct device *parent, struct device *self, void *args)
 		sc->sc_profih.ih_ipl = ca->ca_ipl;
 		prof_reset = ca->ca_ipl | PCC2_IRQ_IEN | PCC2_IRQ_ICLR;
 		pcctwointr_establish(PCC2V_TIMER1, &sc->sc_profih, "clock");
-		md.clock_init_func = sbc_initclock;
 		sc->sc_statih.ih_fn = sbc_statintr;
 		sc->sc_statih.ih_arg = 0;
 		sc->sc_statih.ih_wantframe = 1;
 		sc->sc_statih.ih_ipl = ca->ca_ipl;
 		stat_reset = ca->ca_ipl | PCC2_IRQ_IEN | PCC2_IRQ_ICLR;
 		pcctwointr_establish(PCC2V_TIMER2, &sc->sc_statih, "stat");
-		md.statclock_init_func = sbc_initstatclock;
+		md_init_clocks = sbc_init_clocks;
 		break;
 #endif /* NPCCTWO */
 #if NSYSCON > 0
@@ -210,13 +207,12 @@ clockattach(struct device *parent, struct device *self, void *args)
 		sc->sc_profih.ih_wantframe = 1;
 		sc->sc_profih.ih_ipl = ca->ca_ipl;
 		sysconintr_establish(SYSCV_TIMER2, &sc->sc_profih, "clock");
-		md.clock_init_func = m188_initclock;
 		sc->sc_statih.ih_fn = m188_statintr;
 		sc->sc_statih.ih_arg = 0;
 		sc->sc_statih.ih_wantframe = 1;
 		sc->sc_statih.ih_ipl = ca->ca_ipl;
 		sysconintr_establish(SYSCV_TIMER1, &sc->sc_statih, "stat");
-		md.statclock_init_func = m188_initstatclock;
+		md_init_clocks = m188_init_clocks;
 		break;
 #endif /* NSYSCON */
 	}
@@ -227,15 +223,16 @@ clockattach(struct device *parent, struct device *self, void *args)
 #if NPCCTWO > 0
 
 void
-sbc_initclock(void)
+sbc_init_clocks(void)
 {
-#ifdef CLOCK_DEBUG
-	printf("SBC clock init\n");
-#endif
+	int statint, minint;
+
+#ifdef DIAGNOSTIC
 	if (1000000 % hz) {
 		printf("cannot get %d Hz clock; using 100 Hz\n", hz);
 		hz = 100;
 	}
+#endif
 	tick = 1000000 / hz;
 
 	/* profclock */
@@ -247,41 +244,15 @@ sbc_initclock(void)
 	    PCC2_TCTL_CEN | PCC2_TCTL_COC | PCC2_TCTL_COVF;
 	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) =
 	    prof_reset;
-}
-
-/*
- * clockintr: ack intr and call hardclock
- */
-int
-sbc_clockintr(void *eframe)
-{
-	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) =
-	    prof_reset;
-
-	intrcnt[M88K_CLK_IRQ]++;
-
-	hardclock(eframe);
-#if NBUGTTY > 0
-	bugtty_chkinput();
-#endif /* NBUGTTY */
-
-	return (1);
-}
 
-void
-sbc_initstatclock(void)
-{
-	int statint, minint;
-
-#ifdef CLOCK_DEBUG
-	printf("SBC statclock init\n");
-#endif
 	if (stathz == 0)
 		stathz = hz;
+#ifdef DIAGNOSTIC
 	if (1000000 % stathz) {
 		printf("cannot get %d Hz statclock; using 100 Hz\n", stathz);
 		stathz = 100;
 	}
+#endif
 	profhz = stathz;		/* always */
 
 	statint = 1000000 / stathz;
@@ -302,6 +273,25 @@ sbc_initstatclock(void)
 	statmin = statint - (statvar >> 1);
 }
 
+/*
+ * clockintr: ack intr and call hardclock
+ */
+int
+sbc_clockintr(void *eframe)
+{
+	*(volatile u_int8_t *)(OBIO_START + PCC2_BASE + PCCTWO_T1ICR) =
+	    prof_reset;
+
+	intrcnt[M88K_CLK_IRQ]++;
+
+	hardclock(eframe);
+#if NBUGTTY > 0
+	bugtty_chkinput();
+#endif /* NBUGTTY */
+
+	return (1);
+}
+
 int
 sbc_statintr(void *eframe)
 {
@@ -372,6 +362,58 @@ sbc_statintr(void *eframe)
  * counters interrupt at the same time...
  */
 
+void
+m188_init_clocks(void)
+{
+	volatile u_int32_t imr;
+	int statint, minint;
+
+#ifdef DIAGNOSTIC
+	if (1000000 % hz) {
+		printf("cannot get %d Hz clock; using 100 Hz\n", hz);
+		hz = 100;
+	}
+#endif
+	tick = 1000000 / hz;
+
+	simple_lock_init(&cio_lock);
+	m188_cio_init(tick);
+
+	if (stathz == 0)
+		stathz = hz;
+#ifdef DIAGNOSTIC
+	if (1000000 % stathz) {
+		printf("cannot get %d Hz statclock; using 100 Hz\n", stathz);
+		stathz = 100;
+	}
+#endif
+	profhz = stathz;		/* always */
+
+	/*
+	 * The DUART runs at 3.6864 MHz, CT#1 will run in PCLK/16 mode.
+	 */
+	statint = (3686400 / 16) / stathz;
+	minint = statint / 2 + 100;
+	while (statvar > minint)
+		statvar >>= 1;
+	statmin = statint - (statvar >> 1);
+
+	/* clear the counter/timer output OP3 while we program the DART */
+	*(volatile u_int32_t *)DART_OPCR = 0x00;
+	/* set interrupt vec */
+	*(volatile u_int32_t *)DART_IVR = SYSCON_VECT + SYSCV_TIMER1;
+	/* do the stop counter/timer command */
+	imr = *(volatile u_int32_t *)DART_STOPC;
+	/* set counter/timer to counter mode, PCLK/16 */
+	*(volatile u_int32_t *)DART_ACR = 0x30;
+	*(volatile u_int32_t *)DART_CTUR = (statint >> 8);
+	*(volatile u_int32_t *)DART_CTLR = (statint & 0xff);
+	/* set the counter/timer output OP3 */
+	*(volatile u_int32_t *)DART_OPCR = 0x04;
+	/* give the start counter/timer command */
+	imr = *(volatile u_int32_t *)DART_STARTC;
+}
+
 int
 m188_clockintr(void *eframe)
 {
@@ -391,24 +433,6 @@ m188_clockintr(void *eframe)
 	return (1);
 }
 
-void
-m188_initclock(void)
-{
-#ifdef CLOCK_DEBUG
-	printf("VME188 clock init\n");
-#endif
-#ifdef DIAGNOSTIC
-	if (1000000 % hz) {
-		printf("cannot get %d Hz clock; using 100 Hz\n", hz);
-		hz = 100;
-	}
-#endif
-	tick = 1000000 / hz;
-
-	simple_lock_init(&cio_lock);
-	m188_cio_init(tick);
-}
-
 int
 m188_statintr(void *eframe)
 {
@@ -441,50 +465,6 @@ m188_statintr(void *eframe)
 	return (1);
 }
 
-void
-m188_initstatclock(void)
-{
-	volatile u_int32_t imr;
-	int statint, minint;
-
-#ifdef CLOCK_DEBUG
-	printf("VME188 statclock init\n");
-#endif
-	if (stathz == 0)
-		stathz = hz;
-#ifdef DIAGNOSTIC
-	if (1000000 % stathz) {
-		printf("cannot get %d Hz statclock; using 100 Hz\n", stathz);
-		stathz = 100;
-	}
-#endif
-	profhz = stathz;		/* always */
-
-	/*
-	 * The DUART runs at 3.6864 MHz, CT#1 will run in PCLK/16 mode.
-	 */
-	statint = (3686400 / 16) / stathz;
-	minint = statint / 2 + 100;
-	while (statvar > minint)
-		statvar >>= 1;
-	statmin = statint - (statvar >> 1);
-
-	/* clear the counter/timer output OP3 while we program the DART */
-	*(volatile u_int32_t *)DART_OPCR = 0x00;
-	/* set interrupt vec */
-	*(volatile u_int32_t *)DART_IVR = SYSCON_VECT + SYSCV_TIMER1;
-	/* do the stop counter/timer command */
-	imr = *(volatile u_int32_t *)DART_STOPC;
-	/* set counter/timer to counter mode, PCLK/16 */
-	*(volatile u_int32_t *)DART_ACR = 0x30;
-	*(volatile u_int32_t *)DART_CTUR = (statint >> 8);
-	*(volatile u_int32_t *)DART_CTLR = (statint & 0xff);
-	/* set the counter/timer output OP3 */
-	*(volatile u_int32_t *)DART_OPCR = 0x04;
-	/* give the start counter/timer command */
-	imr = *(volatile u_int32_t *)DART_STARTC;
-}
-
 /* Write CIO register */
 void
 write_cio(int reg, u_int val)
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
index c7c8b931d00..680ccb073c8 100644
--- a/sys/arch/mvme88k/include/cpu.h
+++ b/sys/arch/mvme88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.30 2004/08/03 21:16:23 deraadt Exp $ */
+/* $OpenBSD: cpu.h,v 1.31 2004/11/08 16:39:31 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -45,6 +45,12 @@
 
 #ifdef _KERNEL
 
+/* board dependent pointers */
+extern volatile u_int8_t *md_intr_mask;
+extern void (*md_interrupt_func_ptr)(u_int, struct trapframe *);
+#define	md_interrupt_func	(*md_interrupt_func_ptr)
+extern void (*md_init_clocks)(void);
+
 struct intrhand {
 	SLIST_ENTRY(intrhand) ih_link;
 	int	(*ih_fn)(void *);
diff --git a/sys/arch/mvme88k/mvme88k/m187_machdep.c b/sys/arch/mvme88k/mvme88k/m187_machdep.c
index 940ba21ee2f..e915dc87017 100644
--- a/sys/arch/mvme88k/mvme88k/m187_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m187_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m187_machdep.c,v 1.1 2004/10/01 19:00:52 miod Exp $	*/
+/*	$OpenBSD: m187_machdep.c,v 1.2 2004/11/08 16:39:31 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -157,8 +157,8 @@ m187_ext_int(u_int v, struct trapframe *eframe)
 	u_char vec;
 
 	/* get level and mask */
-	mask = *md.intr_mask & 0x07;
-	level = *md.intr_ipl & 0x07;
+	mask = *md_intr_mask & 0x07;
+	level = *(u_int8_t *)M187_ILEVEL & 0x07;
 
 #ifdef DIAGNOSTIC
 	/*
@@ -260,8 +260,6 @@ m187_bootstrap()
 	extern struct cmmu_p cmmu8820x;
 
 	cmmu = &cmmu8820x;
-	md.interrupt_func = &m187_ext_int;
-	md.intr_mask = (u_char *)M187_IMASK;
-	md.intr_ipl = (u_char *)M187_ILEVEL;
-	md.intr_src = NULL;
+	md_interrupt_func_ptr = &m187_ext_int;
+	md_intr_mask = (u_int8_t *)M187_IMASK;
 }
diff --git a/sys/arch/mvme88k/mvme88k/m188_machdep.c b/sys/arch/mvme88k/mvme88k/m188_machdep.c
index 15a4643a905..55759d3f14a 100644
--- a/sys/arch/mvme88k/mvme88k/m188_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m188_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m188_machdep.c,v 1.1 2004/10/01 19:00:52 miod Exp $	*/
+/*	$OpenBSD: m188_machdep.c,v 1.2 2004/11/08 16:39:31 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -150,10 +150,7 @@ m188_bootstrap()
 	extern struct cmmu_p cmmu8820x;
 
 	cmmu = &cmmu8820x;
-	md.interrupt_func = &m188_ext_int;
-	md.intr_mask = NULL;
-	md.intr_ipl = NULL;
-	md.intr_src = NULL;
+	md_interrupt_func_ptr = &m188_ext_int;
 
 	/* clear and disable all interrupts */
 	*int_mask_reg[0] = 0;
diff --git a/sys/arch/mvme88k/mvme88k/m197_machdep.c b/sys/arch/mvme88k/mvme88k/m197_machdep.c
index 223a7301943..a39f23d5ce3 100644
--- a/sys/arch/mvme88k/mvme88k/m197_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m197_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m197_machdep.c,v 1.1 2004/10/01 19:00:52 miod Exp $	*/
+/*	$OpenBSD: m197_machdep.c,v 1.2 2004/11/08 16:39:31 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -173,8 +173,8 @@ m197_ext_int(u_int v, struct trapframe *eframe)
 	u_char vec;
 
 	/* get src and mask */
-	mask = *md.intr_mask & 0x07;
-	src = *md.intr_src;
+	mask = *md_intr_mask & 0x07;
+	src = *(u_int8_t *)M197_ISRC;
 
 	if (v == T_NON_MASK) {
 		/* This is the abort switch */
@@ -182,7 +182,7 @@ m197_ext_int(u_int v, struct trapframe *eframe)
 		vec = BS_ABORTVEC;
 	} else {
 		/* get level  */
-		level = *md.intr_ipl & 0x07;
+		level = *(u_int8_t *)M197_ILEVEL & 0x07;
 	}
 
 #ifdef DIAGNOSTIC
@@ -275,9 +275,7 @@ m197_bootstrap()
 	extern void set_tcfp(void);
 
 	cmmu = &cmmu88110;
-	md.interrupt_func = &m197_ext_int;
-	md.intr_mask = (u_char *)M197_IMASK;
-	md.intr_ipl = (u_char *)M197_ILEVEL;
-	md.intr_src = (u_char *)M197_ISRC;
+	md_interrupt_func_ptr = &m197_ext_int;
+	md_intr_mask = (u_char *)M197_IMASK;
 	set_tcfp(); /* Set Time Critical Floating Point Mode */
 }
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 8739ff7b87c..7e7a06acaec 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.159 2004/10/01 19:00:52 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.160 2004/11/08 16:39:31 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -139,8 +139,10 @@ extern void m197_startup(void);
 intrhand_t intr_handlers[NVMEINTR];
 vaddr_t interrupt_stack[MAX_CPUS];
 
-/* machine dependent function pointers. */
-struct md_p md;
+/* board dependent pointers */
+volatile u_int8_t *md_intr_mask;
+void (*md_interrupt_func_ptr)(u_int, struct trapframe *);
+void (*md_init_clocks)(void);
 
 volatile u_int8_t *ivec[8];
 
@@ -228,7 +230,7 @@ struct consdev bootcons = {
 	bootcnpollc,
 	NULL,
 	makedev(14, 0),
-	1
+	CN_NORMAL,
 };
 
 /*
@@ -346,12 +348,7 @@ identifycpu()
 void
 cpu_initclocks()
 {
-	if (md.clock_init_func != NULL) {
-		(*md.clock_init_func)();
-	}
-	if (md.statclock_init_func != NULL) {
-		(*md.statclock_init_func)();
-	}
+	(*md_init_clocks)();
 }
 
 void
@@ -1075,9 +1072,6 @@ mvme_bootstrap()
 	curproc = &proc0;
 	curpcb = &proc0paddr->u_pcb;
 
-	/* zero out the machine dependent function pointers */
-	bzero(&md, sizeof(struct md_p));
-
 	buginit();
 	bugbrdid(&brdid);
 	brdtyp = brdid.model;
@@ -1345,7 +1339,7 @@ getipl(void)
 	case BRD_187:
 	case BRD_8120:
 	case BRD_197:
-		curspl = *md.intr_mask & 0x07;
+		curspl = *md_intr_mask & 0x07;
 		break;
 #endif /* defined(MVME187) || defined(MVME197) */
 	}
@@ -1371,8 +1365,8 @@ setipl(unsigned level)
 	case BRD_187:
 	case BRD_8120:
 	case BRD_197:
-		curspl = *md.intr_mask & 0x07;
-		*md.intr_mask = level;
+		curspl = *md_intr_mask & 0x07;
+		*md_intr_mask = level;
 		break;
 #endif /* defined(MVME187) || defined(MVME197) */
 	}
@@ -1407,9 +1401,9 @@ raiseipl(unsigned level)
 	case BRD_187:
 	case BRD_8120:
 	case BRD_197:
-		curspl = *md.intr_mask & 0x07;
+		curspl = *md_intr_mask & 0x07;
 		if (curspl < level)
-			*md.intr_mask = level;
+			*md_intr_mask = level;
 		break;
 #endif /* defined(MVME187) || defined(MVME197) */
 	}