Make pccom compile. This stull really needs to be merged into the

normal com driver.

diff --git a/sys/arch/i386/isa/pccom.c b/sys/arch/i386/isa/pccom.c
index e5e4ef5..1ba5468 100644 (file)
--- a/sys/arch/i386/isa/pccom.c
+++ b/sys/arch/i386/isa/pccom.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pccom.c,v 1.9 1996/12/11 13:28:06 deraadt Exp $       */
+/*     $OpenBSD: pccom.c,v 1.10 1996/12/18 16:51:45 millert Exp $      */
 /*     $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */
 
 /*-
@@ -60,88 +60,20 @@
 #include <machine/intr.h>
 
 #include <dev/isa/isavar.h>
-#include <dev/isa/comreg.h>
-#include <dev/isa/comvar.h>
+#include <dev/ic/comreg.h>
 #include <dev/ic/ns16550reg.h>
 #ifdef COM_HAYESP
 #include <dev/ic/hayespreg.h>
 #endif
 #define        com_lcr com_cfcr
 
+#include "pccomvar.h"
 #include "pccom.h"
 
-struct com_softc {
-       struct device sc_dev;
-       void *sc_ih;
-       bus_space_tag_t sc_iot;
-       isa_chipset_tag_t sc_ic;
-       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;
-
-       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
-       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 */
- 
-#define RBUFSIZE 512
-#define RBUFMASK 511
-       u_int sc_rxget;
-       volatile u_int sc_rxput;
-       u_char sc_rxbuf[RBUFSIZE];
-       u_char *sc_tba;
-       int sc_tbc;
-};
-
-#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   comsoft         __P((void));
-int    comhwiflow      __P((struct tty *, int));
-
 /* 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));
 
 /*

diff --git a/sys/arch/i386/isa/pccomvar.h b/sys/arch/i386/isa/pccomvar.h
new file mode 100644 (file)
index 0000000..234a616
--- /dev/null
+++ b/sys/arch/i386/isa/pccomvar.h
@@ -0,0 +1,122 @@
+/*     $OpenBSD: pccomvar.h,v 1.3 1996/12/18 16:51:44 millert 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.
+ */
+
+/* XXX - should be shared among com.c and pccom.c */
+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;
+};
+
+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
+       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 */
+
+#define RBUFSIZE 512                                                
+#define RBUFMASK 511                                                     
+       u_int sc_rxget;
+       volatile u_int sc_rxput;
+       u_char sc_rxbuf[RBUFSIZE];
+       u_char *sc_tba;
+       int sc_tbc;
+};
+
+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 *));
+void   com_absent_notify __P((struct com_softc *sc));
+
+#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   comsoft         __P((void));
+int    comhwiflow      __P((struct tty *, int));
+
+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));
+
+extern int comconsaddr;
+extern int comconsinit;
+extern int comconsattached;
+extern bus_space_tag_t comconsiot;
+extern bus_space_handle_t comconsioh;
+extern tcflag_t comconscflag;