Com driver moved, still somewhat ISA-dependent though, but it will
authorniklas <niklas@openbsd.org>
Sat, 30 Nov 1996 13:39:20 +0000 (13:39 +0000)
committerniklas <niklas@openbsd.org>
Sat, 30 Nov 1996 13:39:20 +0000 (13:39 +0000)
improve.  Pica and PCMCIA-dependent stuff factored out.

sys/arch/arc/conf/files.arc
sys/arch/arc/pica/com_pica.c [new file with mode: 0644]
sys/conf/files
sys/dev/isa/com.c [deleted file]
sys/dev/isa/comreg.h [deleted file]
sys/dev/isa/comvar.h [deleted file]
sys/dev/isa/files.isa
sys/dev/pcmcia/com_pcmcia.c [new file with mode: 0644]
sys/dev/pcmcia/files.pcmcia

index 8eddba0..b4e11ed 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: files.arc,v 1.9 1996/11/28 23:35:40 niklas Exp $
+#      $OpenBSD: files.arc,v 1.10 1996/11/30 13:39:41 niklas Exp $
 #
 # maxpartitions must be first item in files.${ARCH}
 #
@@ -113,6 +113,7 @@ file    arch/arc/dti/btl.c                    btl needs-count
 
 # 8250/16[45]50-based "com" ports
 attach com at pica with com_pica
+file   arch/arc/pica/com_pica.c        com_pica
 
 # National Semiconductor DS8390/WD83C690-based boards
 # (WD/SMC 80x3 family, SMC Ultra [8216], 3Com 3C503, NE[12]000, and clones)
diff --git a/sys/arch/arc/pica/com_pica.c b/sys/arch/arc/pica/com_pica.c
new file mode 100644 (file)
index 0000000..5c0252c
--- /dev/null
@@ -0,0 +1,195 @@
+/*     $OpenBSD: com_pica.c,v 1.1 1996/11/30 13:39:44 niklas Exp $     */
+
+/*
+ * Copyright (c) 1993, 1994 Charles Hannum.
+ * Copyright (c) 1990 William F. Jolitz, TeleMuse
+ * 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 software is a component of "386BSD" developed by 
+ *     William F. Jolitz, TeleMuse.
+ * 4. Neither the name of the developer nor the name "386BSD"
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS A COMPONENT OF 386BSD DEVELOPED BY WILLIAM F. JOLITZ 
+ * AND IS INTENDED FOR RESEARCH AND EDUCATIONAL PURPOSES ONLY. THIS 
+ * SOFTWARE SHOULD NOT BE CONSIDERED TO BE A COMMERCIAL PRODUCT. 
+ * THE DEVELOPER URGES THAT USERS WHO REQUIRE A COMMERCIAL PRODUCT 
+ * NOT MAKE USE OF THIS WORK.
+ *
+ * FOR USERS WHO WISH TO UNDERSTAND THE 386BSD SYSTEM DEVELOPED
+ * BY WILLIAM F. JOLITZ, WE RECOMMEND THE USER STUDY WRITTEN 
+ * REFERENCES SUCH AS THE  "PORTING UNIX TO THE 386" SERIES 
+ * (BEGINNING JANUARY 1991 "DR. DOBBS JOURNAL", USA AND BEGINNING 
+ * JUNE 1991 "UNIX MAGAZIN", GERMANY) BY WILLIAM F. JOLITZ AND 
+ * LYNNE GREER JOLITZ, AS WELL AS OTHER BOOKS ON UNIX AND THE 
+ * ON-LINE 386BSD USER MANUAL BEFORE USE. A BOOK DISCUSSING THE INTERNALS 
+ * OF 386BSD ENTITLED "386BSD FROM THE INSIDE OUT" WILL BE AVAILABLE LATE 1992.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPER ``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 DEVELOPER 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.
+ */
+
+/*
+ * Device Driver for AT parallel printer port
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/tty.h>
+
+#include <machine/autoconf.h>
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <dev/isa/isavar.h>    /* XXX for isa_chipset_tag_t in com_softc */
+
+#include <dev/ic/comreg.h>
+#include <dev/ic/comvar.h>
+#include <dev/ic/ns16550reg.h>
+
+/* Macros to clear/set/test flags. */
+#define        SET(t, f)       (t) |= (f)
+#define        CLR(t, f)       (t) &= ~(f)
+#define        ISSET(t, f)     ((t) & (f))
+
+#undef  CONADDR         /* This is stupid but using devs before config .. */
+#define CONADDR 0xe0006000
+
+int    com_pica_probe __P((struct device *, void *, void *));
+void   com_pica_attach __P((struct device *, struct device *, void *));
+
+struct cfattach com_pica_ca = {
+       sizeof(struct com_softc), com_pica_probe, com_pica_attach
+};
+
+int
+com_pica_probe(parent, match, aux)
+       struct device *parent;
+       void *match, *aux;
+{
+       bus_space_tag_t iot;
+       bus_space_handle_t ioh;
+       int iobase, needioh;
+       int rv = 1;
+       struct confargs *ca = aux;
+
+       if(!BUS_MATCHNAME(ca, "com"))
+               return(0);
+       iobase = (long)BUS_CVTADDR(ca);
+       iot = 0;
+       needioh = 1;
+
+       /* if it's in use as console, it's there. */
+       if (iobase == comconsaddr && !comconsattached)
+               goto out;
+
+       if (needioh && bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh)) {
+               rv = 0;
+               goto out;
+       }
+       rv = comprobe1(iot, ioh, iobase);
+       if (needioh)
+               bus_space_unmap(iot, ioh, COM_NPORTS);
+
+out:
+       return (rv);
+}
+
+void
+com_pica_attach(parent, self, aux)
+       struct device *parent, *self;
+       void *aux;
+{
+       struct com_softc *sc = (void *)self;
+       int iobase;
+       bus_space_tag_t iot;
+       bus_space_handle_t ioh;
+       struct confargs *ca = aux;
+
+       sc->sc_hwflags = 0;
+       sc->sc_swflags = 0;
+       sc->sc_iobase = iobase = (bus_addr_t)BUS_CVTADDR(ca);
+       sc->sc_ioh = ioh = (bus_space_handle_t)iobase;
+       sc->sc_iot = iot = 0;
+
+       if (iobase == comconsaddr) {
+               comconsattached = 1;
+
+               /* 
+                * Need to reset baud rate, etc. of next print so reset
+                * comconsinit.  Also make sure console is always "hardwired".
+                */
+               delay(1000);                    /* wait for output to finish */
+               comconsinit = 0;
+               SET(sc->sc_hwflags, COM_HW_CONSOLE);
+               SET(sc->sc_swflags, COM_SW_SOFTCAR);
+       }
+
+
+       /* look for a NS 16550AF UART with FIFOs */
+       bus_space_write_1(iot, ioh, com_fifo,
+           FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_14);
+       delay(100);
+       if (ISSET(bus_space_read_1(iot, ioh, com_iir), IIR_FIFO_MASK) ==
+           IIR_FIFO_MASK)
+               if (ISSET(bus_space_read_1(iot, ioh, com_fifo),
+                   FIFO_TRIGGER_14) == FIFO_TRIGGER_14) {
+                       SET(sc->sc_hwflags, COM_HW_FIFO);
+                       printf(": ns16550a, working fifo\n");
+               } else
+                       printf(": ns16550, broken fifo\n");
+       else
+               printf(": ns8250 or ns16450, no fifo\n");
+       bus_space_write_1(iot, ioh, com_fifo, 0);
+
+       /* disable interrupts */
+       bus_space_write_1(iot, ioh, com_ier, 0);
+       bus_space_write_1(iot, ioh, com_mcr, 0);
+
+       BUS_INTR_ESTABLISH(ca, comintr, (void *)(long)sc);
+
+#ifdef KGDB
+       if (kgdb_dev == makedev(commajor, unit)) {
+               if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE))
+                       kgdb_dev = -1;  /* can't debug over console port */
+               else {
+                       cominit(iot, ioh, kgdb_rate);
+                       if (kgdb_debug_init) {
+                               /*
+                                * Print prefix of device name,
+                                * let kgdb_connect print the rest.
+                                */
+                               printf("%s: ", sc->sc_dev.dv_xname);
+                               kgdb_connect(1);
+                       } else
+                               printf("%s: kgdb enabled\n",
+                                   sc->sc_dev.dv_xname);
+               }
+       }
+#endif
+
+       /* XXX maybe move up some? */
+       if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE))
+               printf("%s: console\n", sc->sc_dev.dv_xname);
+}
index 5a0ae41..572b058 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: files,v 1.47 1996/11/30 00:53:34 niklas Exp $
+#      $OpenBSD: files,v 1.48 1996/11/30 13:39:20 niklas Exp $
 #      $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
@@ -50,6 +50,10 @@ file dev/ic/elink3.c         ep
 device le: ether, ifnet
 file   dev/ic/am7990.c         le
 
+# 8250/16[45]50-based "com" ports
+device com: tty
+file   dev/ic/com.c            com & (com_isa | com_commulti | com_pcmcia | com_pica) needs-flag
+
 # Cyclades Cyclom multiport serial cards
 device cy: tty
 file   dev/ic/cy.c             cy & (cy_isa | cy_pci)  needs-flag
diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c
deleted file mode 100644 (file)
index 81b1547..0000000
+++ /dev/null
@@ -1,1836 +0,0 @@
-/*     $OpenBSD: com.c,v 1.28 1996/11/29 22:54:52 niklas Exp $ */
-/*     $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
-
-/*-
- * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. 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/types.h>
-#include <sys/device.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/comreg.h>
-#include <dev/isa/comvar.h>
-#include <dev/ic/ns16550reg.h>
-#ifdef COM_HAYESP
-#include <dev/ic/hayespreg.h>
-#endif
-#define        com_lcr com_cfcr
-
-#include "com.h"
-
-
-#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;
-
-       int sc_overflows;
-       int sc_floods;
-       int sc_errors;
-
-       int sc_halt;
-
-       int sc_iobase;
-#ifdef COM_HAYESP
-       int sc_hayespbase;
-#endif
-
-       bus_space_handle_t sc_ioh;
-       bus_space_handle_t sc_hayespioh;
-       isa_chipset_tag_t sc_ic;
-
-       u_char sc_hwflags;
-#define        COM_HW_NOIEN    0x01
-#define        COM_HW_FIFO     0x02
-#define        COM_HW_HAYESP   0x04
-#define        COM_HW_ABSENT_PENDING   0x08    /* reattached, awaiting close/reopen */
-#define        COM_HW_ABSENT   0x10            /* configure actually failed, or removed */
-#define        COM_HW_REATTACH 0x20            /* reattaching */
-#define        COM_HW_CONSOLE  0x40
-       u_char sc_swflags;
-#define        COM_SW_SOFTCAR  0x01
-#define        COM_SW_CLOCAL   0x02
-#define        COM_SW_CRTSCTS  0x04
-#define        COM_SW_MDMBUF   0x08
-       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];
-};
-
-#ifdef COM_HAYESP
-int comprobeHAYESP __P((bus_space_handle_t hayespioh, struct com_softc *sc));
-#endif
-void   comdiag         __P((void *));
-int    comspeed        __P((long));
-int    comparam        __P((struct tty *, struct termios *));
-void   comstart        __P((struct tty *));
-void   compoll         __P((void *));
-
-/* XXX: These belong elsewhere */
-cdev_decl(com);
-bdev_decl(com);
-
-struct consdev;
-void   comcnprobe      __P((struct consdev *));
-void   comcninit       __P((struct consdev *));
-int    comcngetc       __P((dev_t));
-void   comcnputc       __P((dev_t, int));
-void   comcnpollc      __P((dev_t, int));
-
-static u_char tiocm_xxx2mcr __P((int));
-
-/*
- * XXX the following two cfattach structs should be different, and possibly
- * XXX elsewhere.
- */
-int    comprobe __P((struct device *, void *, void *));
-void   comattach __P((struct device *, struct device *, void *));
-void   com_absent_notify __P((struct com_softc *sc));
-void   comstart_pending __P((void *));
-
-#if NCOM_ISA
-struct cfattach com_isa_ca = {
-       sizeof(struct com_softc), comprobe, comattach
-};
-#endif
-
-#if NCOM_COMMULTI
-struct cfattach com_commulti_ca = {
-       sizeof(struct com_softc), comprobe, comattach
-};
-#endif
-
-#if NCOM_PICA
-#undef  CONADDR         /* This is stupid but using devs before config .. */
-#define CONADDR 0xe0006000
-
-struct cfattach com_pica_ca = {
-       sizeof(struct com_softc), comprobe, comattach
-};
-#endif
-
-struct cfdriver com_cd = {
-       NULL, "com", DV_TTY
-};
-
-#ifndef CONSPEED
-#define        CONSPEED B9600
-#endif
-
-#ifdef COMCONSOLE
-int    comdefaultrate = CONSPEED;              /* XXX why set default? */
-#else
-int    comdefaultrate = TTYDEF_SPEED;
-#endif
-int    comconsaddr;
-int    comconsinit;
-int    comconsattached;
-bus_space_tag_t comconsiot;
-bus_space_handle_t comconsioh;
-tcflag_t comconscflag = TTYDEF_CFLAG;
-
-int    commajor;
-int    comsopen = 0;
-int    comevents = 0;
-
-#ifdef KGDB
-#include <machine/remote-sl.h>
-extern int kgdb_dev;
-extern int kgdb_rate;
-extern int kgdb_debug_init;
-#endif
-
-#define        DEVUNIT(x)      (minor(x) & 0x7f)
-#define        DEVCUA(x)       (minor(x) & 0x80)
-
-/* Macros to clear/set/test flags. */
-#define        SET(t, f)       (t) |= (f)
-#define        CLR(t, f)       (t) &= ~(f)
-#define        ISSET(t, f)     ((t) & (f))
-
-#if NCOM_PCMCIA
-#include <dev/pcmcia/pcmciavar.h>
-
-int    com_pcmcia_match __P((struct device *, void *, void *));
-void   com_pcmcia_attach __P((struct device *, struct device *, void *));
-int    com_pcmcia_detach __P((struct device *));
-
-struct cfattach com_pcmcia_ca = {
-       sizeof(struct com_softc), com_pcmcia_match, comattach,
-       com_pcmcia_detach
-};
-
-int    com_pcmcia_mod __P((struct pcmcia_link *pc_link, struct device *self,
-           struct pcmcia_conf *pc_cf, struct cfdata *cf));
-
-/* additional setup needed for pcmcia devices */
-/* modify config entry */
-int 
-com_pcmcia_mod(pc_link, self, pc_cf, cf)
-    struct pcmcia_link *pc_link;
-    struct device *self;
-    struct pcmcia_conf *pc_cf; 
-    struct cfdata *cf;
-{               
-       int err; 
-
-       if (!(err = PCMCIA_BUS_CONFIG(pc_link->adapter, pc_link, self,
-           pc_cf, cf))) {
-               pc_cf->memwin = 0;
-               if (pc_cf->cfgtype == 0) 
-               pc_cf->cfgtype = CFGENTRYID; /* determine from ioaddr */
-       }
-       return err;
-}
-
-int com_pcmcia_isa_attach __P((struct device *, void *, void *,
-                              struct pcmcia_link *));
-int com_pcmcia_remove __P((struct pcmcia_link *, struct device *));
-
-static struct pcmcia_com {
-       struct pcmcia_device pcd;
-} pcmcia_com =  {
-       {"PCMCIA Modem card", com_pcmcia_mod, com_pcmcia_isa_attach,
-        NULL, com_pcmcia_remove}
-};          
-
-
-struct pcmciadevs pcmcia_com_devs[] = {
-       { "com", 0,
-       NULL, "*MODEM*", NULL, NULL,
-       NULL, (void *)&pcmcia_com 
-       },
-       { "com", 0,
-       NULL, NULL, "*MODEM*", NULL,
-       NULL, (void *)&pcmcia_com 
-       },
-       { "com", 0,
-       NULL, NULL, NULL, "*MODEM*",
-       NULL, (void *)&pcmcia_com 
-       },
-       {NULL}
-};
-#define ncom_pcmcia_devs sizeof(pcmcia_com_devs)/sizeof(pcmcia_com_devs[0])
-
-int
-com_pcmcia_match(parent, match, aux)
-       struct device *parent;
-       void *match, *aux;
-{
-       return pcmcia_slave_match(parent, match, aux, pcmcia_com_devs,
-           ncom_pcmcia_devs);
-}
-
-int
-com_pcmcia_isa_attach(parent, match, aux, pc_link)
-       struct device *parent;
-       void *match;
-       void *aux;
-       struct pcmcia_link *pc_link;
-{
-       struct isa_attach_args *ia = aux;
-       struct com_softc *sc = match;
-       int rval;
-
-       if ((rval = comprobe(parent, sc->sc_dev.dv_cfdata, ia))) {
-               if (ISSET(pc_link->flags, PCMCIA_REATTACH)) {
-#ifdef COM_DEBUG
-                       printf("comreattach, hwflags=%x\n", sc->sc_hwflags);
-#endif
-                       sc->sc_hwflags = COM_HW_REATTACH |
-                               (sc->sc_hwflags & (COM_HW_ABSENT_PENDING|COM_HW_CONSOLE));
-               } else
-                       sc->sc_hwflags = 0;
-               sc->sc_ic = ia->ia_ic;
-       }
-       return rval;
-}
-
-
-/*
- * Called by config_detach attempts, shortly after com_pcmcia_remove
- * was called.
- */
-int
-com_pcmcia_detach(self)
-       struct device *self;
-{
-       struct com_softc *sc = (void *)self;
-
-       if (ISSET(sc->sc_hwflags, COM_HW_ABSENT_PENDING)) {
-               /* don't let it really be detached, it is still open */
-               return EBUSY;
-       }
-       return 0;               /* OK! */
-}
-
-/*
- * called by pcmcia framework to accept/reject remove attempts.
- * If we return 0, then the detach will proceed.
- */
-int
-com_pcmcia_remove(pc_link, self)
-       struct pcmcia_link *pc_link;
-       struct device *self;
-{
-       struct com_softc *sc = (void *)self;
-       struct tty *tp;
-       int s;
-
-       if (!sc->sc_tty)
-               goto ok;
-       tp = sc->sc_tty;
-
-       /* not in use ?  if so, return "OK" */
-       if (!ISSET(tp->t_state, TS_ISOPEN) &&
-           !ISSET(tp->t_state, TS_WOPEN)) {
-               ttyfree(sc->sc_tty);
-               sc->sc_tty = NULL;
-    ok:
-               isa_intr_disestablish(sc->sc_ic, sc->sc_ih);
-               sc->sc_ih = NULL;
-               SET(sc->sc_hwflags, COM_HW_ABSENT);
-               return 0;               /* OK! */
-       }
-       /*
-        * Not easily removed.  Put device into a dead state, clean state
-        * as best we can.  notify all waiters.
-        */
-       SET(sc->sc_hwflags, COM_HW_ABSENT|COM_HW_ABSENT_PENDING);
-#ifdef COM_DEBUG
-       printf("pending detach flags %x\n", sc->sc_hwflags);
-#endif
-
-       s = spltty();
-       com_absent_notify(sc);
-       splx(s);
-
-       return 0;
-}
-
-#if 0
-void
-com_pcmcia_attach(parent, self, aux)
-       struct device *parent, *self;
-       void *aux;
-{
-       struct pcmcia_attach_args *paa = aux;
-       
-       printf("com_pcmcia_attach %p %p %p\n", parent, self, aux);
-       delay(2000000);
-       if (!pcmcia_configure(parent, self, paa->paa_link)) {
-               struct com_softc *sc = (void *)self;
-               sc->sc_hwflags |= COM_HW_ABSENT;
-               printf(": not attached\n");
-       }
-}
-#endif
-#endif
-
-/*
- * must be called at spltty() or higher.
- */
-void
-com_absent_notify(sc)
-       struct com_softc *sc;
-{
-       struct tty *tp = sc->sc_tty;
-
-       if (tp) {
-               CLR(tp->t_state, TS_CARR_ON|TS_BUSY);
-               ttyflush(tp, FREAD|FWRITE);
-       }
-}
-
-int
-comspeed(speed)
-       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((COM_FREQ / 16), speed);
-       if (x <= 0)
-               return -1;
-       err = divrnd((COM_FREQ / 16) * 1000, speed * x) - 1000;
-       if (err < 0)
-               err = -err;
-       if (err > COM_TOLERANCE)
-               return -1;
-       return x;
-
-#undef divrnd(n, q)
-}
-
-int
-comprobe1(iot, ioh, iobase)
-       bus_space_tag_t iot;
-       bus_space_handle_t ioh;
-       int iobase;
-{
-       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;
-}
-
-#ifdef COM_HAYESP
-int
-comprobeHAYESP(hayespioh, sc)
-       bus_space_handle_t hayespioh;
-       struct com_softc *sc;
-{
-       char    val, dips;
-       int     combaselist[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
-       bus_space_tag_t iot = sc->sc_iot;
-
-       /*
-        * Hayes ESP cards have two iobases.  One is for compatibility with
-        * 16550 serial chips, and at the same ISA PC base addresses.  The
-        * other is for ESP-specific enhanced features, and lies at a
-        * different addressing range entirely (0x140, 0x180, 0x280, or 0x300).
-        */
-
-       /* Test for ESP signature */
-       if ((bus_space_read_1(iot, hayespioh, 0) & 0xf3) == 0)
-               return 0;
-
-       /*
-        * ESP is present at ESP enhanced base address; unknown com port
-        */
-
-       /* Get the dip-switch configurations */
-       bus_space_write_1(iot, hayespioh, HAYESP_CMD1, HAYESP_GETDIPS);
-       dips = bus_space_read_1(iot, hayespioh, HAYESP_STATUS1);
-
-       /* Determine which com port this ESP card services: bits 0,1 of  */
-       /*  dips is the port # (0-3); combaselist[val] is the com_iobase */
-       if (sc->sc_iobase != combaselist[dips & 0x03])
-               return 0;
-
-       printf(": ESP");
-
-       /* Check ESP Self Test bits. */
-       /* Check for ESP version 2.0: bits 4,5,6 == 010 */
-       bus_space_write_1(iot, hayespioh, HAYESP_CMD1, HAYESP_GETTEST);
-       val = bus_space_read_1(iot, hayespioh, HAYESP_STATUS1); /* Clear reg 1 */
-       val = bus_space_read_1(iot, hayespioh, HAYESP_STATUS2);
-       if ((val & 0x70) < 0x20) {
-               printf("-old (%o)", val & 0x70);
-               /* we do not support the necessary features */
-               return 0;
-       }
-
-       /* Check for ability to emulate 16550: bit 8 == 1 */
-       if ((dips & 0x80) == 0) {
-               printf(" slave");
-               /* XXX Does slave really mean no 16550 support?? */
-               return 0;
-       }
-
-       /*
-        * If we made it this far, we are a full-featured ESP v2.0 (or
-        * better), at the correct com port address.
-        */
-
-       SET(sc->sc_hwflags, COM_HW_HAYESP);
-       printf(", 1024 byte fifo\n");
-       return 1;
-}
-#endif
-
-int
-comprobe(parent, match, aux)
-       struct device *parent;
-       void *match, *aux;
-{
-       bus_space_tag_t iot;
-       bus_space_handle_t ioh;
-       int iobase, needioh;
-       int rv = 1;
-
-#if NCOM_ISA || NCOM_PCMCIA
-#define IS_ISA(parent) \
-       (!strcmp((parent)->dv_cfdata->cf_driver->cd_name, "isa") || \
-        !strcmp((parent)->dv_cfdata->cf_driver->cd_name, "pcmcia"))
-#elif NCOM_ISA
-#define IS_ISA(parent) \
-       !strcmp((parent)->dv_cfdata->cf_driver->cd_name, "isa")
-#endif
-#if NCOM_PICA
-#define IS_PICA(parent) \
-       !strcmp((parent)->dv_cfdata->cf_driver->cd_name, "pica")
-#endif
-       /*
-        * XXX should be broken out into functions for isa probe and
-        * XXX for commulti probe, with a helper function that contains
-        * XXX most of the interesting stuff.
-        */
-#if NCOM_ISA || NCOM_PCMCIA
-       if (IS_ISA(parent)) {
-               struct isa_attach_args *ia = aux;
-
-               iot = ia->ia_iot;
-               iobase = ia->ia_iobase;
-               needioh = 1;
-       } else
-#endif
-#if NCOM_COMMULTI
-       if (1) {
-               struct cfdata *cf = match;
-               struct commulti_attach_args *ca = aux;
-               if (cf->cf_loc[0] != -1 && cf->cf_loc[0] != ca->ca_slave)
-                       return (0);
-
-               iot = ca->ca_iot;
-               iobase = ca->ca_iobase;
-               ioh = ca->ca_ioh;
-               needioh = 0;
-       } else
-#endif
-#if NCOM_PICA
-       if(IS_PICA(parent)) {
-               struct confargs *ca = aux;
-               if(!BUS_MATCHNAME(ca, "com"))
-                       return(0);
-               iobase = (long)BUS_CVTADDR(ca);
-               iot = 0;
-               needioh = 1;
-       } else
-#endif
-               return(0);                      /* This cannot happen */
-
-       /* if it's in use as console, it's there. */
-       if (iobase == comconsaddr && !comconsattached)
-               goto out;
-
-       if (needioh && bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh)) {
-               rv = 0;
-               goto out;
-       }
-       rv = comprobe1(iot, ioh, iobase);
-       if (needioh)
-               bus_space_unmap(iot, ioh, COM_NPORTS);
-
-out:
-#if NCOM_ISA || NCOM_PCMCIA
-       if (rv && IS_ISA(parent)) {
-               struct isa_attach_args *ia = aux;
-
-               ia->ia_iosize = COM_NPORTS;
-               ia->ia_msize = 0;
-       }
-#endif
-       return (rv);
-}
-
-void
-comattach(parent, self, aux)
-       struct device *parent, *self;
-       void *aux;
-{
-       struct com_softc *sc = (void *)self;
-       int iobase, irq;
-       bus_space_tag_t iot;
-       bus_space_handle_t ioh;
-#ifdef COM_HAYESP
-       int     hayesp_ports[] = { 0x140, 0x180, 0x280, 0x300, 0 };
-       int     *hayespp;
-#endif
-
-       /*
-        * XXX should be broken out into functions for isa attach and
-        * XXX for commulti attach, with a helper function that contains
-        * XXX most of the interesting stuff.
-        */
-       if (ISSET(sc->sc_hwflags, COM_HW_REATTACH)) {
-               int s;
-               s = spltty();
-               com_absent_notify(sc);
-               splx(s);
-       } else
-           sc->sc_hwflags = 0;
-       sc->sc_swflags = 0;
-#if NCOM_ISA || NCOM_PCMCIA
-       if (IS_ISA(parent)) {
-               struct isa_attach_args *ia = aux;
-
-               /*
-                * We're living on an isa.
-                */
-               iobase = ia->ia_iobase;
-               iot = ia->ia_iot;
-               if (iobase != comconsaddr) {
-                       if (bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh))
-                               panic("comattach: io mapping failed");
-               } else
-                       ioh = comconsioh;
-               irq = ia->ia_irq;
-       } else
-#endif
-#if NCOM_COMMULTI
-       if (1) {
-               struct commulti_attach_args *ca = aux;
-
-               /*
-                * We're living on a commulti.
-                */
-               iobase = ca->ca_iobase;
-               iot = ca->ca_iot;
-               ioh = ca->ca_ioh;
-               irq = IRQUNK;
-
-               if (ca->ca_noien)
-                       SET(sc->sc_hwflags, COM_HW_NOIEN);
-       } else
-#endif
-#if NCOM_PICA
-       if(IS_PICA(parent)) {
-               struct confargs *ca = aux;
-               iobase = (long)BUS_CVTADDR(ca);
-               iot = 0;
-               irq = 0;
-               ioh = iobase;
-       } else
-#endif
-               panic("comattach: impossible");
-
-       sc->sc_iot = iot;
-       sc->sc_ioh = ioh;
-       sc->sc_iobase = iobase;
-
-       if (iobase == comconsaddr) {
-               comconsattached = 1;
-
-               /* 
-                * Need to reset baud rate, etc. of next print so reset
-                * comconsinit.  Also make sure console is always "hardwired".
-                */
-               delay(1000);                    /* wait for output to finish */
-               comconsinit = 0;
-               SET(sc->sc_hwflags, COM_HW_CONSOLE);
-               SET(sc->sc_swflags, COM_SW_SOFTCAR);
-       }
-
-#ifdef COM_HAYESP
-       /* Look for a Hayes ESP board. */
-       for (hayespp = hayesp_ports; *hayespp != 0; hayespp++) {
-               bus_space_handle_t hayespioh;
-
-#define        HAYESP_NPORTS   8                       /* XXX XXX XXX ??? ??? ??? */
-               if (bus_space_map(iot, *hayespp, HAYESP_NPORTS, 0, &hayespioh))
-                       continue;
-               if (comprobeHAYESP(hayespioh, sc)) {
-                       sc->sc_hayespbase = *hayespp;
-                       sc->sc_hayespioh = hayespioh;
-                       break;
-               }
-               bus_space_unmap(iot, hayespioh, HAYESP_NPORTS);
-       }
-       /* No ESP; look for other things. */
-       if (*hayespp == 0) {
-#endif
-
-       /* look for a NS 16550AF UART with FIFOs */
-       bus_space_write_1(iot, ioh, com_fifo,
-           FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_14);
-       delay(100);
-       if (ISSET(bus_space_read_1(iot, ioh, com_iir), IIR_FIFO_MASK) ==
-           IIR_FIFO_MASK)
-               if (ISSET(bus_space_read_1(iot, ioh, com_fifo), FIFO_TRIGGER_14) ==
-                   FIFO_TRIGGER_14) {
-                       SET(sc->sc_hwflags, COM_HW_FIFO);
-                       printf(": ns16550a, working fifo\n");
-               } else
-                       printf(": ns16550, broken fifo\n");
-       else
-               printf(": ns8250 or ns16450, no fifo\n");
-       bus_space_write_1(iot, ioh, com_fifo, 0);
-#ifdef COM_HAYESP
-       }
-#endif
-
-       /* disable interrupts */
-       bus_space_write_1(iot, ioh, com_ier, 0);
-       bus_space_write_1(iot, ioh, com_mcr, 0);
-
-       if (irq != IRQUNK) {
-#if NCOM_ISA || NCOM_PCMCIA
-               if (IS_ISA(parent)) {
-                       struct isa_attach_args *ia = aux;
-
-                       sc->sc_ih = isa_intr_establish(ia->ia_ic, irq,
-                           IST_EDGE, IPL_TTY, comintr, sc,
-                           sc->sc_dev.dv_xname);
-               } else
-#endif
-#if NCOM_PICA
-               if (IS_PICA(parent)) {
-                       struct confargs *ca = aux;
-                       BUS_INTR_ESTABLISH(ca, comintr, (void *)(long)sc);
-               } else
-#endif
-                       panic("comattach: IRQ but can't have one");
-       }
-
-#ifdef KGDB
-       if (kgdb_dev == makedev(commajor, unit)) {
-               if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE))
-                       kgdb_dev = -1;  /* can't debug over console port */
-               else {
-                       cominit(iot, ioh, kgdb_rate);
-                       if (kgdb_debug_init) {
-                               /*
-                                * Print prefix of device name,
-                                * let kgdb_connect print the rest.
-                                */
-                               printf("%s: ", sc->sc_dev.dv_xname);
-                               kgdb_connect(1);
-                       } else
-                               printf("%s: kgdb enabled\n",
-                                   sc->sc_dev.dv_xname);
-               }
-       }
-#endif
-
-       /* XXX maybe move up some? */
-       if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE))
-               printf("%s: console\n", sc->sc_dev.dv_xname);
-}
-
-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 || ISSET(sc->sc_hwflags, COM_HW_ABSENT|COM_HW_ABSENT_PENDING))
-               return ENXIO;
-
-       s = spltty();
-       if (!sc->sc_tty) {
-               tp = sc->sc_tty = ttymalloc();
-               tty_attach(tp);
-       } 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);
-
-               if (comsopen++ == 0)
-                       timeout(compoll, NULL, 1);
-
-               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;
-#ifdef COM_HAYESP
-               /* Setup the ESP board */
-               if (ISSET(sc->sc_hwflags, COM_HW_HAYESP)) {
-                       bus_space_handle_t hayespioh = sc->sc_hayespioh;
-
-                       bus_space_write_1(iot, ioh, com_fifo,
-                            FIFO_DMA_MODE|FIFO_ENABLE|
-                            FIFO_RCV_RST|FIFO_XMT_RST|FIFO_TRIGGER_8);
-
-                       /* Set 16550 compatibility mode */
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD1, HAYESP_SETMODE);
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD2, 
-                            HAYESP_MODE_FIFO|HAYESP_MODE_RTS|
-                            HAYESP_MODE_SCALE);
-
-                       /* Set RTS/CTS flow control */
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD1, HAYESP_SETFLOWTYPE);
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD2, HAYESP_FLOW_RTS);
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD2, HAYESP_FLOW_CTS);
-
-                       /* Set flow control levels */
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD1, HAYESP_SETRXFLOW);
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD2, 
-                            HAYESP_HIBYTE(HAYESP_RXHIWMARK));
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD2,
-                            HAYESP_LOBYTE(HAYESP_RXHIWMARK));
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD2,
-                            HAYESP_HIBYTE(HAYESP_RXLOWMARK));
-                       bus_space_write_1(iot, hayespioh, HAYESP_CMD2,
-                            HAYESP_LOBYTE(HAYESP_RXLOWMARK));
-               } else
-#endif
-               if (ISSET(sc->sc_hwflags, COM_HW_FIFO)) {
-                       /*
-                        * (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_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST |
-                                   (tp->t_ispeed <= 1200 ?
-                                   FIFO_TRIGGER_1 : FIFO_TRIGGER_8));
-                               delay(100);
-                               if(!ISSET(bus_space_read_1(iot, ioh,
-                                   com_lsr), LSR_RXRDY))
-                                       break;
-                       }
-               }
-
-               /* 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;
-               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;
-               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);
-       } 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 */
-       }
-
-       /* wait for carrier if necessary */
-       if (ISSET(flag, O_NONBLOCK)) {
-               if (!DEVCUA(dev) && sc->sc_cua) {
-                       /* Opening TTY non-blocking... but the CUA is busy */
-                       splx(s);
-                       return EBUSY;
-               }
-       } else {
-               while (!(DEVCUA(dev) && 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 (error) {
-                               /* XXX should turn off chip if we're the
-                                  only waiter */
-                               if (DEVCUA(dev))
-                                       sc->sc_cua = 0;
-                               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];
-       struct tty *tp = sc->sc_tty;
-       bus_space_tag_t iot = sc->sc_iot;
-       bus_space_handle_t ioh = sc->sc_ioh;
-       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(sc->sc_hwflags, COM_HW_ABSENT|COM_HW_ABSENT_PENDING)) {
-               /* can't do any of this stuff .... */
-               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 */
-                       bus_space_write_1(iot, ioh, com_mcr, 0);
-               }
-       }
-       CLR(tp->t_state, TS_BUSY | TS_FLUSH);
-       if (--comsopen == 0)
-               untimeout(compoll, NULL);
-       sc->sc_cua = 0;
-       splx(s);
-       ttyclose(tp);
-#ifdef COM_DEBUG
-       /* mark it ready for more use if reattached earlier */
-       if (ISSET(sc->sc_hwflags, COM_HW_ABSENT_PENDING)) {
-           printf("comclose pending cleared\n");
-       }
-#endif
-       CLR(sc->sc_hwflags, COM_HW_ABSENT_PENDING);
-
-#ifdef notyet /* XXXX */
-       if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
-               ttyfree(tp);
-               sc->sc_tty = 0;
-       }
-#endif
-       return 0;
-}
-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;
-       if (ISSET(sc->sc_hwflags, COM_HW_ABSENT|COM_HW_ABSENT_PENDING)) {
-               int s = spltty();
-               com_absent_notify(sc);
-               splx(s);
-               return EIO;
-       }
-
-       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;
-       if (ISSET(sc->sc_hwflags, COM_HW_ABSENT|COM_HW_ABSENT_PENDING)) {
-               int s = spltty();
-               com_absent_notify(sc);
-               splx(s);
-               return EIO;
-       }
-
-       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);
-       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;
-
-       if (ISSET(sc->sc_hwflags, COM_HW_ABSENT|COM_HW_ABSENT_PENDING)) {
-               int s = spltty();
-               com_absent_notify(sc);
-               splx(s);
-               return EIO;
-       }
-
-       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);
-               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);
-
-               *(int *)data = userbits;
-               break;
-       }
-       case TIOCSFLAGS: {
-               int userbits, driverbits = 0;
-
-               error = suser(p->p_ucred, &p->p_acflag); 
-               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);
-
-               sc->sc_swflags = driverbits;
-               break;
-       }
-       default:
-               return ENOTTY;
-       }
-
-       return 0;
-}
-
-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(t->c_ospeed);
-       u_char lcr;
-       tcflag_t oldcflag;
-       int s;
-
-       if (ISSET(sc->sc_hwflags, COM_HW_ABSENT|COM_HW_ABSENT_PENDING)) {
-               int s = spltty();
-               com_absent_notify(sc);
-               splx(s);
-               return EIO;
-       }
-
-       /* 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;
-
-       s = spltty();
-
-       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 will 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) {
-                                       splx(s);
-                                       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);
-                       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_HAYESP) &&
-                   ISSET(sc->sc_hwflags, COM_HW_FIFO))
-                       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);
-                               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... */
-       splx(s);
-       comstart(tp);
-       return 0;
-}
-
-void
-comstart_pending(arg)
-       void *arg;
-{
-       struct com_softc *sc = arg;
-       int s;
-
-       s = spltty();
-       com_absent_notify(sc);
-       splx(s);
-}
-
-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(sc->sc_hwflags, COM_HW_ABSENT|COM_HW_ABSENT_PENDING)) {
-               /*
-                * not quite good enough: if caller is ttywait() it will
-                * go to sleep immediately, so hang out a bit and then
-                * prod caller again.
-                */
-               com_absent_notify(sc);
-               timeout(comstart_pending, sc, 1);
-               goto out;
-       }
-       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);
-
-       if (!ISSET(sc->sc_ier, IER_ETXRDY)) {
-               SET(sc->sc_ier, IER_ETXRDY);
-               bus_space_write_1(iot, ioh, com_ier, sc->sc_ier);
-       }
-#ifdef COM_HAYESP
-       if (ISSET(sc->sc_hwflags, COM_HW_HAYESP)) {
-               u_char buffer[1024], *cp = buffer;
-               int n = q_to_b(&tp->t_outq, cp, sizeof buffer);
-               do
-                       bus_space_write_1(iot, ioh, com_data, *cp++);
-               while (--n);
-       }
-       else
-#endif
-       if (ISSET(sc->sc_hwflags, COM_HW_FIFO)) {
-               u_char buffer[16], *cp = buffer;
-               int n = q_to_b(&tp->t_outq, cp, sizeof buffer);
-               do {
-                       bus_space_write_1(iot, ioh, com_data, *cp++);
-               } while (--n);
-       } else
-               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);
-       }
-       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
-compoll(arg)
-       void *arg;
-{
-       int unit;
-       struct com_softc *sc;
-       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
-       };
-
-       s = spltty();
-       if (comevents == 0) {
-               splx(s);
-               goto out;
-       }
-       comevents = 0;
-       splx(s);
-
-       for (unit = 0; unit < com_cd.cd_ndevs; unit++) {
-               sc = com_cd.cd_devs[unit];
-               if (sc == 0 || sc->sc_ibufp == sc->sc_ibuf)
-                       continue;
-
-               tp = sc->sc_tty;
-
-               s = spltty();
-
-               ibufp = sc->sc_ibuf;
-               ibufend = sc->sc_ibufp;
-
-               if (ibufp == ibufend) {
-                       splx(s);
-                       continue;
-               }
-
-               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 == 0 || !ISSET(tp->t_state, TS_ISOPEN)) {
-                       splx(s);
-                       continue;
-               }
-
-               if (ISSET(tp->t_cflag, CRTSCTS) &&
-                   !ISSET(sc->sc_mcr, MCR_RTS)) {
-                       /* XXX */
-                       SET(sc->sc_mcr, MCR_RTS);
-                       bus_space_write_1(sc->sc_iot, sc->sc_ioh, com_mcr,
-                           sc->sc_mcr);
-               }
-
-               splx(s);
-
-               while (ibufp < ibufend) {
-                       c = *ibufp++;
-                       if (*ibufp & LSR_OE) {
-                               sc->sc_overflows++;
-                               if (sc->sc_errors++ == 0)
-                                       timeout(comdiag, sc, 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:
-       timeout(compoll, NULL, 1);
-}
-
-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;
-#ifdef COM_DEBUG
-       int n;
-       struct {
-               u_char iir, lsr, msr;
-       } iter[32];
-#endif
-
-       if (ISSET(sc->sc_hwflags, COM_HW_ABSENT) || !sc->sc_tty)
-               return 0;               /* can't do squat. */
-
-#ifdef COM_DEBUG
-       n = 0;
-       if (ISSET(iter[n].iir = bus_space_read_1(iot, ioh, com_iir), IIR_NOPEND))
-               return (0);
-#else
-       if (ISSET(bus_space_read_1(iot, ioh, com_iir), IIR_NOPEND))
-               return (0);
-#endif
-
-       tp = sc->sc_tty;
-
-       for (;;) {
-#ifdef COM_DEBUG
-               iter[n].lsr =
-#endif
-               lsr = bus_space_read_1(iot, ioh, com_lsr);
-
-               if (ISSET(lsr, LSR_RXRDY)) {
-                       register u_char *p = sc->sc_ibufp;
-
-                       comevents = 1;
-                       do {
-                               data = bus_space_read_1(iot, ioh, com_data);
-                               if (ISSET(lsr, LSR_BI)) {
-#ifdef notdef
-                                       printf("break %02x %02x %02x %02x\n",
-                                           sc->sc_msr, sc->sc_mcr, sc->sc_lcr,
-                                           sc->sc_dtr);
-#endif
-#ifdef DDB
-                                       if (ISSET(sc->sc_hwflags,
-                                           COM_HW_CONSOLE)) {
-                                               Debugger();
-                                               goto next;
-                                       }
-#endif
-                                       data = 0;
-                               }
-                               if (p >= sc->sc_ibufend) {
-                                       sc->sc_floods++;
-                                       if (sc->sc_errors++ == 0)
-                                               timeout(comdiag, sc, 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
-#ifdef COM_DEBUG
-                               if (++n >= 32)
-                                       goto ohfudge;
-                               iter[n].lsr =
-#endif
-                               lsr = bus_space_read_1(iot, ioh, com_lsr);
-                       } while (ISSET(lsr, LSR_RXRDY));
-
-                       sc->sc_ibufp = p;
-               }
-#ifdef COM_DEBUG
-               else if (ISSET(lsr, LSR_BI|LSR_FE|LSR_PE|LSR_OE))
-                       printf("weird lsr %02x\n", lsr);
-#endif
-
-#ifdef COM_DEBUG
-               iter[n].msr =
-#endif
-               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) &&
-                           !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_DEBUG
-               if (++n >= 32)
-                       goto ohfudge;
-               if (ISSET(iter[n].iir = bus_space_read_1(iot, ioh, com_iir), IIR_NOPEND))
-                       return (1);
-#else
-               if (ISSET(bus_space_read_1(iot, ioh, com_iir), IIR_NOPEND))
-                       return (1);
-#endif
-       }
-#ifdef COM_DEBUG
-ohfudge:
-       printf("comintr: too many iterations");
-       for (n = 0; n < 32; n++) {
-               if ((n % 4) == 0)
-                       printf("\ncomintr: iter[%02d]", n);
-               printf("  %02x %02x %02x", iter[n].iir, iter[n].lsr, iter[n].msr);
-       }
-       printf("\n");
-       printf("comintr: msr %02x mcr %02x lcr %02x ier %02x\n",
-           sc->sc_msr, sc->sc_mcr, sc->sc_lcr, sc->sc_ier);
-       printf("comintr: state %08x cc %d\n", sc->sc_tty->t_state,
-           sc->sc_tty->t_outq.c_cc);
-#endif
-}
-
-/*
- * Following are all routines needed for COM to act as console
- */
-#include <dev/cons.h>
-
-void
-comcnprobe(cp)
-       struct consdev *cp;
-{
-       /* XXX NEEDS TO BE FIXED XXX */
-       bus_space_tag_t iot = 0;
-       bus_space_handle_t ioh;
-       int found;
-#if NCOM_PICA
-       /* XXX */
-#include <arc/arc/arctype.h>
-       extern int cputype;
-
-       if(cputype != ACER_PICA_61)
-               return;
-#endif
-
-       if (bus_space_map(iot, CONADDR, COM_NPORTS, 0, &ioh)) {
-               cp->cn_pri = CN_DEAD;
-               return;
-       }
-       found = comprobe1(iot, ioh, CONADDR);
-       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);
-#ifdef COMCONSOLE
-       cp->cn_pri = CN_REMOTE;         /* Force a serial port console */
-#else
-       cp->cn_pri = CN_NORMAL;
-#endif
-}
-
-void
-comcninit(cp)
-       struct consdev *cp;
-{
-
-#if 0
-       XXX NEEDS TO BE FIXED XXX
-       comconsiot = ???;
-#endif
-       if (bus_space_map(comconsiot, CONADDR, COM_NPORTS, 0, &comconsioh))
-               panic("comcninit: mapping failed");
-
-       cominit(comconsiot, comconsioh, comdefaultrate);
-       comconsaddr = CONADDR;
-       comconsinit = 0;
-}
-
-void
-cominit(iot, ioh, rate)
-       bus_space_tag_t iot;
-       bus_space_handle_t ioh;
-       int rate;
-{
-       int s = splhigh();
-       u_char stat;
-
-       bus_space_write_1(iot, ioh, com_lcr, LCR_DLAB);
-       rate = comspeed(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);
-       bus_space_write_1(iot, ioh, com_ier, IER_ERXRDY | IER_ETXRDY);
-       bus_space_write_1(iot, ioh, com_fifo, FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_4);
-       stat = bus_space_read_1(iot, ioh, com_iir);
-       splx(s);
-}
-
-int
-comcngetc(dev)
-       dev_t dev;
-{
-       int s = splhigh();
-       bus_space_tag_t iot = comconsiot;
-       bus_space_handle_t ioh = comconsioh;
-       u_char stat, c;
-
-       while (!ISSET(stat = bus_space_read_1(iot, ioh, com_lsr), LSR_RXRDY))
-               ;
-       c = bus_space_read_1(iot, ioh, com_data);
-       stat = bus_space_read_1(iot, ioh, com_iir);
-       splx(s);
-       return c;
-}
-
-/*
- * Console kernel output character routine.
- */
-void
-comcnputc(dev, c)
-       dev_t dev;
-       int c;
-{
-       int s = splhigh();
-       bus_space_tag_t iot = comconsiot;
-       bus_space_handle_t ioh = comconsioh;
-       u_char stat;
-       register int timo;
-
-#ifdef KGDB
-       if (dev != kgdb_dev)
-#endif
-       if (comconsinit == 0) {
-               cominit(iot, ioh, comdefaultrate);
-               comconsinit = 1;
-       }
-       /* wait for any pending transmission to finish */
-       timo = 50000;
-       while (!ISSET(stat = bus_space_read_1(iot, ioh, com_lsr), LSR_TXRDY) && --timo)
-               ;
-       bus_space_write_1(iot, ioh, com_data, c);
-       /* wait for this transmission to complete */
-       timo = 1500000;
-       while (!ISSET(stat = bus_space_read_1(iot, ioh, com_lsr), LSR_TXRDY) && --timo)
-               ;
-       /* clear any interrupts generated by this transmission */
-       stat = bus_space_read_1(iot, ioh, com_iir);
-       splx(s);
-}
-
-void
-comcnpollc(dev, on)
-       dev_t dev;
-       int on;
-{
-
-}
diff --git a/sys/dev/isa/comreg.h b/sys/dev/isa/comreg.h
deleted file mode 100644 (file)
index 37e07ef..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-/*     $OpenBSD: comreg.h,v 1.5 1996/11/25 23:09:35 niklas Exp $       */
-/*     $NetBSD: comreg.h,v 1.8 1996/02/05 23:01:50 scottr Exp $        */
-
-/*-
- * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. 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>
-
-#define        COM_FREQ        1843200 /* 16-bit baud rate divisor */
-#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 */
-
-/* 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 */
-
-/* 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 */
-
-/* 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 */
-
-#define        COM_NPORTS      8
-
-/*
- * WARNING: Serial console is assumed to be at COM1 address
- * and CONUNIT must be 0.
- */
-#ifndef CONADDR
-#define        CONADDR (0x3f8)
-#endif
-#ifndef CONUNIT
-#define        CONUNIT (0)
-#endif
diff --git a/sys/dev/isa/comvar.h b/sys/dev/isa/comvar.h
deleted file mode 100644 (file)
index 6895af5..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*     $OpenBSD: comvar.h,v 1.5 1996/11/29 22:54:52 niklas Exp $       */
-/*     $NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $      */
-
-/*
- * 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.
- */
-
-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;
-};
-
-int comprobe1 __P((bus_space_tag_t, bus_space_handle_t, int));
-void cominit __P((bus_space_tag_t, bus_space_handle_t, int));
-int comintr __P((void *));
-
-extern int comconsaddr;
-extern int comconsattached;
-extern bus_space_tag_t comconsiot;
-extern bus_space_handle_t comconsioh;
-extern tcflag_t comconscflag;
index e33a52f..71f7fce 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: files.isa,v 1.29 1996/11/30 00:53:39 niklas Exp $
+#      $OpenBSD: files.isa,v 1.30 1996/11/30 13:39:38 niklas Exp $
 #      $NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config.new file and device description for machine-independent ISA code.
@@ -56,11 +56,8 @@ file dev/isa/rtfps.c                 rtfps
 #
 
 # 8250/16[45]50-based "com" ports
-device com: tty
 attach com at isa with com_isa
 attach com at commulti with com_commulti
-attach com at pcmcia with com_pcmcia
-file   dev/isa/com.c                   com & (com_isa | com_commulti | com_pcmcia | com_pica) needs-flag
 
 # Cyclades Cyclom multiport serial cards
 attach cy at isa with cy_isa
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
new file mode 100644 (file)
index 0000000..acefe3a
--- /dev/null
@@ -0,0 +1,367 @@
+/*     $OpenBSD: com_pcmcia.c,v 1.1 1996/11/30 13:39:24 niklas Exp $   */
+/*     $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
+
+/*-
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. 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.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/tty.h>
+
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <dev/isa/isavar.h>
+
+#include <dev/ic/comreg.h>
+#include <dev/ic/comvar.h>
+#include <dev/ic/ns16550reg.h>
+
+#include <dev/pcmcia/pcmciavar.h>
+
+/* Macros to clear/set/test flags. */
+#define        SET(t, f)       (t) |= (f)
+#define        CLR(t, f)       (t) &= ~(f)
+#define        ISSET(t, f)     ((t) & (f))
+
+int    com_pcmcia_match __P((struct device *, void *, void *));
+void   com_pcmcia_attach __P((struct device *, struct device *, void *));
+int    com_pcmcia_detach __P((struct device *));
+
+int    com_pcmcia_mod __P((struct pcmcia_link *pc_link, struct device *self,
+           struct pcmcia_conf *pc_cf, struct cfdata *cf));
+int    com_pcmcia_isa_attach __P((struct device *, void *, void *,
+           struct pcmcia_link *));
+int    com_pcmcia_remove __P((struct pcmcia_link *, struct device *));
+int    com_pcmcia_probe __P((struct device *, void *, void *));
+
+struct cfattach com_pcmcia_ca = {
+       sizeof(struct com_softc), com_pcmcia_match, com_pcmcia_attach,
+       com_pcmcia_detach
+};
+
+/* additional setup needed for pcmcia devices */
+/* modify config entry */
+int 
+com_pcmcia_mod(pc_link, self, pc_cf, cf)
+    struct pcmcia_link *pc_link;
+    struct device *self;
+    struct pcmcia_conf *pc_cf; 
+    struct cfdata *cf;
+{               
+       int err; 
+
+       if (!(err = PCMCIA_BUS_CONFIG(pc_link->adapter, pc_link, self,
+           pc_cf, cf))) {
+               pc_cf->memwin = 0;
+               if (pc_cf->cfgtype == 0) 
+               pc_cf->cfgtype = CFGENTRYID; /* determine from ioaddr */
+       }
+       return err;
+}
+
+static struct pcmcia_com {
+       struct pcmcia_device pcd;
+} pcmcia_com =  {
+       {"PCMCIA Modem card", com_pcmcia_mod, com_pcmcia_isa_attach,
+        NULL, com_pcmcia_remove}
+};          
+
+
+struct pcmciadevs pcmcia_com_devs[] = {
+       { "com", 0,
+       NULL, "*MODEM*", NULL, NULL,
+       NULL, (void *)&pcmcia_com 
+       },
+       { "com", 0,
+       NULL, NULL, "*MODEM*", NULL,
+       NULL, (void *)&pcmcia_com 
+       },
+       { "com", 0,
+       NULL, NULL, NULL, "*MODEM*",
+       NULL, (void *)&pcmcia_com 
+       },
+       {NULL}
+};
+#define ncom_pcmcia_devs sizeof(pcmcia_com_devs)/sizeof(pcmcia_com_devs[0])
+
+int
+com_pcmcia_match(parent, match, aux)
+       struct device *parent;
+       void *match, *aux;
+{
+       return pcmcia_slave_match(parent, match, aux, pcmcia_com_devs,
+           ncom_pcmcia_devs);
+}
+
+int
+com_pcmcia_isa_attach(parent, match, aux, pc_link)
+       struct device *parent;
+       void *match;
+       void *aux;
+       struct pcmcia_link *pc_link;
+{
+       struct isa_attach_args *ia = aux;
+       struct com_softc *sc = match;
+       int rval;
+
+       if ((rval = com_pcmcia_probe(parent, sc->sc_dev.dv_cfdata, ia))) {
+               if (ISSET(pc_link->flags, PCMCIA_REATTACH)) {
+#ifdef COM_DEBUG
+                       printf("comreattach, hwflags=%x\n", sc->sc_hwflags);
+#endif
+                       sc->sc_hwflags = COM_HW_REATTACH | (sc->sc_hwflags &
+                           (COM_HW_ABSENT_PENDING|COM_HW_CONSOLE));
+               } else
+                       sc->sc_hwflags = 0;
+               sc->sc_ic = ia->ia_ic;
+       }
+       return rval;
+}
+
+
+/*
+ * Called by config_detach attempts, shortly after com_pcmcia_remove
+ * was called.
+ */
+int
+com_pcmcia_detach(self)
+       struct device *self;
+{
+       struct com_softc *sc = (void *)self;
+
+       if (ISSET(sc->sc_hwflags, COM_HW_ABSENT_PENDING)) {
+               /* don't let it really be detached, it is still open */
+               return EBUSY;
+       }
+       return 0;               /* OK! */
+}
+
+/*
+ * called by pcmcia framework to accept/reject remove attempts.
+ * If we return 0, then the detach will proceed.
+ */
+int
+com_pcmcia_remove(pc_link, self)
+       struct pcmcia_link *pc_link;
+       struct device *self;
+{
+       struct com_softc *sc = (void *)self;
+       struct tty *tp;
+       int s;
+
+       if (!sc->sc_tty)
+               goto ok;
+       tp = sc->sc_tty;
+
+       /* not in use ?  if so, return "OK" */
+       if (!ISSET(tp->t_state, TS_ISOPEN) &&
+           !ISSET(tp->t_state, TS_WOPEN)) {
+               ttyfree(sc->sc_tty);
+               sc->sc_tty = NULL;
+    ok:
+               isa_intr_disestablish(sc->sc_ic, sc->sc_ih);
+               sc->sc_ih = NULL;
+               SET(sc->sc_hwflags, COM_HW_ABSENT);
+               return 0;               /* OK! */
+       }
+       /*
+        * Not easily removed.  Put device into a dead state, clean state
+        * as best we can.  notify all waiters.
+        */
+       SET(sc->sc_hwflags, COM_HW_ABSENT|COM_HW_ABSENT_PENDING);
+#ifdef COM_DEBUG
+       printf("pending detach flags %x\n", sc->sc_hwflags);
+#endif
+
+       s = spltty();
+       com_absent_notify(sc);
+       splx(s);
+
+       return 0;
+}
+
+#if 0
+void
+com_pcmcia_attach(parent, self, aux)
+       struct device *parent, *self;
+       void *aux;
+{
+       struct pcmcia_attach_args *paa = aux;
+       
+       printf("com_pcmcia_attach %p %p %p\n", parent, self, aux);
+       delay(2000000);
+       if (!pcmcia_configure(parent, self, paa->paa_link)) {
+               struct com_softc *sc = (void *)self;
+               sc->sc_hwflags |= COM_HW_ABSENT;
+               printf(": not attached\n");
+       }
+}
+#endif
+
+int
+com_pcmcia_probe(parent, match, aux)
+       struct device *parent;
+       void *match, *aux;
+{
+       bus_space_tag_t iot;
+       bus_space_handle_t ioh;
+       int iobase, needioh;
+       int rv = 1;
+       struct isa_attach_args *ia = aux;
+
+       iot = ia->ia_iot;
+       iobase = ia->ia_iobase;
+       needioh = 1;
+
+       /* if it's in use as console, it's there. */
+       if (iobase == comconsaddr && !comconsattached)
+               goto out;
+
+       if (needioh && bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh)) {
+               rv = 0;
+               goto out;
+       }
+       rv = comprobe1(iot, ioh, iobase);
+       if (needioh)
+               bus_space_unmap(iot, ioh, COM_NPORTS);
+
+out:
+       ia->ia_iosize = COM_NPORTS;
+       ia->ia_msize = 0;
+       return (rv);
+}
+
+void
+com_pcmcia_attach(parent, self, aux)
+       struct device *parent, *self;
+       void *aux;
+{
+       struct com_softc *sc = (void *)self;
+       int iobase, irq;
+       bus_space_tag_t iot;
+       bus_space_handle_t ioh;
+       struct isa_attach_args *ia = aux;
+
+       if (ISSET(sc->sc_hwflags, COM_HW_REATTACH)) {
+               int s;
+               s = spltty();
+               com_absent_notify(sc);
+               splx(s);
+       } else
+           sc->sc_hwflags = 0;
+       sc->sc_swflags = 0;
+
+       /*
+        * We're living on an isa.
+        */
+       iobase = ia->ia_iobase;
+       iot = ia->ia_iot;
+        if (iobase != comconsaddr) {
+                if (bus_space_map(iot, iobase, COM_NPORTS, 0, &ioh))
+                       panic("comattach: io mapping failed");
+       } else
+                ioh = comconsioh;
+       irq = ia->ia_irq;
+
+       sc->sc_iot = iot;
+       sc->sc_ioh = ioh;
+       sc->sc_iobase = iobase;
+
+       if (iobase == comconsaddr) {
+               comconsattached = 1;
+
+               /* 
+                * Need to reset baud rate, etc. of next print so reset
+                * comconsinit.  Also make sure console is always "hardwired".
+                */
+               delay(1000);                    /* wait for output to finish */
+               comconsinit = 0;
+               SET(sc->sc_hwflags, COM_HW_CONSOLE);
+               SET(sc->sc_swflags, COM_SW_SOFTCAR);
+       }
+
+       /* look for a NS 16550AF UART with FIFOs */
+       bus_space_write_1(iot, ioh, com_fifo,
+           FIFO_ENABLE | FIFO_RCV_RST | FIFO_XMT_RST | FIFO_TRIGGER_14);
+       delay(100);
+       if (ISSET(bus_space_read_1(iot, ioh, com_iir), IIR_FIFO_MASK) ==
+           IIR_FIFO_MASK)
+               if (ISSET(bus_space_read_1(iot, ioh, com_fifo),
+                   FIFO_TRIGGER_14) == FIFO_TRIGGER_14) {
+                       SET(sc->sc_hwflags, COM_HW_FIFO);
+                       printf(": ns16550a, working fifo\n");
+               } else
+                       printf(": ns16550, broken fifo\n");
+       else
+               printf(": ns8250 or ns16450, no fifo\n");
+       bus_space_write_1(iot, ioh, com_fifo, 0);
+
+       /* disable interrupts */
+       bus_space_write_1(iot, ioh, com_ier, 0);
+       bus_space_write_1(iot, ioh, com_mcr, 0);
+
+       if (irq != IRQUNK) {
+               struct isa_attach_args *ia = aux;
+
+               sc->sc_ih = isa_intr_establish(ia->ia_ic, irq,
+                   IST_EDGE, IPL_TTY, comintr, sc, sc->sc_dev.dv_xname);
+       }
+
+#ifdef KGDB
+       if (kgdb_dev == makedev(commajor, unit)) {
+               if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE))
+                       kgdb_dev = -1;  /* can't debug over console port */
+               else {
+                       cominit(iot, ioh, kgdb_rate);
+                       if (kgdb_debug_init) {
+                               /*
+                                * Print prefix of device name,
+                                * let kgdb_connect print the rest.
+                                */
+                               printf("%s: ", sc->sc_dev.dv_xname);
+                               kgdb_connect(1);
+                       } else
+                               printf("%s: kgdb enabled\n",
+                                   sc->sc_dev.dv_xname);
+               }
+       }
+#endif
+
+       /* XXX maybe move up some? */
+       if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE))
+               printf("%s: console\n", sc->sc_dev.dv_xname);
+}
index e8092cd..aed8e87 100644 (file)
@@ -1,5 +1,5 @@
-#      $OpenBSD: files.pcmcia,v 1.5 1996/05/03 07:58:22 deraadt Exp $
-#      $Id: files.pcmcia,v 1.5 1996/05/03 07:58:22 deraadt Exp $
+#      $OpenBSD: files.pcmcia,v 1.6 1996/11/30 13:39:25 niklas Exp $
+#      $Id: files.pcmcia,v 1.6 1996/11/30 13:39:25 niklas Exp $
 #
 # Config.new file and device description for machine-independent PCMCIA code.
 # Included by ports that need it.
@@ -20,6 +20,10 @@ attach pcmcia at pcmciabus
 file   dev/pcmcia/pcmcia.c             pcmcia  needs-flag
 file   dev/pcmcia/pcmcia_conf.c        pcmcia
 
+# 8250/16[45]50-based "com" ports
+attach com at pcmcia with com_pcmcia
+file   dev/pcmcia/com_pcmcia.c         com_pcmcia
+
 # 3Com 3c589 Ethernet controllers
 # device declaration in sys/conf/files
 attach ep at pcmcia with ep_pcmcia