Older BUG version do not implement the `out cr/lf' BUG system call, and, worse,

do not return from it, for extra fun. The good thing is that the existing
kernel console code logic issueing \n as \r\n works nicely with the regular
BUG output routines, so there was no reason to use this particular BUG routine
in the first place.

6 files changed, 8 insertions, 45 deletions

diff --git a/sys/arch/mvme88k/dev/bugio.c b/sys/arch/mvme88k/dev/bugio.c
index ae4dba00f2d..56d919e5cd1 100644
--- a/sys/arch/mvme88k/dev/bugio.c
+++ b/sys/arch/mvme88k/dev/bugio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugio.c,v 1.20 2013/01/05 11:20:56 miod Exp $ */
+/*	$OpenBSD: bugio.c,v 1.21 2013/05/14 20:30:47 miod Exp $ */
 /*
  * Copyright (c) 2006, 2010, Miodrag Vallat.
  * Copyright (c) 1998 Steve Murphree, Jr.
@@ -68,21 +68,6 @@ __cpu_simple_lock_t bug_lock = __SIMPLELOCK_UNLOCKED;
 }
 
 void
-bugpcrlf(void)
-{
-	u_int psr;
-
-#ifdef DIAGNOSTIC
-	if (!cold)
-		panic("%s: BUG calls are forbidden at this point", __func__);
-#endif
-
-	BUGCTXT();
-	MVMEPROM_CALL(MVMEPROM_OUTCRLF);
-	OSCTXT();
-}
-
-void
 buginit()
 {
 	__asm__ __volatile__ ("ldcr %0, %%cr20" : "=r" (bugsr3));
diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h
index ad078622509..06e93d478c8 100644
--- a/sys/arch/mvme88k/include/bugio.h
+++ b/sys/arch/mvme88k/include/bugio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugio.h,v 1.17 2011/03/23 16:54:36 pirofti Exp $ */
+/*	$OpenBSD: bugio.h,v 1.18 2013/05/14 20:30:47 miod Exp $ */
 
 #ifndef _MACHINE_BUGIO_H_
 #define _MACHINE_BUGIO_H_
@@ -7,7 +7,6 @@
 
 void	buginit(void);
 char	buginchr(void);
-void	bugpcrlf(void);
 void	bugoutchr(int);
 void	bugreturn(void);
 void	bugbrdid(struct mvmeprom_brdid *);
diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h
index 12762f11942..d18c790749b 100644
--- a/sys/arch/mvme88k/include/prom.h
+++ b/sys/arch/mvme88k/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.20 2012/11/25 14:10:47 miod Exp $ */
+/*	$OpenBSD: prom.h,v 1.21 2013/05/14 20:30:47 miod Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -52,7 +52,7 @@
 #define MVMEPROM_OUTSTRCRLF	0x22
 #define MVMEPROM_WRITE		0x23
 #define MVMEPROM_WRITELN	0x24
-#define	MVMEPROM_OUTCRLF	0x26
+#define	MVMEPROM_OUTCRLF	0x26	/* not implemented on MVME181? */
 #define MVMEPROM_DELAY		0x43
 #define MVMEPROM_RTC_RD		0x53
 #define MVMEPROM_EXIT		0x63
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index a85e58cdb07..bae03a04ab0 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.248 2012/12/26 22:32:13 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.249 2013/05/14 20:30:47 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -1099,10 +1099,7 @@ bootcnputc(dev, c)
 	dev_t dev;
 	int c;
 {
-	if (c == '\n')
-		bugpcrlf();
-	else
-		bugoutchr(c);
+	bugoutchr(c);
 }
 
 int
diff --git a/sys/arch/mvme88k/stand/libbug/Makefile b/sys/arch/mvme88k/stand/libbug/Makefile
index 8ba44eb6705..ff258e6f209 100644
--- a/sys/arch/mvme88k/stand/libbug/Makefile
+++ b/sys/arch/mvme88k/stand/libbug/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2012/11/25 14:10:47 miod Exp $
+#	$OpenBSD: Makefile,v 1.10 2013/05/14 20:30:47 miod Exp $
 
 LIB=bug
 
@@ -12,7 +12,7 @@ DIR_SA=$S/lib/libsa
 CFLAGS+=-I${.CURDIR}/../../include -I${DIR_SA}
 
 SRCS=	delay.c diskrd.c diskwr.c getbrdid.c inchr.c instat.c \
-	netcfig.c netctrl.c netfopen.c netfread.c outln.c outstr.c putchar.c \
+	netcfig.c netctrl.c netfopen.c netfread.c outstr.c putchar.c \
 	return.c rtc_rd.c
 
 install:
diff --git a/sys/arch/mvme88k/stand/libbug/outln.c b/sys/arch/mvme88k/stand/libbug/outln.c
deleted file mode 100644
index 33d9e98310e..00000000000
--- a/sys/arch/mvme88k/stand/libbug/outln.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$OpenBSD: outln.c,v 1.4 2013/01/05 11:20:56 miod Exp $	*/
-
-/*
- * bug routines -- assumes that the necessary sections of memory
- * are preserved.
- */
-#include <sys/types.h>
-#include <machine/prom.h>
-#include "prom.h"
-
-void
-mvmeprom_outln(start, end)
-	char *start, *end;
-{
-	asm volatile ("or %%r2,%%r0,%0": : "r" (start));
-	asm volatile ("or %%r3,%%r0,%0": : "r" (end));
-	MVMEPROM_CALL(MVMEPROM_OUTSTRCRLF);
-}