diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-05-21 18:49:48 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-05-21 18:49:48 +0000 |
| commit | 3742e50ea9434f8e936f2e22dc4fba9389a78d56 (patch) | |
| tree | 3307581645dec46b44f81a837516b11e6f4363bb /sys/dev/puc | |
| parent | c1e9f26e6231e37c635af5509b31b59d1d04b4c2 (diff) | |
Switch i386 from pccom to com. Welcomed by many.
ok dlg@, jsing@, deraadt@
Diffstat (limited to 'sys/dev/puc')
| -rw-r--r-- | sys/dev/puc/com_puc.c | 18 | ||||
| -rw-r--r-- | sys/dev/puc/files.puc | 4 |
2 files changed, 3 insertions, 19 deletions
diff --git a/sys/dev/puc/com_puc.c b/sys/dev/puc/com_puc.c index 6c1db9e3b5e..8a11804423c 100644 --- a/sys/dev/puc/com_puc.c +++ b/sys/dev/puc/com_puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_puc.c,v 1.15 2007/12/04 21:49:35 kettenis Exp $ */ +/* $OpenBSD: com_puc.c,v 1.16 2008/05/21 18:49:47 kettenis Exp $ */ /* * Copyright (c) 1997 - 1999, Jason Downs. All rights reserved. @@ -48,17 +48,9 @@ #include <dev/pci/pucvar.h> #include "com.h" -#ifdef i386 -#include "pccom.h" -#endif #include <dev/ic/comreg.h> -#if NPCCOM > 0 -#include <i386/isa/pccomvar.h> -#endif -#if NCOM > 0 #include <dev/ic/comvar.h> -#endif #include <dev/ic/ns16550reg.h> #define com_lcr com_cfcr @@ -67,17 +59,9 @@ int com_puc_match(struct device *, void *, void *); void com_puc_attach(struct device *, struct device *, void *); int com_puc_detach(struct device *, int ); -#if NCOM > 0 struct cfattach com_puc_ca = { sizeof(struct com_softc), com_puc_match, com_puc_attach, com_puc_detach }; -#endif - -#if NPCCOM > 0 -struct cfattach pccom_puc_ca = { - sizeof(struct com_softc), com_puc_match, com_puc_attach, com_puc_detach -}; -#endif int com_puc_match(parent, match, aux) diff --git a/sys/dev/puc/files.puc b/sys/dev/puc/files.puc index 86b4ccaf580..093c34df6c3 100644 --- a/sys/dev/puc/files.puc +++ b/sys/dev/puc/files.puc @@ -1,9 +1,9 @@ -# $OpenBSD: files.puc,v 1.2 1999/11/28 11:52:06 downsj Exp $ +# $OpenBSD: files.puc,v 1.3 2008/05/21 18:49:47 kettenis Exp $ # # Config file and device description for machine-independent PUC drivers. # Requires PCI to be defined first. attach com at puc with com_puc -file dev/puc/com_puc.c com_puc | pccom_puc +file dev/puc/com_puc.c com_puc attach lpt at puc with lpt_puc file dev/puc/lpt_puc.c lpt_puc |