- Merge changes from pxacom back into the common com driver.

Changes to the common com driver (partly from NetBSD):
- Multiply before divide in comspeed() to avoid overflow (from NetBSD).
- Don't call getc() and send -1 if the output queue is empty.
- Take UART clock frequency as a parameter instead of using COM_FREQ.

ok deraadt@

5 files changed, 5 insertions, 2140 deletions

diff --git a/sys/arch/arm/xscale/pxa2x0_com.c b/sys/arch/arm/xscale/pxa2x0_com.c
index b0fb7e6e0de..dab4d574eff 100644
--- a/sys/arch/arm/xscale/pxa2x0_com.c
+++ b/sys/arch/arm/xscale/pxa2x0_com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_com.c,v 1.4 2005/03/22 15:52:16 drahn Exp $ */
+/*	$OpenBSD: pxa2x0_com.c,v 1.5 2005/05/27 18:42:15 uwe Exp $ */
 /*	$NetBSD: pxa2x0_com.c,v 1.4 2003/07/15 00:24:55 lukem Exp $	*/
 
 /*
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_com.c,v 1.4 2003/07/15 00:24:55 lukem Exp $")
 #include <machine/intr.h>
 #include <machine/bus.h>
 
-#include <arm/xscale/pxacomreg.h>
-#include <arm/xscale/pxacomvar.h>
+#include <dev/ic/comreg.h>
+#include <dev/ic/comvar.h>
 
 #include <arm/xscale/pxa2x0reg.h>
 #include <arm/xscale/pxa2x0var.h>
@@ -133,6 +133,7 @@ pxauart_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_iot = &pxa2x0_a4x_bs_tag;	/* XXX: This sucks */
 	sc->sc_iobase = pxa->pxa_addr;
 	sc->sc_frequency = PXA2X0_COM_FREQ;
+	sc->sc_uarttype = COM_UART_PXA2X0;
 
 #if 0
 	if (com_is_console(sc->sc_iot, sc->sc_iobase, &sc->sc_ioh) == 0 &&
diff --git a/sys/arch/arm/xscale/pxacom.c b/sys/arch/arm/xscale/pxacom.c
deleted file mode 100644
index 8314358afd7..00000000000
--- a/sys/arch/arm/xscale/pxacom.c
+++ /dev/null
@@ -1,1757 +0,0 @@
-/*	$OpenBSD: pxacom.c,v 1.2 2005/05/09 15:25:29 uwe Exp $	*/
-/*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
-
-/*
- * Copyright (c) 1997 - 1999, Jason Downs.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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.
- */
-/*-
- * Copyright (c) 1993, 1994, 1995, 1996
- *	Charles M. Hannum.  All rights reserved.
- * Copyright (c) 1991 The Regents of the University of California.
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
- *
- *	@(#)com.c	7.5 (Berkeley) 5/16/91
- */
-
-/*
- * COM driver, based on HP dca driver
- * uses National Semiconductor NS16450/NS16550AF UART
- */
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/select.h>
-#include <sys/tty.h>
-#include <sys/proc.h>
-#include <sys/user.h>
-#include <sys/conf.h>
-#include <sys/file.h>
-#include <sys/uio.h>
-#include <sys/kernel.h>
-#include <sys/syslog.h>
-#include <sys/device.h>
-#include <sys/vnode.h>
-#ifdef DDB
-#include <ddb/db_var.h>
-#endif
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/cons.h>
-
-#include <arm/xscale/pxacomreg.h>
-#include <arm/xscale/pxacomvar.h>
-#include <dev/ic/ns16550reg.h>
-#define	com_lcr	com_cfcr
-
-#ifdef COM_PXA2X0
-#define com_isr 8
-#define ISR_SEND	(ISR_RXPL | ISR_XMODE | ISR_XMITIR)
-#define ISR_RECV	(ISR_RXPL | ISR_XMODE | ISR_RCVEIR)
-#endif
-
-#ifdef __zaurus__
-void	scoop_set_irled(int);	/* XXX */
-#endif
-
-#include "com.h"
-
-/* XXX: These belong elsewhere */
-cdev_decl(com);
-
-static u_char tiocm_xxx2mcr(int);
-
-void	compwroff(struct com_softc *);
-void	com_enable_debugport(struct com_softc *);
-
-struct cfdriver com_cd = {
-	NULL, "com", DV_TTY
-};
-
-int	comdefaultrate = TTYDEF_SPEED;
-int	comconsinit;
-bus_addr_t comconsaddr;
-bus_addr_t comsiraddr;
-int	comconsattached;
-int	comconsfreq;
-bus_space_tag_t comconsiot;
-bus_space_handle_t comconsioh;
-tcflag_t comconscflag = TTYDEF_CFLAG;
-
-int	commajor;
-
-#ifdef KGDB
-#include <sys/kgdb.h>
-
-bus_addr_t com_kgdb_addr;
-bus_space_tag_t com_kgdb_iot;
-bus_space_handle_t com_kgdb_ioh;
-
-int    com_kgdb_getc(void *);
-void   com_kgdb_putc(void *, int);
-#endif /* KGDB */
-
-#define	DEVUNIT(x)	(minor(x) & 0x7f)
-#define	DEVCUA(x)	(minor(x) & 0x80)
-
-
-int
-comspeed(freq, speed)
-	long freq;
-	long speed;
-{
-#define	divrnd(n, q)	(((n)*2/(q)+1)/2)	/* divide and round off */
-
-	int x, err;
-
-	if (speed == 0)
-		return 0;
-	if (speed < 0)
-		return -1;
-	x = divrnd((freq / 16), speed);
-	if (x <= 0)
-		return -1;
-	err = divrnd((freq / 16) * 1000, speed * x) - 1000;
-	if (err < 0)
-		err = -err;
-	if (err > COM_TOLERANCE)
-		return -1;
-	return x;
-
-#undef	divrnd
-}
-
-int
-comprobe1(iot, ioh)
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-{
-	int i, k;
-
-	/* force access to id reg */
-	bus_space_write_1(iot, ioh, com_lcr, 0);
-	bus_space_write_1(iot, ioh, com_iir, 0);
-	for (i = 0; i < 32; i++) {
-		k = bus_space_read_1(iot, ioh, com_iir);
-		if (k & 0x38) {
-			bus_space_read_1(iot, ioh, com_data); /* cleanup */
-		} else
-			break;
-	}
-	if (i >= 32)
-		return 0;
-
-	return 1;
-}
-
-void
-com_attach_subr(sc)
-	struct com_softc *sc;
-{
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-	u_int8_t lcr;
-
-#ifdef COM_PXA2X0
-	sc->sc_ier = IER_EUART;
-#else
-	sc->sc_ier = 0;
-#endif
-	/* disable interrupts */
-	bus_space_write_1(iot, ioh, com_ier, sc->sc_ier);
-
-	if (sc->sc_iobase == comconsaddr) {
-		comconsattached = 1;
-
-		/*
-		 * Need to reset baud rate, etc. of next print so reset
-		 * comconsinit.  Also make sure console is always "hardwired".
-		 */
-		delay(10000);			/* wait for output to finish */
-		SET(sc->sc_hwflags, COM_HW_CONSOLE);
-		SET(sc->sc_swflags, COM_SW_SOFTCAR);
-	}
-
-	/*
-	 * Probe for all known forms of UART.
-	 */
-	lcr = bus_space_read_1(iot, ioh, com_lcr);
-	bus_space_write_1(iot, ioh, com_lcr, 0xbf);
-	bus_space_write_1(iot, ioh, com_efr, 0);
-	bus_space_write_1(iot, ioh, com_lcr, 0);
-
-	bus_space_write_1(iot, ioh, com_fifo, FIFO_ENABLE);
-	delay(100);
-
-	switch(bus_space_read_1(iot, ioh, com_iir) >> 6) {
-	case 0:
-		sc->sc_uarttype = COM_UART_16450;
-		break;
-	case 2:
-		sc->sc_uarttype = COM_UART_16550;
-		break;
-	case 3:
-		sc->sc_uarttype = COM_UART_16550A;
-		break;
-	default:
-		sc->sc_uarttype = COM_UART_UNKNOWN;
-		break;
-	}
-
-	if (sc->sc_uarttype == COM_UART_16550A) { /* Probe for ST16650s */
-		bus_space_write_1(iot, ioh, com_lcr, lcr | LCR_DLAB);
-		if (bus_space_read_1(iot, ioh, com_efr) == 0) {
-			sc->sc_uarttype = COM_UART_ST16650;
-		} else {
-			bus_space_write_1(iot, ioh, com_lcr, 0xbf);
-			if (bus_space_read_1(iot, ioh, com_efr) == 0)
-				sc->sc_uarttype = COM_UART_ST16650V2;
-		}
-	}
-
-	if (sc->sc_uarttype == COM_UART_16550A) { /* Probe for TI16750s */
-		bus_space_write_1(iot, ioh, com_lcr, lcr | LCR_DLAB);
-		bus_space_write_1(iot, ioh, com_fifo,
-		    FIFO_ENABLE | FIFO_ENABLE_64BYTE);
-		if ((bus_space_read_1(iot, ioh, com_iir) >> 5) == 7) {
-#if 0
-			bus_space_write_1(iot, ioh, com_lcr, 0);
-			if ((bus_space_read_1(iot, ioh, com_iir) >> 5) == 6)
-#endif
-				sc->sc_uarttype = COM_UART_TI16750;
-		}
-		bus_space_write_1(iot, ioh, com_fifo, FIFO_ENABLE);
-	}
-	bus_space_write_1(iot, ioh, com_lcr, lcr);
-	if (sc->sc_uarttype == COM_UART_16450) { /* Probe for 8250 */
-		u_int8_t scr0, scr1, scr2;
-
-		scr0 = bus_space_read_1(iot, ioh, com_scratch);
-		bus_space_write_1(iot, ioh, com_scratch, 0xa5);
-		scr1 = bus_space_read_1(iot, ioh, com_scratch);
-		bus_space_write_1(iot, ioh, com_scratch, 0x5a);
-		scr2 = bus_space_read_1(iot, ioh, com_scratch);
-		bus_space_write_1(iot, ioh, com_scratch, scr0);
-
-		if ((scr1 != 0xa5) || (scr2 != 0x5a))
-			sc->sc_uarttype = COM_UART_8250;
-	}
-
-	/*
-	 * Print UART type and initialize ourself.
-	 */
-	sc->sc_fifolen = 1;	/* default */
-	switch (sc->sc_uarttype) {
-	case COM_UART_UNKNOWN:
-		printf(": unknown uart\n");
-		break;
-	case COM_UART_8250:
-		printf(": ns8250, no fifo\n");
-		break;
-	case COM_UART_16450:
-		printf(": ns16450, no fifo\n");
-		break;
-	case COM_UART_16550:
-		printf(": ns16550, no working fifo\n");
-		break;
-	case COM_UART_16550A:
-		printf(": ns16550a, 16 byte fifo");
-		SET(sc->sc_hwflags, COM_HW_FIFO);
-		sc->sc_fifolen = 16;
-		if (sc->sc_iobase == comsiraddr) {
-			SET(sc->sc_hwflags, COM_HW_SIR);
-			printf(" (SIR)");
-		}
-		printf("\n");
-		break;
-	case COM_UART_ST16650:
-		printf(": st16650, no working fifo\n");
-		break;
-	case COM_UART_ST16650V2:
-		printf(": st16650, 32 byte fifo\n");
-		SET(sc->sc_hwflags, COM_HW_FIFO);
-		sc->sc_fifolen = 32;
-		break;
-	case COM_UART_TI16750:
-		printf(": ti16750, 64 byte fifo\n");
-		SET(sc->sc_hwflags, COM_HW_FIFO);
-		sc->sc_fifolen = 64;
-		break;
-	default:
-		panic("comattach: bad fifo type");
-	}
-
-	/* clear and disable fifo */
-	bus_space_write_1(iot, ioh, com_fifo, FIFO_RCV_RST |
-	    FIFO_XMT_RST);
-	(void)bus_space_read_1(iot, ioh, com_data);
-	bus_space_write_1(iot, ioh, com_fifo, 0);
-
-	sc->sc_mcr = 0;
-	bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-
-#ifdef KGDB
-	/*
-	 * Allow kgdb to "take over" this port.  If this is
-	 * the kgdb device, it has exclusive use.
-	 */
-
-	if (iot == com_kgdb_iot && sc->sc_iobase == com_kgdb_addr &&
-	    !ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
-		printf("%s: kgdb\n", sc->sc_dev.dv_xname);
-		SET(sc->sc_hwflags, COM_HW_KGDB);
-	}
-#endif /* KGDB */
-
-	if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
-		int maj;
-
-		/* locate the major number */
-		for (maj = 0; maj < nchrdev; maj++)
-			if (cdevsw[maj].d_open == comopen)
-				break;
-
-		if (maj < nchrdev && cn_tab->cn_dev == NODEV)
-			cn_tab->cn_dev = makedev(maj, sc->sc_dev.dv_unit);
-
-		printf("%s: console\n", sc->sc_dev.dv_xname);
-	}
-
-	timeout_set(&sc->sc_diag_tmo, comdiag, sc);
-	timeout_set(&sc->sc_dtr_tmo, com_raisedtr, sc);
-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
-	sc->sc_si = softintr_establish(IPL_TTY, comsoft, sc);
-	if (sc->sc_si == NULL)
-		panic("%s: can't establish soft interrupt.", sc->sc_dev.dv_xname);
-#else
-	timeout_set(&sc->sc_comsoft_tmo, comsoft, sc);
-#endif
-
-	/*
-	 * If there are no enable/disable functions, assume the device
-	 * is always enabled.
-	 */
-	if (!sc->enable)
-		sc->enabled = 1;
-
-	if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE|COM_HW_KGDB))
-		com_enable_debugport(sc);
-}
-
-void
-com_enable_debugport(sc)
-	struct com_softc *sc;
-{
-	int s;
-
-	/* Turn on line break interrupt, set carrier. */
-	s = splhigh();
-#ifdef KGDB
-	SET(sc->sc_ier, IER_ERXRDY);
-#ifdef COM_PXA2X0
-	sc->sc_ier |= IER_EUART | IER_ERXTOUT;
-#endif
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, com_ier, sc->sc_ier);
-#endif
-	SET(sc->sc_mcr, MCR_DTR | MCR_RTS | MCR_IENABLE);
-
-#define PXA_MCR  (MCR_DTR | MCR_RTS)
-#ifdef COM_PXA2X0
-	CLR(sc->sc_mcr, PXA_MCR);
-#endif
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, com_mcr, sc->sc_mcr);
-
-	splx(s);
-}
-
-int
-com_detach(self, flags)
-	struct device *self;
-	int flags;
-{
-	struct com_softc *sc = (struct com_softc *)self;
-	int maj, mn;
-
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == comopen)
-			break;
-
-	/* Nuke the vnodes for any open instances. */
-	mn = self->dv_unit;
-	vdevgone(maj, mn, mn, VCHR);
-
-	/* XXX a symbolic constant for the cua bit would be nicer. */
-	mn |= 0x80;
-	vdevgone(maj, mn, mn, VCHR);
-
-	/* Detach and free the tty. */
-	if (sc->sc_tty) {
-		ttyfree(sc->sc_tty);
-	}
-
-	timeout_del(&sc->sc_dtr_tmo);
-	timeout_del(&sc->sc_diag_tmo);
-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
-	softintr_disestablish(sc->sc_si);
-#else
-	timeout_del(&sc->sc_comsoft_tmo);
-#endif
-
-	return (0);
-}
-
-int
-com_activate(self, act)
-	struct device *self;
-	enum devact act;
-{
-	struct com_softc *sc = (struct com_softc *)self;
-	int s, rv = 0;
-
-	s = spltty();
-	switch (act) {
-	case DVACT_ACTIVATE:
-		rv = EOPNOTSUPP;
-		break;
-
-	case DVACT_DEACTIVATE:
-#ifdef KGDB
-		if (sc->sc_hwflags & (COM_HW_CONSOLE|COM_HW_KGDB)) {
-#else
-		if (sc->sc_hwflags & COM_HW_CONSOLE) {
-#endif /* KGDB */
-			rv = EBUSY;
-			break;
-		}
-
-		if (sc->disable != NULL && sc->enabled != 0) {
-			(*sc->disable)(sc);
-			sc->enabled = 0;
-		}
-		break;
-	}
-	splx(s);
-	return (rv);
-}
-
-int
-comopen(dev, flag, mode, p)
-	dev_t dev;
-	int flag, mode;
-	struct proc *p;
-{
-	int unit = DEVUNIT(dev);
-	struct com_softc *sc;
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	struct tty *tp;
-	int s;
-	int error = 0;
-
-	if (unit >= com_cd.cd_ndevs)
-		return ENXIO;
-	sc = com_cd.cd_devs[unit];
-	if (!sc)
-		return ENXIO;
-
-#ifdef KGDB
-	/*
-	 * If this is the kgdb port, no other use is permitted.
-	 */
-	if (ISSET(sc->sc_hwflags, COM_HW_KGDB))
-		return (EBUSY);
-#endif /* KGDB */
-
-	s = spltty();
-	if (!sc->sc_tty) {
-		tp = sc->sc_tty = ttymalloc();
-	} else
-		tp = sc->sc_tty;
-	splx(s);
-
-	tp->t_oproc = comstart;
-	tp->t_param = comparam;
-	tp->t_dev = dev;
-	if (!ISSET(tp->t_state, TS_ISOPEN)) {
-		SET(tp->t_state, TS_WOPEN);
-		ttychars(tp);
-		tp->t_iflag = TTYDEF_IFLAG;
-		tp->t_oflag = TTYDEF_OFLAG;
-		if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE))
-			tp->t_cflag = comconscflag;
-		else
-			tp->t_cflag = TTYDEF_CFLAG;
-		if (ISSET(sc->sc_swflags, COM_SW_CLOCAL))
-			SET(tp->t_cflag, CLOCAL);
-		if (ISSET(sc->sc_swflags, COM_SW_CRTSCTS))
-			SET(tp->t_cflag, CRTSCTS);
-		if (ISSET(sc->sc_swflags, COM_SW_MDMBUF))
-			SET(tp->t_cflag, MDMBUF);
-		tp->t_lflag = TTYDEF_LFLAG;
-		tp->t_ispeed = tp->t_ospeed = comdefaultrate;
-
-		s = spltty();
-
-		sc->sc_initialize = 1;
-		comparam(tp, &tp->t_termios);
-		ttsetwater(tp);
-
-#ifndef __HAVE_GENERIC_SOFT_INTERRUPTS
-		timeout_add(&sc->sc_comsoft_tmo, 1);
-#endif
-
-		sc->sc_ibufp = sc->sc_ibuf = sc->sc_ibufs[0];
-		sc->sc_ibufhigh = sc->sc_ibuf + COM_IHIGHWATER;
-		sc->sc_ibufend = sc->sc_ibuf + COM_IBUFSIZE;
-
-		iot = sc->sc_iot;
-		ioh = sc->sc_ioh;
-
-		/*
-		 * Wake up the sleepy heads.
-		 */
-		switch (sc->sc_uarttype) {
-		case COM_UART_ST16650:
-		case COM_UART_ST16650V2:
-			bus_space_write_1(iot, ioh, com_lcr, 0xbf);
-			bus_space_write_1(iot, ioh, com_efr, EFR_ECB);
-			bus_space_write_1(iot, ioh, com_ier, 0);
-			bus_space_write_1(iot, ioh, com_efr, 0);
-			bus_space_write_1(iot, ioh, com_lcr, 0);
-			break;
-		case COM_UART_TI16750:
-			bus_space_write_1(iot, ioh, com_ier, 0);
-			break;
-		}
-
-		if (ISSET(sc->sc_hwflags, COM_HW_FIFO)) {
-			u_int8_t fifo = FIFO_ENABLE|FIFO_RCV_RST|FIFO_XMT_RST;
-			u_int8_t lcr;
-
-			if (tp->t_ispeed <= 1200)
-				fifo |= FIFO_TRIGGER_1;
-			else
-				fifo |= FIFO_TRIGGER_8;
-			if (sc->sc_uarttype == COM_UART_TI16750) {
-				fifo |= FIFO_ENABLE_64BYTE;
-				lcr = bus_space_read_1(iot, ioh, com_lcr);
-				bus_space_write_1(iot, ioh, com_lcr,
-				    lcr | LCR_DLAB);
-			}
-
-			/*
-			 * (Re)enable and drain FIFOs.
-			 *
-			 * Certain SMC chips cause problems if the FIFOs are
-			 * enabled while input is ready. Turn off the FIFO
-			 * if necessary to clear the input. Test the input
-			 * ready bit after enabling the FIFOs to handle races
-			 * between enabling and fresh input.
-			 *
-			 * Set the FIFO threshold based on the receive speed.
-			 */
-			for (;;) {
-				bus_space_write_1(iot, ioh, com_fifo, 0);
-				delay(100);
-				(void) bus_space_read_1(iot, ioh, com_data);
-				bus_space_write_1(iot, ioh, com_fifo, fifo |
-				    FIFO_RCV_RST | FIFO_XMT_RST);
-				delay(100);
-				if(!ISSET(bus_space_read_1(iot, ioh,
-				    com_lsr), LSR_RXRDY))
-					break;
-			}
-			if (sc->sc_uarttype == COM_UART_TI16750)
-				bus_space_write_1(iot, ioh, com_lcr, lcr);
-		}
-
-		/* flush any pending I/O */
-		while (ISSET(bus_space_read_1(iot, ioh, com_lsr), LSR_RXRDY))
-			(void) bus_space_read_1(iot, ioh, com_data);
-		/* you turn me on, baby */
-		sc->sc_mcr = MCR_DTR | MCR_RTS;
-#ifdef COM_PXA2X0
-		CLR(sc->sc_mcr, PXA_MCR);
-#endif
-		if (!ISSET(sc->sc_hwflags, COM_HW_NOIEN))
-			SET(sc->sc_mcr, MCR_IENABLE);
-		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-		sc->sc_ier = IER_ERXRDY | IER_ERLS | IER_EMSC;
-#ifdef COM_PXA2X0
-		sc->sc_ier |= IER_EUART | IER_ERXTOUT;
-#endif  
-		bus_space_write_1(iot, ioh, com_ier, sc->sc_ier);
-
-		sc->sc_msr = bus_space_read_1(iot, ioh, com_msr);
-		if (ISSET(sc->sc_swflags, COM_SW_SOFTCAR) || DEVCUA(dev) ||
-		    ISSET(sc->sc_msr, MSR_DCD) || ISSET(tp->t_cflag, MDMBUF))
-			SET(tp->t_state, TS_CARR_ON);
-		else
-			CLR(tp->t_state, TS_CARR_ON);
-#ifdef COM_PXA2X0
-		if (ISSET(sc->sc_hwflags, COM_HW_SIR)) {
-			bus_space_write_1(iot, ioh, com_isr, ISR_RECV);
-#ifdef __zaurus__
-			scoop_set_irled(1);
-#endif
-		}
-#endif
-	} else if (ISSET(tp->t_state, TS_XCLUDE) && p->p_ucred->cr_uid != 0)
-		return EBUSY;
-	else
-		s = spltty();
-
-	if (DEVCUA(dev)) {
-		if (ISSET(tp->t_state, TS_ISOPEN)) {
-			/* Ah, but someone already is dialed in... */
-			splx(s);
-			return EBUSY;
-		}
-		sc->sc_cua = 1;		/* We go into CUA mode */
-	} else {
-		/* tty (not cua) device; wait for carrier if necessary */
-		if (ISSET(flag, O_NONBLOCK)) {
-			if (sc->sc_cua) {
-				/* Opening TTY non-blocking... but the CUA is busy */
-				splx(s);
-				return EBUSY;
-			}
-		} else {
-			while (sc->sc_cua ||
-			    (!ISSET(tp->t_cflag, CLOCAL) &&
-				!ISSET(tp->t_state, TS_CARR_ON))) {
-				SET(tp->t_state, TS_WOPEN);
-				error = ttysleep(tp, &tp->t_rawq, TTIPRI | PCATCH, ttopen, 0);
-				/*
-				 * If TS_WOPEN has been reset, that means the cua device
-				 * has been closed.  We don't want to fail in that case,
-				 * so just go around again.
-				 */
-				if (error && ISSET(tp->t_state, TS_WOPEN)) {
-					CLR(tp->t_state, TS_WOPEN);
-					if (!sc->sc_cua && !ISSET(tp->t_state, TS_ISOPEN))
-						compwroff(sc);
-					splx(s);
-					return error;
-				}
-			}
-		}
-	}
-	splx(s);
-
-	return (*linesw[tp->t_line].l_open)(dev, tp);
-}
-
-int
-comclose(dev, flag, mode, p)
-	dev_t dev;
-	int flag, mode;
-	struct proc *p;
-{
-	int unit = DEVUNIT(dev);
-	struct com_softc *sc = com_cd.cd_devs[unit];
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-	struct tty *tp = sc->sc_tty;
-	int s;
-
-	/* XXX This is for cons.c. */
-	if (!ISSET(tp->t_state, TS_ISOPEN))
-		return 0;
-
-	(*linesw[tp->t_line].l_close)(tp, flag);
-	s = spltty();
-	if (ISSET(tp->t_state, TS_WOPEN)) {
-		/* tty device is waiting for carrier; drop dtr then re-raise */
-		CLR(sc->sc_mcr, MCR_DTR | MCR_RTS);
-		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-		timeout_add(&sc->sc_dtr_tmo, hz * 2);
-	} else {
-		/* no one else waiting; turn off the uart */
-		compwroff(sc);
-	}
-	CLR(tp->t_state, TS_BUSY | TS_FLUSH);
-#ifndef __HAVE_GENERIC_SOFT_INTERRUPTS
-	timeout_del(&sc->sc_comsoft_tmo);
-#endif
-	sc->sc_cua = 0;
-	splx(s);
-	ttyclose(tp);
-
-#ifdef notyet /* XXXX */
-	if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
-		ttyfree(tp);
-		sc->sc_tty = 0;
-	}
-#endif
-	return 0;
-}
-
-void
-compwroff(sc)
-	struct com_softc *sc;
-{
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-	struct tty *tp = sc->sc_tty;
-
-	CLR(sc->sc_lcr, LCR_SBREAK);
-	bus_space_write_1(iot, ioh, com_lcr, sc->sc_lcr);
-	bus_space_write_1(iot, ioh, com_ier, 0);
-	if (ISSET(tp->t_cflag, HUPCL) &&
-	    !ISSET(sc->sc_swflags, COM_SW_SOFTCAR)) {
-		/* XXX perhaps only clear DTR */
-		sc->sc_mcr = 0;
-		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-	}
-
-	/*
-	 * Turn FIFO off; enter sleep mode if possible.
-	 */
-	bus_space_write_1(iot, ioh, com_fifo, 0);
-	delay(100);
-	(void) bus_space_read_1(iot, ioh, com_data);
-	delay(100);
-	bus_space_write_1(iot, ioh, com_fifo,
-			  FIFO_RCV_RST | FIFO_XMT_RST);
-
-	switch (sc->sc_uarttype) {
-	case COM_UART_ST16650:
-	case COM_UART_ST16650V2:
-		bus_space_write_1(iot, ioh, com_lcr, 0xbf);
-		bus_space_write_1(iot, ioh, com_efr, EFR_ECB);
-		bus_space_write_1(iot, ioh, com_ier, IER_SLEEP);
-		bus_space_write_1(iot, ioh, com_lcr, 0);
-		break;
-	case COM_UART_TI16750:
-		bus_space_write_1(iot, ioh, com_ier, IER_SLEEP);
-		break;
-	}
-
-#if defined(COM_PXA2X0) && defined(__zaurus__)
-	if (ISSET(sc->sc_hwflags, COM_HW_SIR))
-		scoop_set_irled(0);
-#endif
-}
-
-void
-com_raisedtr(arg)
-	void *arg;
-{
-	struct com_softc *sc = arg;
-
-	SET(sc->sc_mcr, MCR_DTR | MCR_RTS);
-#ifdef COM_PXA2X0
-	CLR(sc->sc_mcr, PXA_MCR);
-#endif
-	bus_space_write_1(sc->sc_iot, sc->sc_ioh, com_mcr, sc->sc_mcr);
-}
-
-int
-comread(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
-{
-	struct com_softc *sc = com_cd.cd_devs[DEVUNIT(dev)];
-	struct tty *tp = sc->sc_tty;
-
-	return ((*linesw[tp->t_line].l_read)(tp, uio, flag));
-}
-
-int
-comwrite(dev, uio, flag)
-	dev_t dev;
-	struct uio *uio;
-	int flag;
-{
-	struct com_softc *sc = com_cd.cd_devs[DEVUNIT(dev)];
-	struct tty *tp = sc->sc_tty;
-
-	return ((*linesw[tp->t_line].l_write)(tp, uio, flag));
-}
-
-struct tty *
-comtty(dev)
-	dev_t dev;
-{
-	struct com_softc *sc = com_cd.cd_devs[DEVUNIT(dev)];
-	struct tty *tp = sc->sc_tty;
-
-	return (tp);
-}
-
-static u_char
-tiocm_xxx2mcr(data)
-	int data;
-{
-	u_char m = 0;
-
-	if (ISSET(data, TIOCM_DTR))
-		SET(m, MCR_DTR);
-	if (ISSET(data, TIOCM_RTS))
-		SET(m, MCR_RTS);
-#ifdef COM_PXA2X0
-	CLR(m, PXA_MCR);
-#endif
-	return m;
-}
-
-int
-comioctl(dev, cmd, data, flag, p)
-	dev_t dev;
-	u_long cmd;
-	caddr_t data;
-	int flag;
-	struct proc *p;
-{
-	int unit = DEVUNIT(dev);
-	struct com_softc *sc = com_cd.cd_devs[unit];
-	struct tty *tp = sc->sc_tty;
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-	int error;
-
-	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:
-		SET(sc->sc_lcr, LCR_SBREAK);
-		bus_space_write_1(iot, ioh, com_lcr, sc->sc_lcr);
-		break;
-	case TIOCCBRK:
-		CLR(sc->sc_lcr, LCR_SBREAK);
-		bus_space_write_1(iot, ioh, com_lcr, sc->sc_lcr);
-		break;
-	case TIOCSDTR:
-		SET(sc->sc_mcr, sc->sc_dtr);
-#ifdef COM_PXA2X0
-		CLR(sc->sc_mcr, PXA_MCR);
-#endif
-		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-		break;
-	case TIOCCDTR:
-		CLR(sc->sc_mcr, sc->sc_dtr);
-		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-		break;
-	case TIOCMSET:
-		CLR(sc->sc_mcr, MCR_DTR | MCR_RTS);
-	case TIOCMBIS:
-		SET(sc->sc_mcr, tiocm_xxx2mcr(*(int *)data));
-		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-		break;
-	case TIOCMBIC:
-		CLR(sc->sc_mcr, tiocm_xxx2mcr(*(int *)data));
-		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-		break;
-	case TIOCMGET: {
-		u_char m;
-		int bits = 0;
-
-		m = sc->sc_mcr;
-		if (ISSET(m, MCR_DTR))
-			SET(bits, TIOCM_DTR);
-		if (ISSET(m, MCR_RTS))
-			SET(bits, TIOCM_RTS);
-		m = sc->sc_msr;
-		if (ISSET(m, MSR_DCD))
-			SET(bits, TIOCM_CD);
-		if (ISSET(m, MSR_CTS))
-			SET(bits, TIOCM_CTS);
-		if (ISSET(m, MSR_DSR))
-			SET(bits, TIOCM_DSR);
-		if (ISSET(m, MSR_RI | MSR_TERI))
-			SET(bits, TIOCM_RI);
-		if (bus_space_read_1(iot, ioh, com_ier))
-			SET(bits, TIOCM_LE);
-		*(int *)data = bits;
-		break;
-	}
-	case TIOCGFLAGS: {
-		int driverbits, userbits = 0;
-
-		driverbits = sc->sc_swflags;
-		if (ISSET(driverbits, COM_SW_SOFTCAR))
-			SET(userbits, TIOCFLAG_SOFTCAR);
-		if (ISSET(driverbits, COM_SW_CLOCAL))
-			SET(userbits, TIOCFLAG_CLOCAL);
-		if (ISSET(driverbits, COM_SW_CRTSCTS))
-			SET(userbits, TIOCFLAG_CRTSCTS);
-		if (ISSET(driverbits, COM_SW_MDMBUF))
-			SET(userbits, TIOCFLAG_MDMBUF);
-		if (ISSET(driverbits, COM_SW_PPS))
-			SET(userbits, TIOCFLAG_PPS);
-
-		*(int *)data = userbits;
-		break;
-	}
-	case TIOCSFLAGS: {
-		int userbits, driverbits = 0;
-
-		error = suser(p, 0);
-		if (error != 0)
-			return(EPERM);
-
-		userbits = *(int *)data;
-		if (ISSET(userbits, TIOCFLAG_SOFTCAR) ||
-		    ISSET(sc->sc_hwflags, COM_HW_CONSOLE))
-			SET(driverbits, COM_SW_SOFTCAR);
-		if (ISSET(userbits, TIOCFLAG_CLOCAL))
-			SET(driverbits, COM_SW_CLOCAL);
-		if (ISSET(userbits, TIOCFLAG_CRTSCTS))
-			SET(driverbits, COM_SW_CRTSCTS);
-		if (ISSET(userbits, TIOCFLAG_MDMBUF))
-			SET(driverbits, COM_SW_MDMBUF);
-		if (ISSET(userbits, TIOCFLAG_PPS))
-			SET(driverbits, COM_SW_PPS);
-
-		sc->sc_swflags = driverbits;
-		break;
-	}
-	default:
-		return ENOTTY;
-	}
-
-	return 0;
-}
-
-/* already called at spltty */
-int
-comparam(tp, t)
-	struct tty *tp;
-	struct termios *t;
-{
-	struct com_softc *sc = com_cd.cd_devs[DEVUNIT(tp->t_dev)];
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-	int ospeed = comspeed(sc->sc_frequency, t->c_ospeed);
-	u_char lcr;
-	tcflag_t oldcflag;
-
-	/* check requested parameters */
-	if (ospeed < 0 || (t->c_ispeed && t->c_ispeed != t->c_ospeed))
-		return EINVAL;
-
-	lcr = ISSET(sc->sc_lcr, LCR_SBREAK);
-
-	switch (ISSET(t->c_cflag, CSIZE)) {
-	case CS5:
-		SET(lcr, LCR_5BITS);
-		break;
-	case CS6:
-		SET(lcr, LCR_6BITS);
-		break;
-	case CS7:
-		SET(lcr, LCR_7BITS);
-		break;
-	case CS8:
-		SET(lcr, LCR_8BITS);
-		break;
-	}
-	if (ISSET(t->c_cflag, PARENB)) {
-		SET(lcr, LCR_PENAB);
-		if (!ISSET(t->c_cflag, PARODD))
-			SET(lcr, LCR_PEVEN);
-	}
-	if (ISSET(t->c_cflag, CSTOPB))
-		SET(lcr, LCR_STOPB);
-
-	sc->sc_lcr = lcr;
-
-	if (ospeed == 0) {
-		CLR(sc->sc_mcr, MCR_DTR);
-		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-	}
-
-	/*
-	 * Set the FIFO threshold based on the receive speed, if we are
-	 * changing it.
-	 */
-	if (sc->sc_initialize || (tp->t_ispeed != t->c_ispeed)) {
-		sc->sc_initialize = 0;
-
-		if (ospeed != 0) {
-			/*
-			 * Make sure the transmit FIFO is empty before
-			 * proceeding.  If we don't do this, some revisions
-			 * of the UART will hang.  Interestingly enough,
-			 * even if we do this while the last character is
-			 * still being pushed out, they don't hang.  This
-			 * seems good enough.
-			 */
-			while (ISSET(tp->t_state, TS_BUSY)) {
-				int error;
-
-				++sc->sc_halt;
-				error = ttysleep(tp, &tp->t_outq,
-				    TTOPRI | PCATCH, "comprm", 0);
-				--sc->sc_halt;
-				if (error) {
-					comstart(tp);
-					return (error);
-				}
-			}
-
-			bus_space_write_1(iot, ioh, com_lcr, lcr | LCR_DLAB);
-			bus_space_write_1(iot, ioh, com_dlbl, ospeed);
-			bus_space_write_1(iot, ioh, com_dlbh, ospeed >> 8);
-			bus_space_write_1(iot, ioh, com_lcr, lcr);
-			SET(sc->sc_mcr, MCR_DTR);
-#ifdef COM_PXA2X0
-			CLR(sc->sc_mcr, PXA_MCR);
-#endif
-			bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-		} else
-			bus_space_write_1(iot, ioh, com_lcr, lcr);
-
-		if (ISSET(sc->sc_hwflags, COM_HW_FIFO)) {
-			if (sc->sc_uarttype == COM_UART_TI16750) {
-				bus_space_write_1(iot, ioh, com_lcr,
-				    lcr | LCR_DLAB);
-				bus_space_write_1(iot, ioh, com_fifo,
-				    FIFO_ENABLE | FIFO_ENABLE_64BYTE |
-				    (t->c_ispeed <= 1200 ? FIFO_TRIGGER_1 : FIFO_TRIGGER_8));
-				bus_space_write_1(iot, ioh, com_lcr, lcr);
-			} else
-				bus_space_write_1(iot, ioh, com_fifo,
-				    FIFO_ENABLE |
-				    (t->c_ispeed <= 1200 ? FIFO_TRIGGER_1 : FIFO_TRIGGER_8));
-		}
-	} else
-		bus_space_write_1(iot, ioh, com_lcr, lcr);
-
-	/* When not using CRTSCTS, RTS follows DTR. */
-	if (!ISSET(t->c_cflag, CRTSCTS)) {
-		if (ISSET(sc->sc_mcr, MCR_DTR)) {
-			if (!ISSET(sc->sc_mcr, MCR_RTS)) {
-				SET(sc->sc_mcr, MCR_RTS);
-#ifdef COM_PXA2X0
-				CLR(sc->sc_mcr, PXA_MCR);
-#endif
-				bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-			}
-		} else {
-			if (ISSET(sc->sc_mcr, MCR_RTS)) {
-				CLR(sc->sc_mcr, MCR_RTS);
-				bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-			}
-		}
-		sc->sc_dtr = MCR_DTR | MCR_RTS;
-	} else
-		sc->sc_dtr = MCR_DTR;
-
-	/* and copy to tty */
-	tp->t_ispeed = t->c_ispeed;
-	tp->t_ospeed = t->c_ospeed;
-	oldcflag = tp->t_cflag;
-	tp->t_cflag = t->c_cflag;
-
-	/*
-	 * If DCD is off and MDMBUF is changed, ask the tty layer if we should
-	 * stop the device.
-	 */
-	if (!ISSET(sc->sc_msr, MSR_DCD) &&
-	    !ISSET(sc->sc_swflags, COM_SW_SOFTCAR) &&
-	    ISSET(oldcflag, MDMBUF) != ISSET(tp->t_cflag, MDMBUF) &&
-	    (*linesw[tp->t_line].l_modem)(tp, 0) == 0) {
-		CLR(sc->sc_mcr, sc->sc_dtr);
-		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-	}
-
-	/* Just to be sure... */
-	comstart(tp);
-	return 0;
-}
-
-void
-comstart(tp)
-	struct tty *tp;
-{
-	struct com_softc *sc = com_cd.cd_devs[DEVUNIT(tp->t_dev)];
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-	int s;
-
-	s = spltty();
-	if (ISSET(tp->t_state, TS_BUSY))
-		goto out;
-	if (ISSET(tp->t_state, TS_TIMEOUT | TS_TTSTOP) || sc->sc_halt > 0)
-		goto stopped;
-	if (ISSET(tp->t_cflag, CRTSCTS) && !ISSET(sc->sc_msr, MSR_CTS))
-		goto stopped;
-	if (tp->t_outq.c_cc <= tp->t_lowat) {
-		if (ISSET(tp->t_state, TS_ASLEEP)) {
-			CLR(tp->t_state, TS_ASLEEP);
-			wakeup(&tp->t_outq);
-		}
-		if (tp->t_outq.c_cc == 0)
-			goto stopped;
-		selwakeup(&tp->t_wsel);
-	}
-	SET(tp->t_state, TS_BUSY);
-
-#ifdef COM_PXA2X0
-	/* Enable transmitter slow infrared mode. */
-	if (ISSET(sc->sc_hwflags, COM_HW_SIR))
-		bus_space_write_1(iot, ioh, com_isr, ISR_SEND);
-#endif
-
-	/* Enable transmit completion interrupts. */
-	if (!ISSET(sc->sc_ier, IER_ETXRDY)) {
-		SET(sc->sc_ier, IER_ETXRDY);
-		bus_space_write_1(iot, ioh, com_ier, sc->sc_ier);
-	}
-
-	if (ISSET(sc->sc_hwflags, COM_HW_FIFO)) {
-		u_char buffer[64];	/* XXX: largest fifo */
-
-		int n = q_to_b(&tp->t_outq, buffer, sc->sc_fifolen);
-		int i;
-
-		for (i = 0; i < n; i++) {
-			bus_space_write_1(iot, ioh, com_data, buffer[i]);
-		}
-	} else if (tp->t_outq.c_cc != 0)
-		bus_space_write_1(iot, ioh, com_data, getc(&tp->t_outq));
-out:
-	splx(s);
-	return;
-stopped:
-	if (ISSET(sc->sc_ier, IER_ETXRDY)) {
-		CLR(sc->sc_ier, IER_ETXRDY);
-		bus_space_write_1(iot, ioh, com_ier, sc->sc_ier);
-#ifdef COM_PXA2X0
-		if (ISSET(sc->sc_hwflags, COM_HW_SIR)) {
-			int timo;
-
-			/* Wait for empty transmit shift register. */
-			timo = 20000;
-			while (!ISSET(bus_space_read_1(iot, ioh, com_lsr),
-			    LSR_TSRE) && --timo)
-				delay(1);
-
-			/* Enable receiver slow infrared mode. */
-			bus_space_write_1(iot, ioh, com_isr, ISR_RECV);
-		}
-#endif
-	}
-	splx(s);
-}
-
-/*
- * Stop output on a line.
- */
-int
-comstop(tp, flag)
-	struct tty *tp;
-	int flag;
-{
-	int s;
-
-	s = spltty();
-	if (ISSET(tp->t_state, TS_BUSY))
-		if (!ISSET(tp->t_state, TS_TTSTOP))
-			SET(tp->t_state, TS_FLUSH);
-	splx(s);
-	return 0;
-}
-
-void
-comdiag(arg)
-	void *arg;
-{
-	struct com_softc *sc = arg;
-	int overflows, floods;
-	int s;
-
-	s = spltty();
-	sc->sc_errors = 0;
-	overflows = sc->sc_overflows;
-	sc->sc_overflows = 0;
-	floods = sc->sc_floods;
-	sc->sc_floods = 0;
-	splx(s);
-	log(LOG_WARNING, "%s: %d silo overflow%s, %d ibuf overflow%s\n",
-	    sc->sc_dev.dv_xname,
-	    overflows, overflows == 1 ? "" : "s",
-	    floods, floods == 1 ? "" : "s");
-}
-
-void
-comsoft(arg)
-	void *arg;
-{
-	struct com_softc *sc = (struct com_softc *)arg;
-	struct tty *tp;
-	register u_char *ibufp;
-	u_char *ibufend;
-	register int c;
-	int s;
-	static int lsrmap[8] = {
-		0,      TTY_PE,
-		TTY_FE, TTY_PE|TTY_FE,
-		TTY_FE, TTY_PE|TTY_FE,
-		TTY_FE, TTY_PE|TTY_FE
-	};
-
-	if (sc == NULL || sc->sc_ibufp == sc->sc_ibuf)
-		goto out;
-
-	tp = sc->sc_tty;
-
-	s = spltty();
-
-	ibufp = sc->sc_ibuf;
-	ibufend = sc->sc_ibufp;
-
-	if (ibufp == ibufend) {
-		splx(s);
-		goto out;
-	}
-
-	sc->sc_ibufp = sc->sc_ibuf = (ibufp == sc->sc_ibufs[0]) ?
-				     sc->sc_ibufs[1] : sc->sc_ibufs[0];
-	sc->sc_ibufhigh = sc->sc_ibuf + COM_IHIGHWATER;
-	sc->sc_ibufend = sc->sc_ibuf + COM_IBUFSIZE;
-
-	if (tp == NULL || !ISSET(tp->t_state, TS_ISOPEN)) {
-		splx(s);
-		goto out;
-	}
-
-	if (ISSET(tp->t_cflag, CRTSCTS) &&
-	    !ISSET(sc->sc_mcr, MCR_RTS)) {
-		/* XXX */
-		SET(sc->sc_mcr, MCR_RTS);
-#ifdef COM_PXA2X0
-		CLR(sc->sc_mcr, PXA_MCR);
-#endif
-		bus_space_write_1(sc->sc_iot, sc->sc_ioh, com_mcr,
-		    sc->sc_mcr);
-	}
-
-	splx(s);
-
-	while (ibufp < ibufend) {
-		c = *ibufp++;
-		if (ISSET(*ibufp, LSR_OE)) {
-			sc->sc_overflows++;
-			if (sc->sc_errors++ == 0)
-				timeout_add(&sc->sc_diag_tmo, 60 * hz);
-		}
-		/* This is ugly, but fast. */
-		c |= lsrmap[(*ibufp++ & (LSR_BI|LSR_FE|LSR_PE)) >> 2];
-		(*linesw[tp->t_line].l_rint)(c, tp);
-	}
-
-out:
-#ifndef __HAVE_GENERIC_SOFT_INTERRUPTS
-	timeout_add(&sc->sc_comsoft_tmo, 1);
-#else
-	;
-#endif
-}
-
-#ifdef KGDB
-
-/*
- * If a line break is set, or data matches one of the characters
- * gdb uses to signal a connection, then start up kgdb. Just gobble
- * any other data. Done in a stand alone function because comintr
- * does tty stuff and we don't have one.
- */
-
-int
-kgdbintr(arg)
-	void *arg;
-{
-	struct com_softc *sc = arg;
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-	u_char lsr, data, msr, delta;
-
-	if (!ISSET(sc->sc_hwflags, COM_HW_KGDB))
-		return(0);
-
-	for (;;) {
-		lsr = bus_space_read_1(iot, ioh, com_lsr);
-		if (ISSET(lsr, LSR_RXRDY)) {
-			do {
-				data = bus_space_read_1(iot, ioh, com_data);
-				if (data == 3 || data == '$' || data == '+' ||
-				    ISSET(lsr, LSR_BI)) {
-					kgdb_connect(1);
-					data = 0;
-				}
-				lsr = bus_space_read_1(iot, ioh, com_lsr);
-			} while (ISSET(lsr, LSR_RXRDY));
-
-		}
-		if (ISSET(lsr, LSR_BI|LSR_FE|LSR_PE|LSR_OE))
-			printf("weird lsr %02x\n", lsr);
-
-		msr = bus_space_read_1(iot, ioh, com_msr);
-
-		if (msr != sc->sc_msr) {
-			delta = msr ^ sc->sc_msr;
-			sc->sc_msr = msr;
-			if (ISSET(delta, MSR_DCD)) {
-				if (!ISSET(sc->sc_swflags, COM_SW_SOFTCAR)) {
-					CLR(sc->sc_mcr, sc->sc_dtr);
-					bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-				}
-			}
-		}
-		if (ISSET(bus_space_read_1(iot, ioh, com_iir), IIR_NOPEND))
-			return (1);
-	}
-}
-#endif /* KGDB */
-
-int
-comintr(arg)
-	void *arg;
-{
-	struct com_softc *sc = arg;
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-	struct tty *tp;
-	u_char lsr, data, msr, delta;
-
-	if (!sc->sc_tty)
-		return (0);		/* can't do squat. */
-
-	if (ISSET(bus_space_read_1(iot, ioh, com_iir), IIR_NOPEND))
-		return (0);
-
-	tp = sc->sc_tty;
-
-	for (;;) {
-		lsr = bus_space_read_1(iot, ioh, com_lsr);
-
-		if (ISSET(lsr, LSR_RXRDY)) {
-			register u_char *p = sc->sc_ibufp;
-
-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
-			softintr_schedule(sc->sc_si);
-#endif
-			do {
-				data = bus_space_read_1(iot, ioh, com_data);
-				if (ISSET(lsr, LSR_BI)) {
-#ifdef DDB
-					if (ISSET(sc->sc_hwflags,
-					    COM_HW_CONSOLE)) {
-						if (db_console)
-							Debugger();
-						goto next;
-					}
-#endif
-					data = 0;
-				}
-				if (p >= sc->sc_ibufend) {
-					sc->sc_floods++;
-					if (sc->sc_errors++ == 0)
-						timeout_add(&sc->sc_diag_tmo, 60 * hz);
-				} else {
-					*p++ = data;
-					*p++ = lsr;
-					if (p == sc->sc_ibufhigh &&
-					    ISSET(tp->t_cflag, CRTSCTS)) {
-						/* XXX */
-						CLR(sc->sc_mcr, MCR_RTS);
-						bus_space_write_1(iot, ioh, com_mcr,
-						    sc->sc_mcr);
-					}
-				}
-#ifdef DDB
-			next:
-#endif
-				lsr = bus_space_read_1(iot, ioh, com_lsr);
-			} while (ISSET(lsr, LSR_RXRDY));
-
-			sc->sc_ibufp = p;
-		}
-		msr = bus_space_read_1(iot, ioh, com_msr);
-
-		if (msr != sc->sc_msr) {
-			delta = msr ^ sc->sc_msr;
-			sc->sc_msr = msr;
-			if (ISSET(delta, MSR_DCD)) {
-				if (!ISSET(sc->sc_swflags, COM_SW_SOFTCAR) &&
-				    (*linesw[tp->t_line].l_modem)(tp, ISSET(msr, MSR_DCD)) == 0) {
-					CLR(sc->sc_mcr, sc->sc_dtr);
-					bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-				}
-			}
-			if (ISSET(delta & msr, MSR_CTS) &&
-			    ISSET(tp->t_cflag, CRTSCTS)) {
-				/* the line is up and we want to do rts/cts flow control */
-				(*linesw[tp->t_line].l_start)(tp);
-			}
-		}
-
-		if (ISSET(lsr, LSR_TXRDY) && ISSET(tp->t_state, TS_BUSY)) {
-			CLR(tp->t_state, TS_BUSY | TS_FLUSH);
-			if (sc->sc_halt > 0)
-				wakeup(&tp->t_outq);
-			(*linesw[tp->t_line].l_start)(tp);
-		}
-
-#ifdef COM_PXA2X0
-		if (ISSET(lsr, LSR_TXRDY) && ISSET(lsr, LSR_TSRE))
-			bus_space_write_1(iot, ioh, com_isr, ISR_RECV);
-#endif
-
-		if (ISSET(bus_space_read_1(iot, ioh, com_iir), IIR_NOPEND))
-			return (1);
-	}
-}
-
-/*
- * Following are all routines needed for COM to act as console
- */
-
-#if defined(__sgi__)
-#undef CONADDR
-#undef COM_FREQ
-#include "machine/autoconf.h"
-#endif
-
-
-/*
- * The following functions are polled getc and putc routines, shared
- * by the console and kgdb glue.
- */
-
-int
-com_common_getc(iot, ioh)
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-{
-	int s = splhigh();
-	u_char stat, c;
-
-#ifdef COM_PXA2X0
-	if ((comconsioh == ioh && comconsaddr == comsiraddr)
-#ifdef KGDB
-	    || (com_kgdb_ioh == ioh && com_kgdb_addr == comsiraddr)
-#endif
-	    )
-		bus_space_write_1(iot, ioh, com_isr, ISR_RECV);
-#endif
-
-	/* block until a character becomes available */
-	while (!ISSET(stat = bus_space_read_1(iot, ioh, com_lsr), LSR_RXRDY))
-		continue;
-
-	c = bus_space_read_1(iot, ioh, com_data);
-	/* clear any interrupts generated by this transmission */
-	stat = bus_space_read_4(iot, ioh, com_iir);
-	splx(s);
-	return (c);
-}
-
-void
-com_common_putc(iot, ioh, c)
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	int c;
-{
-	int s = spltty();
-	int timo;
-
-	/* wait for any pending transmission to finish */
-	timo = 2000;
-	while (!ISSET(bus_space_read_1(iot, ioh, com_lsr), LSR_TXRDY) && --timo)
-		delay(1);
-
-#ifdef COM_PXA2X0
-	if ((comconsioh == ioh && comconsaddr == comsiraddr)
-#ifdef KGDB
-	    || (com_kgdb_ioh == ioh && com_kgdb_addr == comsiraddr)
-#endif
-	    )
-		bus_space_write_1(iot, ioh, com_isr, ISR_SEND);
-#endif
-
-	bus_space_write_1(iot, ioh, com_data, c &0xff);
-	bus_space_barrier(iot, ioh, 0, COM_NPORTS,
-	    (BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE));
-
-	/* wait for this transmission to complete */
-	timo = 2000;
-	while (!ISSET(bus_space_read_1(iot, ioh, com_lsr), LSR_TXRDY) && --timo)
-		delay(1);
-
-#ifdef COM_PXA2X0
-	if ((comconsioh == ioh && comconsaddr == comsiraddr)
-#ifdef KGDB
-	    || (com_kgdb_ioh == ioh && com_kgdb_addr == comsiraddr)
-#endif
-	    ) {
-		/* wait for transmit shift register to become empty */
-		timo = 20000;
-		while (!ISSET(bus_space_read_1(iot, ioh, com_lsr), LSR_TSRE)
-		    && --timo)
-			delay(1);
-
-		bus_space_write_1(iot, ioh, com_isr, ISR_RECV);
-	}
-#endif
-
-	splx(s);
-}
-
-/*
- * Following are all routines needed for COM to act as console
- */
-void
-cominit(iot, ioh, rate, frequency)
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	int rate, frequency;
-{
-	int s = splhigh();
-	u_char stat;
-
-	delay(200);
-	bus_space_write_1(iot, ioh, com_lcr, LCR_DLAB);
-	rate = comspeed(frequency, rate); /* XXX not comdefaultrate? */
-	bus_space_write_1(iot, ioh, com_dlbl, rate);
-	bus_space_write_1(iot, ioh, com_dlbh, rate >> 8);
-	bus_space_write_1(iot, ioh, com_lcr, LCR_8BITS);
-#ifdef COM_PXA2X0
-	/* XXX */
-	bus_space_write_1(iot, ioh, com_mcr, 0);
-	bus_space_write_1(iot, ioh, com_ier, IER_EUART);  /* Make sure they are off */
-#else
-	bus_space_write_1(iot, ioh, com_mcr, MCR_DTR | MCR_RTS);
-	bus_space_write_1(iot, ioh, com_ier, 0);  /* Make sure they are off */
-#endif
-	bus_space_write_1(iot, ioh, com_fifo,
-	    FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_1);
-	stat = bus_space_read_1(iot, ioh, com_iir);
-	delay(200);
-	splx(s);
-}
-
-void  
-comcnprobe(cp)
-	struct consdev *cp;  
-{
-	/* XXX NEEDS TO BE FIXED XXX */
-#ifdef MD_ISA_IOT
-	bus_space_tag_t iot = MD_ISA_IOT;
-#elif defined(__sgi__)
-	bus_space_tag_t iot = sys_config.cons_iot;
-#elif defined(hppa)
-	bus_space_tag_t iot = &hppa_bustag;
-#else
-	bus_space_tag_t iot = 0;
-#endif
-	bus_space_handle_t ioh;
-	int found;
-
-	if(CONADDR == 0) {
-		cp->cn_pri = CN_DEAD;
-		return;
-	}
-
-	comconsiot = iot;
-	if (bus_space_map(iot, CONADDR, COM_NPORTS, 0, &ioh)) {
-		cp->cn_pri = CN_DEAD;
-		return;
-	}
-#ifdef __hppa__
-	found = 1;
-#else
-	found = comprobe1(iot, ioh);
-#endif
-	bus_space_unmap(iot, ioh, COM_NPORTS);
-	if (!found) {
-		cp->cn_pri = CN_DEAD;
-		return;
-	}
-
-	/* locate the major number */
-	for (commajor = 0; commajor < nchrdev; commajor++)
-		if (cdevsw[commajor].d_open == comopen)
-			break;
-
-	/* initialize required fields */
-	cp->cn_dev = makedev(commajor, CONUNIT);
-#if defined(COMCONSOLE) || defined(PCCOMCONSOLE) || !defined(__amd64__)
-	cp->cn_pri = CN_REMOTE;
-#else
-	cp->cn_pri = CN_NORMAL;
-#endif
-}
-
-void
-comcninit(cp)
-	struct consdev *cp;
-{
-	comconsaddr = CONADDR;
-
-	if (bus_space_map(comconsiot, comconsaddr, COM_NPORTS, 0, &comconsioh))
-		panic("comcninit: mapping failed");
-
-	cominit(comconsiot, comconsioh, comdefaultrate, comconsfreq);
-	comconsinit = 0;
-}
-
-
-int
-comcnattach(iot, iobase, rate, frequency, cflag)
-	bus_space_tag_t iot;
-	bus_addr_t iobase;
-	int rate, frequency;
-	tcflag_t cflag;
-{
-	static struct consdev comcons = {
-		NULL, NULL, comcngetc, comcnputc, comcnpollc, NULL,
-		NODEV, CN_NORMAL
-	};
-
-#ifndef __sparc64__
-	if (bus_space_map(iot, iobase, COM_NPORTS, 0, &comconsioh))
-		return ENOMEM;
-#endif
-
-	cominit(iot, comconsioh, rate, frequency);
-
-	cn_tab = &comcons;
-
-	comconsiot = iot;
-	comconsaddr = iobase;
-	comconscflag = cflag;
-	comconsfreq = frequency;
-
-	return (0);
-}
-
-int
-comcngetc(dev)
-	dev_t dev;
-{
-	return (com_common_getc(comconsiot, comconsioh));
-}
-
-/*
- * Console kernel output character routine.
- */
-void
-comcnputc(dev, c)
-	dev_t dev;
-	int c;
-{
-	com_common_putc(comconsiot, comconsioh, c);
-}
-
-void
-comcnpollc(dev, on)
-	dev_t dev;
-	int on;
-{
-
-}
-
-#ifdef KGDB
-int
-com_kgdb_attach(iot, iobase, rate, frequency, cflag)
-	bus_space_tag_t iot;
-	bus_addr_t iobase;
-	int rate, frequency;
-	tcflag_t cflag;
-{
-	if (iot == comconsiot && iobase == comconsaddr) {
-		return (EBUSY); /* cannot share with console */
-	}
-
-	com_kgdb_iot = iot;
-	com_kgdb_addr = iobase;
-
-	if (bus_space_map(com_kgdb_iot, com_kgdb_addr, COM_NPORTS, 0,
-	    &com_kgdb_ioh))
-		panic("com_kgdb_attach: mapping failed");
-
-	/* XXX We currently don't respect KGDBMODE? */
-	cominit(com_kgdb_iot, com_kgdb_ioh, rate, frequency);
-
-	kgdb_attach(com_kgdb_getc, com_kgdb_putc, NULL);
-	kgdb_dev = 123; /* unneeded, only to satisfy some tests */
-
-	return (0);
-}
-
-/* ARGSUSED */
-int
-com_kgdb_getc(arg)
-	void *arg;
-{
-
-	return (com_common_getc(com_kgdb_iot, com_kgdb_ioh));
-}
-
-/* ARGSUSED */
-void
-com_kgdb_putc(arg, c)
-	void *arg;
-	int c;
-{
-
-	return (com_common_putc(com_kgdb_iot, com_kgdb_ioh, c));
-}
-#endif /* KGDB */
diff --git a/sys/arch/arm/xscale/pxacomreg.h b/sys/arch/arm/xscale/pxacomreg.h
deleted file mode 100644
index 284d0e661bb..00000000000
--- a/sys/arch/arm/xscale/pxacomreg.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*	$OpenBSD: pxacomreg.h,v 1.2 2005/05/09 15:25:29 uwe Exp $	*/
-/*	$NetBSD: comreg.h,v 1.8 1996/02/05 23:01:50 scottr Exp $	*/
-
-/*
- * Copyright (c) 1997 - 1998, Jason Downs.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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.
- */
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
- *
- *	@(#)comreg.h	7.2 (Berkeley) 5/9/91
- */
-
-#include <dev/ic/ns16550reg.h>
-
-#ifndef COM_FREQ		/* allow to be set externally */
-#define	COM_FREQ	1843200	/* 16-bit baud rate divisor */
-#endif
-#define	COM_TOLERANCE	30	/* baud rate tolerance, in 0.1% units */
-
-/* interrupt enable register */
-#define	IER_ERXRDY	0x1	/* Enable receiver interrupt */
-#define	IER_ETXRDY	0x2	/* Enable transmitter empty interrupt */
-#define	IER_ERLS	0x4	/* Enable line status interrupt */
-#define	IER_EMSC	0x8	/* Enable modem status interrupt */
-#define IER_SLEEP	0x10	/* Enable sleep mode */
-/* PXA2X0's ns16550 ports have extra bits in this register */
-#define	IER_ERXTOUT	0x10	/* Enable rx timeout interrupt */
-#define	IER_EUART	0x40	/* Enable UART */
-
-/* interrupt identification register */
-#define	IIR_IMASK	0xf
-#define	IIR_RXTOUT	0xc
-#define	IIR_RLS		0x6	/* Line status change */
-#define	IIR_RXRDY	0x4	/* Receiver ready */
-#define	IIR_TXRDY	0x2	/* Transmitter ready */
-#define	IIR_MLSC	0x0	/* Modem status */
-#define	IIR_NOPEND	0x1	/* No pending interrupts */
-#define	IIR_FIFO_MASK	0xc0	/* set if FIFOs are enabled */
-
-/* fifo control register */
-#define	FIFO_ENABLE	0x01	/* Turn the FIFO on */
-#define	FIFO_RCV_RST	0x02	/* Reset RX FIFO */
-#define	FIFO_XMT_RST	0x04	/* Reset TX FIFO */
-#define	FIFO_DMA_MODE	0x08
-#define	FIFO_TRIGGER_1	0x00	/* Trigger RXRDY intr on 1 character */
-#define	FIFO_TRIGGER_4	0x40	/* ibid 4 */
-#define	FIFO_TRIGGER_8	0x80	/* ibid 8 */
-#define	FIFO_TRIGGER_14	0xc0	/* ibid 14 */
-/* ST16650 fifo control register */
-#define FIFO_RCV_TRIGGER_8	0x00
-#define FIFO_RCV_TRIGGER_16	0x40
-#define FIFO_RCV_TRIGGER_24	0x80
-#define FIFO_RCV_TRIGGER_28	0xc0
-#define FIFO_XMT_TRIGGER_16	0x00
-#define FIFO_XMT_TRIGGER_8	0x10
-#define FIFO_XMT_TRIGGER_24	0x20
-#define FIFO_XMT_TRIGGER_30	0x30
-/* XR16850 fifo control register */
-#define FIFO_RCV3_TRIGGER_8	FIFO_RCV_TRIGGER_8
-#define FIFO_RCV3_TRIGGER_16	FIFO_RCV_TRIGGER_16
-#define FIFO_RCV3_TRIGGER_56	0x80
-#define FIFO_RCV3_TRIGGER_60	0xc0
-#define FIFO_XMT3_TRIGGER_8	0x00
-#define FIFO_XMT3_TRIGGER_16	0x10
-#define FIFO_XMT3_TRIGGER_32	0x20
-#define FIFO_XMT3_TRIGGER_56	0x30
-/* TI16750 fifo control register */
-#define FIFO_ENABLE_64BYTE	0x20
-
-/* line control register */
-#define	LCR_DLAB	0x80	/* Divisor latch access enable */
-#define	LCR_SBREAK	0x40	/* Break Control */
-#define	LCR_PZERO	0x38	/* Space parity */
-#define	LCR_PONE	0x28	/* Mark parity */
-#define	LCR_PEVEN	0x18	/* Even parity */
-#define	LCR_PODD	0x08	/* Odd parity */
-#define	LCR_PNONE	0x00	/* No parity */
-#define	LCR_PENAB	0x08	/* XXX - low order bit of all parity */
-#define	LCR_STOPB	0x04	/* 2 stop bits per serial word */
-#define	LCR_8BITS	0x03	/* 8 bits per serial word */
-#define	LCR_7BITS	0x02	/* 7 bits */
-#define	LCR_6BITS	0x01	/* 6 bits */
-#define	LCR_5BITS	0x00	/* 5 bits */
-#define LCR_EFR		0xbf	/* ST16650/XR16850 EFR access enable */
-
-/* modem control register */
-#define	MCR_LOOPBACK	0x10	/* Loop test: echos from TX to RX */
-#define	MCR_IENABLE	0x08	/* Out2: enables UART interrupts */
-#define	MCR_DRS		0x04	/* Out1: resets some internal modems */
-#define	MCR_RTS		0x02	/* Request To Send */
-#define	MCR_DTR		0x01	/* Data Terminal Ready */
-
-/* line status register */
-#define	LSR_RCV_FIFO	0x80
-#define	LSR_TSRE	0x40	/* Transmitter empty: byte sent */
-#define	LSR_TXRDY	0x20	/* Transmitter buffer empty */
-#define	LSR_BI		0x10	/* Break detected */
-#define	LSR_FE		0x08	/* Framing error: bad stop bit */
-#define	LSR_PE		0x04	/* Parity error */
-#define	LSR_OE		0x02	/* Overrun, lost incoming byte */
-#define	LSR_RXRDY	0x01	/* Byte ready in Receive Buffer */
-#define	LSR_RCV_MASK	0x1f	/* Mask for incoming data or error */
-
-/* modem status register */
-/* All deltas are from the last read of the MSR. */
-#define	MSR_DCD		0x80	/* Current Data Carrier Detect */
-#define	MSR_RI		0x40	/* Current Ring Indicator */
-#define	MSR_DSR		0x20	/* Current Data Set Ready */
-#define	MSR_CTS		0x10	/* Current Clear to Send */
-#define	MSR_DDCD	0x08	/* DCD has changed state */
-#define	MSR_TERI	0x04	/* RI has toggled low to high */
-#define	MSR_DDSR	0x02	/* DSR has changed state */
-#define	MSR_DCTS	0x01	/* CTS has changed state */
-
-/* enhanced features register */
-#define EFR_ECB		0x10	/* enhanced control bit */
-#define EFR_SCD		0x20	/* special character detect */
-#define EFR_RTS		0x40	/* RTS flow control */
-#define EFR_CTS		0x80	/* CTS flow control */
-
-/* enhanced FIFO control register */
-#define FCTL_MODE	0x80
-#define FCTL_SWAP	0x40
-#define FCTL_RS485	0x08
-#define FCTL_IrRxInv	0x04
-#define FCTL_TRIGGER2	0x10
-#define FCTL_TRIGGER3	0x20
-
-/* infrared selection register */
-#define ISR_XMITIR	0x01	/* transmitter SIR enable */
-#define ISR_RCVEIR	0x02	/* receiver SIR enable */
-#define ISR_XMODE	0x04	/* 1.6us transmit pulse width */
-#define ISR_TXPL	0x08	/* negative transmit data polarity */
-#define ISR_RXPL	0x10	/* negative receive data polarity */
-
-#ifdef COM_PXA2X0
-#define	COM_NPORTS	9
-#else
-#define	COM_NPORTS	8
-#endif
-
-/*
- * WARNING: Serial console is assumed to be at COM1 address
- * and CONUNIT must be 0.
- */
-#ifndef CONADDR
-#define	CONADDR	(0x3f8)
-#else
-#define CONADDR_OVERRIDE
-#endif
-#ifndef CONUNIT
-#define	CONUNIT	(0)
-#endif
diff --git a/sys/arch/arm/xscale/pxacomvar.h b/sys/arch/arm/xscale/pxacomvar.h
deleted file mode 100644
index d327fabc5dd..00000000000
--- a/sys/arch/arm/xscale/pxacomvar.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*	$OpenBSD: pxacomvar.h,v 1.2 2005/05/09 15:25:29 uwe Exp $	*/
-/*	$NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $	*/
-
-/*
- * Copyright (c) 1997 - 1998, Jason Downs.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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.
- */
-/*
- * Copyright (c) 1996 Christopher G. Demetriou.  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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Christopher G. Demetriou
- *	for the NetBSD Project.
- * 4. 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/timeout.h>
-
-struct commulti_attach_args {
-	int		ca_slave;		/* slave number */
-
-	bus_space_tag_t ca_iot;
-	bus_space_handle_t ca_ioh;
-	int		ca_iobase;
-	int		ca_noien;
-};
-
-#define	COM_IBUFSIZE	(2 * 512)
-#define	COM_IHIGHWATER	((3 * COM_IBUFSIZE) / 4)
-
-struct com_softc {
-	struct device sc_dev;
-	void *sc_ih;
-	bus_space_tag_t sc_iot;
-	struct tty *sc_tty;
-	struct timeout sc_dtr_tmo;
-	struct timeout sc_diag_tmo;
-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
-	void *sc_si;
-#else
-	struct timeout sc_comsoft_tmo;
-#endif
-
-	int sc_overflows;
-	int sc_floods;
-	int sc_errors;
-
-	int sc_halt;
-
-	bus_addr_t sc_iobase;
-	int sc_frequency;
-
-	bus_space_handle_t sc_ioh;
-
-	u_char sc_uarttype;
-#define COM_UART_UNKNOWN	0x00		/* unknown */
-#define COM_UART_8250		0x01		/* no fifo */
-#define COM_UART_16450		0x02		/* no fifo */
-#define COM_UART_16550		0x03		/* no working fifo */
-#define COM_UART_16550A		0x04		/* 16 byte fifo */
-#define COM_UART_ST16650	0x05		/* no working fifo */
-#define COM_UART_ST16650V2	0x06		/* 32 byte fifo */
-#define COM_UART_TI16750	0x07		/* 64 byte fifo */
-#define	COM_UART_XR16850	0x10		/* 128 byte fifo */
-
-	u_char sc_hwflags;
-#define	COM_HW_NOIEN	0x01
-#define	COM_HW_FIFO	0x02
-#define	COM_HW_SIR	0x20
-#define	COM_HW_CONSOLE	0x40
-#define	COM_HW_KGDB	0x80
-	u_char sc_swflags;
-#define	COM_SW_SOFTCAR	0x01
-#define	COM_SW_CLOCAL	0x02
-#define	COM_SW_CRTSCTS	0x04
-#define	COM_SW_MDMBUF	0x08
-#define	COM_SW_PPS	0x10
-	int	sc_fifolen;
-	u_char sc_msr, sc_mcr, sc_lcr, sc_ier;
-	u_char sc_dtr;
-
-	u_char	sc_cua;
-
-	u_char	sc_initialize;		/* force initialization */
-
-	u_char *sc_ibuf, *sc_ibufp, *sc_ibufhigh, *sc_ibufend;
-	u_char sc_ibufs[2][COM_IBUFSIZE];
-
-	/* power management hooks */
-	int (*enable)(struct com_softc *);
-	void (*disable)(struct com_softc *);
-	int enabled;
-};
-
-int	comprobe1(bus_space_tag_t, bus_space_handle_t);
-void	cominit(bus_space_tag_t, bus_space_handle_t, int, int);
-int	comstop(struct tty *, int);
-int	comintr(void *);
-int	com_detach(struct device *, int);
-int	com_activate(struct device *, enum devact);
-
-void	comdiag(void *);
-int	comspeed(long, long);
-u_char	com_cflag2lcr(tcflag_t);
-int	comparam(struct tty *, struct termios *);
-void	comstart(struct tty *);
-void	comsoft(void *);
-
-struct consdev;
-int	comcnattach(bus_space_tag_t, bus_addr_t, int, int, tcflag_t);
-void	comcnprobe(struct consdev *);
-void	comcninit(struct consdev *);
-int	comcngetc(dev_t);
-void	comcnputc(dev_t, int);
-void	comcnpollc(dev_t, int);
-int	com_common_getc(bus_space_tag_t, bus_space_handle_t);
-void	com_common_putc(bus_space_tag_t, bus_space_handle_t, int);
-void	com_raisedtr(void *);
-
-#ifdef KGDB
-int	com_kgdb_attach(bus_space_tag_t, int, int, int, tcflag_t);
-int	kgdbintr(void *);
-#endif
-
-void com_attach_subr(struct com_softc *);
-
-extern int comdefaultrate;
-extern bus_addr_t comconsaddr;
-extern bus_addr_t comsiraddr;
-extern int comconsinit;
-extern int comconsattached;
-extern bus_space_tag_t comconsiot;
-extern bus_space_handle_t comconsioh;
-extern tcflag_t comconscflag;
diff --git a/sys/arch/zaurus/zaurus/zaurus_machdep.c b/sys/arch/zaurus/zaurus/zaurus_machdep.c
index fb7e6bace4b..42c25b89ac1 100644
--- a/sys/arch/zaurus/zaurus/zaurus_machdep.c
+++ b/sys/arch/zaurus/zaurus/zaurus_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zaurus_machdep.c,v 1.16 2005/05/24 20:32:43 uwe Exp $	*/
+/*	$OpenBSD: zaurus_machdep.c,v 1.17 2005/05/27 18:42:15 uwe Exp $	*/
 /*	$NetBSD: lubbock_machdep.c,v 1.2 2003/07/15 00:25:06 lukem Exp $ */
 
 /*
@@ -254,14 +254,9 @@ bs_protos(bs_notimpl);
 
 #include "com.h"
 #if NCOM > 0
-#if defined(COM_PXA2X0)
-#include <arm/xscale/pxacomreg.h>
-#include <arm/xscale/pxacomvar.h>
-#else
 #include <dev/ic/comvar.h>
 #include <dev/ic/comreg.h>
 #endif
-#endif
 
 #ifndef CONSPEED
 #define CONSPEED B9600	/* What RedBoot uses */