Oops, use the local MVMEPROM_CALL(), rather than the one which used to be

in <machine/prom.h> -- code in stand/ does not need a specific context to
invoke the BUG functions.

12 files changed, 26 insertions, 18 deletions

diff --git a/sys/arch/mvme88k/stand/libbug/delay.c b/sys/arch/mvme88k/stand/libbug/delay.c
index 3ec73a48c4d..af2528542fc 100644
--- a/sys/arch/mvme88k/stand/libbug/delay.c
+++ b/sys/arch/mvme88k/stand/libbug/delay.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: delay.c,v 1.2 2001/07/04 08:09:26 niklas Exp $	*/
+/*	$OpenBSD: delay.c,v 1.3 2003/09/07 21:35:35 miod Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -6,6 +6,7 @@
  */
 #include <sys/types.h>
 #include <machine/prom.h>
+#include "prom.h"
 
 /* BUG - timing routine */
 void
diff --git a/sys/arch/mvme88k/stand/libbug/diskrd.c b/sys/arch/mvme88k/stand/libbug/diskrd.c
index 972ed30fc1d..35d0b0d929f 100644
--- a/sys/arch/mvme88k/stand/libbug/diskrd.c
+++ b/sys/arch/mvme88k/stand/libbug/diskrd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskrd.c,v 1.3 2001/07/04 08:09:26 niklas Exp $	*/
+/*	$OpenBSD: diskrd.c,v 1.4 2003/09/07 21:35:35 miod Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -6,6 +6,7 @@
  */
 #include <sys/types.h>
 #include <machine/prom.h>
+#include "prom.h"
 
 /* returns 0: success, nonzero: error */
 int
diff --git a/sys/arch/mvme88k/stand/libbug/diskwr.c b/sys/arch/mvme88k/stand/libbug/diskwr.c
index cea4e5cc052..fb0ecad9b3b 100644
--- a/sys/arch/mvme88k/stand/libbug/diskwr.c
+++ b/sys/arch/mvme88k/stand/libbug/diskwr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskwr.c,v 1.2 2001/07/04 08:09:28 niklas Exp $	*/
+/*	$OpenBSD: diskwr.c,v 1.3 2003/09/07 21:35:35 miod Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -6,6 +6,7 @@
  */
 #include <sys/types.h>
 #include <machine/prom.h>
+#include "prom.h"
 
 /* returns 0: success, nonzero: error */
 int
diff --git a/sys/arch/mvme88k/stand/libbug/getbrdid.c b/sys/arch/mvme88k/stand/libbug/getbrdid.c
index 45008fbefb5..3848e31536c 100644
--- a/sys/arch/mvme88k/stand/libbug/getbrdid.c
+++ b/sys/arch/mvme88k/stand/libbug/getbrdid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getbrdid.c,v 1.2 2001/07/04 08:09:28 niklas Exp $	*/
+/*	$OpenBSD: getbrdid.c,v 1.3 2003/09/07 21:35:35 miod Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -6,6 +6,7 @@
  */
 #include <sys/types.h>
 #include <machine/prom.h>
+#include "prom.h"
 
 /* BUG - query board routines */
 struct mvmeprom_brdid *
diff --git a/sys/arch/mvme88k/stand/libbug/inchr.c b/sys/arch/mvme88k/stand/libbug/inchr.c
index 34c12b024da..08b13be5180 100644
--- a/sys/arch/mvme88k/stand/libbug/inchr.c
+++ b/sys/arch/mvme88k/stand/libbug/inchr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inchr.c,v 1.1 1998/08/22 07:39:55 smurph Exp $ */
+/*	$OpenBSD: inchr.c,v 1.2 2003/09/07 21:35:35 miod Exp $ */
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -8,7 +8,7 @@
 #include <machine/prom.h>
 
 #include "stand.h"
-#include "libbug.h"
+#include "prom.h"
 
 /* returns 0 if no characters ready to read */
 int
diff --git a/sys/arch/mvme88k/stand/libbug/instat.c b/sys/arch/mvme88k/stand/libbug/instat.c
index 0a8b9c9d30f..b83c209d8a9 100644
--- a/sys/arch/mvme88k/stand/libbug/instat.c
+++ b/sys/arch/mvme88k/stand/libbug/instat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: instat.c,v 1.2 2001/07/04 08:09:28 niklas Exp $	*/
+/*	$OpenBSD: instat.c,v 1.3 2003/09/07 21:35:35 miod Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -6,6 +6,7 @@
  */
 #include <sys/types.h>
 #include <machine/prom.h>
+#include "prom.h"
 
 /* returns 0 if no characters ready to read */
 int
diff --git a/sys/arch/mvme88k/stand/libbug/outln.c b/sys/arch/mvme88k/stand/libbug/outln.c
index fc101fa4b68..04e98f053d6 100644
--- a/sys/arch/mvme88k/stand/libbug/outln.c
+++ b/sys/arch/mvme88k/stand/libbug/outln.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: outln.c,v 1.2 2001/07/04 08:09:28 niklas Exp $	*/
+/*	$OpenBSD: outln.c,v 1.3 2003/09/07 21:35:35 miod Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -6,6 +6,7 @@
  */
 #include <sys/types.h>
 #include <machine/prom.h>
+#include "prom.h"
 
 void
 mvmeprom_outln(start, end)
diff --git a/sys/arch/mvme88k/stand/libbug/outstr.c b/sys/arch/mvme88k/stand/libbug/outstr.c
index 652a9ce033d..0af6257fa7d 100644
--- a/sys/arch/mvme88k/stand/libbug/outstr.c
+++ b/sys/arch/mvme88k/stand/libbug/outstr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: outstr.c,v 1.2 2001/07/04 08:09:28 niklas Exp $	*/
+/*	$OpenBSD: outstr.c,v 1.3 2003/09/07 21:35:35 miod Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -6,6 +6,7 @@
  */
 #include <sys/types.h>
 #include <machine/prom.h>
+#include "prom.h"
 
 void
 mvmeprom_outstr(start, end)
diff --git a/sys/arch/mvme88k/stand/libbug/prom.h b/sys/arch/mvme88k/stand/libbug/prom.h
index 58e608658a2..03b562f588c 100644
--- a/sys/arch/mvme88k/stand/libbug/prom.h
+++ b/sys/arch/mvme88k/stand/libbug/prom.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: prom.h,v 1.2 2001/07/04 08:09:28 niklas Exp $	*/
+/*	$OpenBSD: prom.h,v 1.3 2003/09/07 21:35:35 miod Exp $	*/
 
-#define MVMEPROM_CALL(x)	\
-	asm volatile ( __CONCAT("or r9,r0," __STRING(x)) ); \
-	asm volatile ("tb0 0,r0,496");
+#define MVMEPROM_CALL(x) \
+	__asm__ __volatile__ (__CONCAT("or r9,r0,", __STRING(x))); \
+	__asm__ __volatile__ ("tb0 0,r0,496")
diff --git a/sys/arch/mvme88k/stand/libbug/putchar.c b/sys/arch/mvme88k/stand/libbug/putchar.c
index 2193b45c78c..a097e36f5b4 100644
--- a/sys/arch/mvme88k/stand/libbug/putchar.c
+++ b/sys/arch/mvme88k/stand/libbug/putchar.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: putchar.c,v 1.2 1998/12/15 06:32:34 smurph Exp $ */
+/*	$OpenBSD: putchar.c,v 1.3 2003/09/07 21:35:35 miod Exp $ */
 
 /*
  * putchar: easier to do this with outstr than to add more macros to
@@ -9,7 +9,7 @@
 #include <machine/prom.h>
 
 #include "stand.h"
-#include "libbug.h"
+#include "prom.h"
 
 void
 putchar(c)
diff --git a/sys/arch/mvme88k/stand/libbug/return.c b/sys/arch/mvme88k/stand/libbug/return.c
index 54d53cd2e2b..ff218a3a5f7 100644
--- a/sys/arch/mvme88k/stand/libbug/return.c
+++ b/sys/arch/mvme88k/stand/libbug/return.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: return.c,v 1.2 2001/07/04 08:09:29 niklas Exp $	*/
+/*	$OpenBSD: return.c,v 1.3 2003/09/07 21:35:35 miod Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -7,7 +7,7 @@
 #include <sys/types.h>
 #include <machine/prom.h>
 #include "stand.h"
-#include "libbug.h"
+#include "prom.h"
 
 /* BUG - return to bug routine */
 void
diff --git a/sys/arch/mvme88k/stand/libbug/rtc_rd.c b/sys/arch/mvme88k/stand/libbug/rtc_rd.c
index a3c456a4f15..5931fa49c12 100644
--- a/sys/arch/mvme88k/stand/libbug/rtc_rd.c
+++ b/sys/arch/mvme88k/stand/libbug/rtc_rd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtc_rd.c,v 1.2 2001/07/04 08:09:29 niklas Exp $	*/
+/*	$OpenBSD: rtc_rd.c,v 1.3 2003/09/07 21:35:35 miod Exp $	*/
 
 /*
  * bug routines -- assumes that the necessary sections of memory
@@ -6,6 +6,7 @@
  */
 #include <sys/types.h>
 #include <machine/prom.h>
+#include "prom.h"
 
 void
 mvmeprom_rtc_rd(ptime)