15 files changed, 29 insertions, 585 deletions

diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index b2452e23d28..0ca9ba3fbfe 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.50 2006/04/19 22:09:38 miod Exp $
+#	$OpenBSD: GENERIC,v 1.51 2006/05/02 21:43:07 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -33,8 +33,6 @@ config		bsd		swap generic
 
 mainbus0 at root
 
-bugtty0 at mainbus0
-
 # MVME1x7 devices
 pcctwo0 at mainbus0 addr 0xfff00000		# MVME187
 bussw0	at mainbus0 addr 0xfff00000		# MVME197
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index 15c9d8fc68f..1ff8d30ecd7 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,4 +1,4 @@
-#	$OpenBSD: M187,v 1.33 2006/04/19 22:09:38 miod Exp $
+#	$OpenBSD: M187,v 1.34 2006/05/02 21:43:07 miod Exp $
 
 machine mvme88k m88k
 
@@ -20,7 +20,6 @@ config	bsd swap on generic
 mainbus0 at root
 
 # ------------------------------ mainbus devices ------------------------
-bugtty0 at mainbus0
 pcctwo0 at mainbus0 addr 0xfff00000
 sram0	at mainbus0 addr 0xffe00000
 
diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188
index bda91947aac..4cc9db9600d 100644
--- a/sys/arch/mvme88k/conf/M188
+++ b/sys/arch/mvme88k/conf/M188
@@ -1,4 +1,4 @@
-#	$OpenBSD: M188,v 1.26 2006/04/19 22:09:38 miod Exp $
+#	$OpenBSD: M188,v 1.27 2006/05/02 21:43:07 miod Exp $
 
 machine mvme88k m88k
 
@@ -21,7 +21,6 @@ config	bsd swap on generic
 mainbus0 at root
 
 # ------------------------------ mainbus devices ------------------------
-bugtty0 at mainbus0
 syscon0 at mainbus0 addr 0xfff00000
 
 # ------------------------------ syscon0 devices ------------------------
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index 7e7c68dc1e3..b8dad33becb 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,4 +1,4 @@
-#	$OpenBSD: M197,v 1.29 2006/04/19 22:09:38 miod Exp $
+#	$OpenBSD: M197,v 1.30 2006/05/02 21:43:07 miod Exp $
 
 machine mvme88k m88k
 
@@ -17,7 +17,6 @@ config	bsd swap on generic
 mainbus0 at root
 
 # ------------------------------ mainbus devices ------------------------
-bugtty0 at mainbus0
 bussw0	at mainbus0 addr 0xfff00000
 
 # ----------------------------- busswitch devices -----------------------
diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK
index fb5557777fb..0b11a031392 100644
--- a/sys/arch/mvme88k/conf/RAMDISK
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.28 2006/04/19 22:09:38 miod Exp $
+#	$OpenBSD: RAMDISK,v 1.29 2006/05/02 21:43:07 miod Exp $
 
 machine		mvme88k m88k
 
@@ -36,7 +36,6 @@ config		bsd		root rd0 swap on rd0b
 
 mainbus0 at root
 
-bugtty0 at mainbus0
 bussw0	at mainbus0 addr 0xfff00000
 pcctwo0 at mainbus0 addr 0xfff00000
 syscon0 at mainbus0 addr 0xfff00000
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index f035f1b69db..c6d5323745a 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme88k,v 1.40 2006/04/19 22:09:38 miod Exp $
+#	$OpenBSD: files.mvme88k,v 1.41 2006/05/02 21:43:07 miod Exp $
 #
 maxpartitions 16
 
@@ -37,11 +37,6 @@ device	dart: tty
 attach	dart at syscon
 file	arch/mvme88k/dev/dart.c				dart needs-count
 
-# fallback console, only if no cl or dart is available
-device	bugtty: tty
-attach	bugtty at mainbus
-file	arch/mvme88k/dev/bugtty.c			bugtty needs-count
-
 include	"../../../scsi/files.scsi"
 
 major	{sd = 4}
diff --git a/sys/arch/mvme88k/dev/bugio.c b/sys/arch/mvme88k/dev/bugio.c
index 0cdc177c4e2..5a07cd84618 100644
--- a/sys/arch/mvme88k/dev/bugio.c
+++ b/sys/arch/mvme88k/dev/bugio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugio.c,v 1.16 2005/12/11 21:45:31 miod Exp $ */
+/*	$OpenBSD: bugio.c,v 1.17 2006/05/02 21:43:08 miod Exp $ */
 /*  Copyright (c) 1998 Steve Murphree, Jr. */
 
 #include <sys/param.h>
@@ -78,7 +78,7 @@ sysbug_vector()
 	BUG_UNLOCK();							\
 }
 
-static void
+void
 bugpcrlf(void)
 {
 	u_int psr;
@@ -108,56 +108,16 @@ buginchr(void)
 }
 
 void
-bugoutchr(unsigned char c)
+bugoutchr(int c)
 {
 	u_int psr;
-	unsigned char cc;
-
-	if ((cc = c) == '\n') {
-		bugpcrlf();
-		return;
-	}
 
 	BUGCTXT();
-	__asm__ __volatile__ ("or r2,r0,%0" : : "r" (cc));
+	__asm__ __volatile__ ("or r2,r0,%0" : : "r" (c));
 	MVMEPROM_CALL(MVMEPROM_OUTCHR);
 	OSCTXT();
 }
 
-/* return 1 if not empty else 0 */
-int
-buginstat(void)
-{
-	u_int psr;
-	int ret;
-
-	BUGCTXT();
-	MVMEPROM_CALL(MVMEPROM_INSTAT);
-	__asm__ __volatile__  ("or %0,r0,r2" : "=r" (ret));
-	OSCTXT();
-	return ((ret & 0x08) >> 3);
-}
-
-void
-bugoutstr(char *s, char *se)
-{
-	u_int psr;
-
-	BUGCTXT();
-	MVMEPROM_CALL(MVMEPROM_OUTSTR);
-	OSCTXT();
-}
-
-void
-bugrtcrd(struct mvmeprom_time *rtc)
-{
-	u_int psr;
-
-	BUGCTXT();
-	MVMEPROM_CALL(MVMEPROM_RTC_RD);
-	OSCTXT();
-}
-
 void
 bugreturn(void)
 {
diff --git a/sys/arch/mvme88k/dev/bugtty.c b/sys/arch/mvme88k/dev/bugtty.c
deleted file mode 100644
index 6b06143c9a7..00000000000
--- a/sys/arch/mvme88k/dev/bugtty.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/*	$OpenBSD: bugtty.c,v 1.23 2005/12/11 21:44:04 miod Exp $ */
-
-/* Copyright (c) 1998 Steve Murphree, Jr.
- * Copyright (c) 1995 Dale Rahn.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/device.h>
-#include <sys/tty.h>
-#include <sys/proc.h>
-#include <sys/uio.h>
-#include <sys/queue.h>
-#include <dev/cons.h>
-
-#include <machine/autoconf.h>
-#include <machine/bugio.h>
-#include <machine/conf.h>
-#include <machine/cpu.h>
-
-#include <mvme88k/dev/bugttyfunc.h>
-
-int bugttymatch(struct device *parent, void *self, void *aux);
-void bugttyattach(struct device *parent, struct device *self, void *aux);
-
-struct cfattach bugtty_ca = {
-        sizeof(struct device), bugttymatch, bugttyattach
-};
-
-struct cfdriver bugtty_cd = {
-        NULL, "bugtty", DV_TTY
-};
-
-/* prototypes */
-cons_decl(bugtty);
-
-struct tty *bugttytty(dev_t dev);
-int bugttymctl(dev_t dev, int bits, int how);
-int bugttyparam(struct tty *tp, struct termios *tm);
-
-#define DIALOUT(x) ((x) & 0x80)
-#define SWFLAGS(dev) (bugttyswflags | (DIALOUT(dev) ? TIOCFLAG_SOFTCAR : 0))
-
-#define BUGBUF 80
-char bugtty_ibuffer[BUGBUF+1];
-volatile char *pinchar = bugtty_ibuffer;
-char bug_obuffer[BUGBUF+1];
-
-#define	BUGTTYS	4
-struct tty *bugtty_tty[BUGTTYS];
-
-int
-bugttymatch(parent, self, aux)
-	struct device *parent;
-	void *self;
-	void *aux;
-{
-	struct confargs *ca = aux;
-
-	/*
-	 * Do not attach if a suitable console driver has been attached.
-	 */
-	if (cn_tab != NULL && cn_tab->cn_probe != bugttycnprobe)
-		return (0);
-
-	ca->ca_ipl = IPL_TTY;
-	return (1);
-}
-
-void
-bugttyattach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
-{
-	printf(": fallback console\n");
-}
-
-#define BUGTTYUNIT(x) ((x) & (0x7f))
-void bugttyoutput(struct tty *tp);
-
-int bugttydefaultrate = TTYDEF_SPEED;
-int bugttyswflags;
-
-struct tty *
-bugttytty(dev)
-	dev_t dev;
-{
-	int unit;
-	unit = BUGTTYUNIT(dev);
-	if (unit >= BUGTTYS) {
-		return (NULL);
-	}
-	return bugtty_tty[unit];
-}
-
-int
-bugttymctl(dev, bits, how)
-	dev_t dev;
-	int bits, how;
-{
-	int s;
-
-	/*printf("mctl: dev %x, bits %x, how %x,",dev, bits, how);*/
-
-	/* settings are currently ignored */
-	s = spltty();
-	switch (how) {
-	case DMSET:
-		break;
-	case DMBIC:
-		break;
-	case DMBIS:
-		break;
-	case DMGET:
-		break;
-	}
-	splx(s);
-
-	bits = 0;
-	/* proper defaults? */
-	bits |= TIOCM_DTR;
-	bits |= TIOCM_RTS;
-	bits |= TIOCM_CTS;
-	bits |= TIOCM_CD;
-	/* bits |= TIOCM_RI; */
-	bits |= TIOCM_DSR;
-
-	/* printf("retbits %x\n", bits); */
-	return (bits);
-}
-
-int
-bugttyopen(dev, flag, mode, p)
-	dev_t dev;
-	int flag, mode;
-	struct proc *p;
-{
-	int s, unit = BUGTTYUNIT(dev);
-	struct tty *tp;
-
-	s = spltty();
-	if (bugtty_tty[unit]) {
-		tp = bugtty_tty[unit];
-	} else {
-		tp = bugtty_tty[unit] = ttymalloc();
-	}
-	tp->t_oproc = bugttyoutput;
-	tp->t_param = NULL;
-	tp->t_dev = dev;
-
-	if ((tp->t_state & TS_ISOPEN) == 0) {
-		tp->t_state |= TS_WOPEN;
-		ttychars(tp);
-		if (tp->t_ispeed == 0) {
-			/*
-			 * only when cleared do we reset to defaults.
-			 */
-			tp->t_iflag = TTYDEF_IFLAG;
-			tp->t_oflag = TTYDEF_OFLAG;
-			tp->t_cflag = TTYDEF_CFLAG;
-			tp->t_lflag = TTYDEF_LFLAG;
-			tp->t_ispeed = tp->t_ospeed = bugttydefaultrate;
-		}
-		/* bugtty does not have carrier */
-		tp->t_cflag |= CLOCAL;
-		/*
-		 * do these all the time
-		 */
-		if (bugttyswflags & TIOCFLAG_CLOCAL)
-			tp->t_cflag |= CLOCAL;
-		if (bugttyswflags & TIOCFLAG_CRTSCTS)
-			tp->t_cflag |= CRTSCTS;
-		if (bugttyswflags & TIOCFLAG_MDMBUF)
-			tp->t_cflag |= MDMBUF;
-		bugttyparam(tp, &tp->t_termios);
-		ttsetwater(tp);
-
-		(void)bugttymctl(dev, TIOCM_DTR | TIOCM_RTS, DMSET);
-		/*
-		if ((SWFLAGS(dev) & TIOCFLAG_SOFTCAR) ||
-		    (bugttymctl(dev, 0, DMGET) & TIOCM_CD))
-			tp->t_state |= TS_CARR_ON;
-		else
-			tp->t_state &= ~TS_CARR_ON;
-		*/
-		tp->t_state |= TS_CARR_ON;
-	} else if (tp->t_state & TS_XCLUDE && p->p_ucred->cr_uid != 0) {
-		splx(s);
-		return (EBUSY);
-	}
-
-	/*
-	 * if NONBLOCK requested, ignore carrier
-	 */
-/*
-	if (flag & O_NONBLOCK)
-		goto done;
-*/
-
-	splx(s);
-	/*
-	 * Reset the tty pointer, as there could have been a dialout
-	 * use of the tty with a dialin open waiting.
-	 */
-	tp->t_dev = dev;
-	return ((*linesw[tp->t_line].l_open)(dev, tp));
-}
-
-int
-bugttyparam(tp, tm)
-	struct tty *tp;
-	struct termios *tm;
-{
-	return (0);
-}
-
-void
-bugttyoutput(tp)
-	struct tty *tp;
-{
-	int cc, s, cnt;
-
-	/* only supports one unit */
-
-	if ((tp->t_state & TS_ISOPEN) == 0)
-		return;
-
-	s = spltty();
-	cc = tp->t_outq.c_cc;
-	while (cc > 0) {
-		cnt = min(BUGBUF, cc);
-		cnt = q_to_b(&tp->t_outq, bug_obuffer, cnt);
-		bugoutstr(bug_obuffer, &bug_obuffer[cnt]);
-		cc -= cnt;
-	}
-	splx(s);
-}
-
-int
-bugttyclose(dev, flag, mode, p)
-	dev_t dev;
-	int flag, mode;
-	struct proc *p;
-{
-	int unit = BUGTTYUNIT(dev);
-	struct tty *tp = bugtty_tty[unit];
-
-	(*linesw[tp->t_line].l_close)(tp, flag);
-
-	ttyclose(tp);
-#if 0
-	bugtty_tty[unit] = NULL;
-#endif
-	return (0);
-}
-
-int
-bugttyread(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
-{
-	struct tty *tp;
-
-	if ((tp = bugtty_tty[BUGTTYUNIT(dev)]) == NULL)
-		return (ENXIO);
-	return ((*linesw[tp->t_line].l_read)(tp, uio, flag));
-}
-
-/* only to be called at splclk() */
-void
-bugtty_chkinput()
-{
-	struct tty *tp;
-
-	tp = bugtty_tty[0]; /* assumes console is the first port */
-	if (tp == NULL)
-		return;
-
-	while (buginstat() != 0) {
-		u_char c = buginchr() & 0xff;
-		(*linesw[tp->t_line].l_rint)(c, tp);
-	}
-}
-
-int
-bugttywrite(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
-{
-#if 0
-	/* bypass tty output routines. */
-	int i, cnt, s;
-	int oldoff;
-
-	s = spltty();
-	oldoff = uio->uio_offset;
-	do  {
-		uiomove(bug_obuffer, BUGBUF, uio);
-		bugoutstr(bug_obuffer, &bug_obuffer[uio->uio_offset - oldoff]);
-		oldoff = uio->uio_offset;
-	} while (uio->uio_resid != 0);
-	splx(s);
-
-	return (0);
-#else
-	struct tty *tp;
-	if((tp = bugtty_tty[BUGTTYUNIT(dev)]) == NULL)
-		return (ENXIO);
-	return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
-#endif
-}
-
-int
-bugttyioctl(dev, cmd, data, flag, p)
-	dev_t dev;
-	u_long cmd;
-	caddr_t data;
-	int flag;
-	struct proc *p;
-{
-	int unit = BUGTTYUNIT(dev);
-	struct tty *tp = bugtty_tty[unit];
-	int error;
-
-	if (!tp)
-		return (ENXIO);
-
-	error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
-	if (error >= 0)
-		return (error);
-
-	error = ttioctl(tp, cmd, data, flag, p);
-	if (error >= 0)
-		return (error);
-
-	switch (cmd) {
-	case TIOCSBRK:
-		/* */
-		break;
-
-	case TIOCCBRK:
-		/* */
-		break;
-
-	case TIOCSDTR:
-		(void) bugttymctl(dev, TIOCM_DTR | TIOCM_RTS, DMBIS);
-		break;
-
-	case TIOCCDTR:
-		(void) bugttymctl(dev, TIOCM_DTR | TIOCM_RTS, DMBIC);
-		break;
-
-	case TIOCMSET:
-		(void) bugttymctl(dev, *(int *) data, DMSET);
-		break;
-
-	case TIOCMBIS:
-		(void) bugttymctl(dev, *(int *) data, DMBIS);
-		break;
-
-	case TIOCMBIC:
-		(void) bugttymctl(dev, *(int *) data, DMBIC);
-		break;
-
-	case TIOCMGET:
-		*(int *)data = bugttymctl(dev, 0, DMGET);
-		break;
-	case TIOCGFLAGS:
-		*(int *)data = SWFLAGS(dev);
-		break;
-	case TIOCSFLAGS:
-		error = suser(p, 0);
-		if (error != 0)
-			return (EPERM);
-
-		bugttyswflags = *(int *)data;
-		bugttyswflags &= /* only allow valid flags */
-		    (TIOCFLAG_SOFTCAR | TIOCFLAG_CLOCAL | TIOCFLAG_CRTSCTS);
-		break;
-	default:
-		return (ENOTTY);
-	}
-
-	return (0);
-}
-
-int
-bugttystop(tp, flag)
-	struct tty *tp;
-	int flag;
-{
-	int s;
-
-	s = spltty();
-	if (tp->t_state & TS_BUSY) {
-		if ((tp->t_state & TS_TTSTOP) == 0)
-			tp->t_state |= TS_FLUSH;
-	}
-	splx(s);
-	return (0);
-}
-
-/*
- * bugtty is the last possible choice for a console device.
- */
-void
-bugttycnprobe(cp)
-	struct consdev *cp;
-{
-	int maj;
-
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == bugttyopen)
-			break;
-
-	cp->cn_dev = makedev(maj, 0);
-	cp->cn_pri = CN_NORMAL;
-}
-
-void
-bugttycninit(cp)
-	struct consdev *cp;
-{
-	/* Nothing to do */
-}
-
-int
-bugttycngetc(dev)
-	dev_t dev;
-{
-	return (buginchr());
-}
-
-void
-bugttycnputc(dev, c)
-	dev_t dev;
-	char c;
-{
-	bugoutchr(c);
-}
diff --git a/sys/arch/mvme88k/dev/bugttyfunc.h b/sys/arch/mvme88k/dev/bugttyfunc.h
deleted file mode 100644
index fc2d6efed2b..00000000000
--- a/sys/arch/mvme88k/dev/bugttyfunc.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/*	$OpenBSD: bugttyfunc.h,v 1.2 2002/03/14 01:26:39 millert Exp $	*/
-
-#ifndef _MVME88K_BUGTTY_H_
-#define _MVME88K_BUGTTY_H_
-
-void bugtty_chkinput(void);
-
-#endif	/* _MVME88K_BUGTTY_H_ */
diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h
index 4401834e8e3..ce7340a33ee 100644
--- a/sys/arch/mvme88k/include/bugio.h
+++ b/sys/arch/mvme88k/include/bugio.h
@@ -1,21 +1,17 @@
-/*	$OpenBSD: bugio.h,v 1.15 2005/12/11 21:45:31 miod Exp $ */
+/*	$OpenBSD: bugio.h,v 1.16 2006/05/02 21:43:08 miod Exp $ */
 
 #ifndef __MACHINE_BUGIO_H__
 #define __MACHINE_BUGIO_H__
 
-#include <sys/cdefs.h>
-
 #include <machine/prom.h>
 
-void buginit(void);
-int buginstat(void);
-char buginchr(void);
-void bugoutchr(unsigned char);
-void bugoutstr(char *, char *);
-void bugrtcrd(struct mvmeprom_time *);
-void bugreturn(void);
-void bugbrdid(struct mvmeprom_brdid *);
-void bugdiskrd(struct mvmeprom_dskio *);
-int spin_cpu(cpuid_t, vaddr_t);
+void	buginit(void);
+char	buginchr(void);
+void	bugpcrlf(void);
+void	bugoutchr(int);
+void	bugreturn(void);
+void	bugbrdid(struct mvmeprom_brdid *);
+void	bugdiskrd(struct mvmeprom_dskio *);
+int	spin_cpu(cpuid_t, vaddr_t);
 
 #endif /* __MACHINE_BUGIO_H__ */
diff --git a/sys/arch/mvme88k/mvme88k/autoconf.c b/sys/arch/mvme88k/mvme88k/autoconf.c
index dad95054edb..cede04bd2cc 100644
--- a/sys/arch/mvme88k/mvme88k/autoconf.c
+++ b/sys/arch/mvme88k/mvme88k/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.33 2006/01/11 07:22:01 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.34 2006/05/02 21:43:09 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -60,7 +60,6 @@
 
 struct	device *parsedisk(char *, int, int, dev_t *);
 void	setroot(void);
-char	buginchr(void);
 void	dumpconf(void);
 int	findblkmajor(struct device *);
 struct device *getdisk(char *, int, int, dev_t *);
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index e48f7e2cabe..6db7e728dba 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.30 2004/02/10 01:31:21 millert Exp $	*/
+/*	$OpenBSD: conf.c,v 1.31 2006/05/02 21:43:09 miod Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -65,7 +65,6 @@ cdev_decl(xfs_dev);
 #include "vmes.h"
 #include "dart.h"
 #include "cl.h"
-#include "bugtty.h"
 #include "vx.h"
 
 #ifdef notyet
@@ -149,7 +148,7 @@ struct cdevsw	cdevsw[] =
 #endif /* notyet */
 	cdev_tty_init(NDART,dart),	/* 12: MVME188 serial (tty[a-b]) */
 	cdev_tty_init(NCL,cl),		/* 13: CL-CD1400 serial (tty0[0-3]) */
-	cdev_tty_init(NBUGTTY,bugtty),	/* 14: BUGtty (ttyB) */
+	cdev_notdef(),			/* 14 */
 	cdev_tty_init(NVX,vx),		/* 15: MVME332XT serial/lpt ttyv[0-7][a-i] */
 	cdev_notdef(),			/* 16 */
 	cdev_disk_init(NCCD,ccd),	/* 17: concatenated disk */
@@ -286,8 +285,6 @@ int nchrtoblktbl = sizeof(chrtoblktbl) / sizeof(chrtoblktbl[0]);
  */
 #include <dev/cons.h>
 
-#define bugttycnpollc	nullcnpollc
-cons_decl(bugtty);
 #define clcnpollc	nullcnpollc
 cons_decl(cl);
 #define dartcnpollc	nullcnpollc
@@ -300,8 +297,5 @@ struct	consdev constab[] = {
 #if NCL > 0
 	cons_init(cl),
 #endif
-#if NBUGTTY > 0
-	cons_init(bugtty),
-#endif
 	{ 0 },
 };
diff --git a/sys/arch/mvme88k/mvme88k/m188_machdep.c b/sys/arch/mvme88k/mvme88k/m188_machdep.c
index fcbe157badb..b67bf72e93a 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.18 2006/04/19 22:09:40 miod Exp $	*/
+/*	$OpenBSD: m188_machdep.c,v 1.19 2006/05/02 21:43:09 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -685,11 +685,6 @@ m188_init_clocks(void)
 	sysconintr_establish(SYSCV_TIMER1, &statclock_ih, "stat");
 }
 
-#include "bugtty.h"
-#if NBUGTTY > 0
-#include <mvme88k/dev/bugttyfunc.h>
-#endif
-
 int
 m188_clockintr(void *eframe)
 {
@@ -697,9 +692,6 @@ m188_clockintr(void *eframe)
 	write_cio(CIO_CSR1, CIO_GCB | CIO_CIP);  /* Ack the interrupt */
 
 	hardclock(eframe);
-#if NBUGTTY > 0
-	bugtty_chkinput();
-#endif /* NBUGTTY */
 
 	/* restart counter */
 	write_cio(CIO_CSR1, CIO_GCB | CIO_TCB | CIO_IE);
diff --git a/sys/arch/mvme88k/mvme88k/m1x7_machdep.c b/sys/arch/mvme88k/mvme88k/m1x7_machdep.c
index 67f73f24da9..8e0fa04da48 100644
--- a/sys/arch/mvme88k/mvme88k/m1x7_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m1x7_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m1x7_machdep.c,v 1.3 2006/04/27 20:21:19 miod Exp $ */
+/*	$OpenBSD: m1x7_machdep.c,v 1.4 2006/05/02 21:43:09 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1995 Theo de Raadt
@@ -149,11 +149,6 @@ m1x7_init_clocks(void)
 	pcctwointr_establish(PCC2V_TIMER2, &statclock_ih, "stat");
 }
 
-#include "bugtty.h"
-#if NBUGTTY > 0
-#include <mvme88k/dev/bugttyfunc.h>
-#endif
-
 /*
  * clockintr: ack intr and call hardclock
  */
@@ -163,9 +158,6 @@ m1x7_clockintr(void *eframe)
 	*(volatile u_int8_t *)(PCC2_BASE + PCCTWO_T1ICR) = PROF_RESET;
 
 	hardclock(eframe);
-#if NBUGTTY > 0
-	bugtty_chkinput();
-#endif /* NBUGTTY */
 
 	return (1);
 }
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index d58611a0b02..b543e266b2a 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.180 2006/04/26 20:49:58 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.181 2006/05/02 21:43:09 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -195,9 +195,6 @@ extern struct user *proc0paddr;
 
 /*
  * This is to fake out the console routines, while booting.
- * We could use directly the bugtty console, but we want to be able to
- * configure a kernel without bugtty since we do not necessarily need a
- * full-blown console driver.
  */
 cons_decl(boot);
 #define bootcnpollc nullcnpollc
@@ -1161,9 +1158,10 @@ bootcnputc(dev, c)
 	dev_t dev;
 	int c;
 {
-	if ((char)c == '\n')
-		bugoutchr('\r');
-	bugoutchr((char)c);
+	if (c == '\n')
+		bugpcrlf();
+	else
+		bugoutchr(c);
 }
 
 #define SIGSYS_MAX	501