diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-26 22:32:07 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-26 22:32:07 +0000 |
| commit | 6e2b42bd89bd45b8441c9c3b19f2deea36837b82 (patch) | |
| tree | b19c2bfb430a61a41aca890a54bc33cafacb9bfb /sys/arch/i386/isa/pccomvar.h | |
| parent | 2a98855f6e6d38369b257c2f999103d445922b14 (diff) | |
Share com probe code between com and pccom; allows us to get rid of awkward
code duplication in cardbus, pcmcia and puc attachments.
Joint effort with fgs@; blessed deraadt@
Diffstat (limited to 'sys/arch/i386/isa/pccomvar.h')
| -rw-r--r-- | sys/arch/i386/isa/pccomvar.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/arch/i386/isa/pccomvar.h b/sys/arch/i386/isa/pccomvar.h index 781b59f0752..95f8adb6631 100644 --- a/sys/arch/i386/isa/pccomvar.h +++ b/sys/arch/i386/isa/pccomvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccomvar.h,v 1.14 2002/03/14 01:26:33 millert Exp $ */ +/* $OpenBSD: pccomvar.h,v 1.15 2005/09/26 22:32:05 miod Exp $ */ /* $NetBSD: comvar.h,v 1.5 1996/05/05 19:50:47 christos Exp $ */ /* @@ -57,9 +57,6 @@ struct com_softc { int sc_iobase; int sc_frequency; -#ifdef COM_HAYESP - int sc_hayespbase; -#endif bus_space_handle_t sc_ioh; bus_space_handle_t sc_hayespioh; @@ -80,7 +77,6 @@ struct com_softc { u_char sc_hwflags; #define COM_HW_NOIEN 0x01 #define COM_HW_FIFO 0x02 -#define COM_HW_HAYESP 0x04 #define COM_HW_CONSOLE 0x40 #define COM_HW_KGDB 0x80 u_char sc_swflags; @@ -117,9 +113,6 @@ int comintr(void *); int com_detach(struct device *, int); int com_activate(struct device *, enum devact); -#ifdef COM_HAYESP -int comprobeHAYESP(bus_space_handle_t hayespioh, struct com_softc *sc); -#endif void comdiag(void *); int comspeed(long, long); int comparam(struct tty *, struct termios *); @@ -146,6 +139,8 @@ int com_kgdb_attach(bus_space_tag_t, int, int, int, tcflag_t); int kgdbintr(void *); #endif /* KGDB */ +void com_attach_subr(struct com_softc *); + extern int comconsaddr; extern int comconsinit; extern int comconsattached; |