diff options
| author |   deraadt <deraadt@openbsd.org> | 2011-11-15 22:27:52 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2011-11-15 22:27:52 +0000 |
| commit | 40e7fd949122c781db87f2643f28345efb8ac16c (patch) | |
| tree | 6f7594038f9d41576f55dfcb7a164881ee5c8c6f /sys/dev/puc | |
| parent | delay(1) is an extremely short delay, increase this to a measurable amount (diff) | |
| download | wireguard-openbsd-40e7fd949122c781db87f2643f28345efb8ac16c.tar.xz wireguard-openbsd-40e7fd949122c781db87f2643f28345efb8ac16c.zip | |
Simplify various parts of the puc(4) attachment code. Tested lightly
by krw and myself.
Diffstat (limited to 'sys/dev/puc')
| -rw-r--r-- | sys/dev/puc/com_puc.c | 8 | ||||
| -rw-r--r-- | sys/dev/puc/files.puc | 9 | ||||
| -rw-r--r-- | sys/dev/puc/lpt_puc.c | 9 |
3 files changed, 3 insertions, 23 deletions
diff --git a/sys/dev/puc/com_puc.c b/sys/dev/puc/com_puc.c index ca5dcde6801..d0bba48fbf1 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.19 2011/10/25 20:02:20 deraadt Exp $ */ +/* $OpenBSD: com_puc.c,v 1.20 2011/11/15 22:27:53 deraadt Exp $ */ /* * Copyright (c) 1997 - 1999, Jason Downs. All rights reserved. @@ -107,12 +107,6 @@ com_puc_attach(parent, self, aux) else sc->sc_frequency = COM_FREQ * (1 << PUC_COM_GET_POW2(pa->type)); - if (pa->hwtype) - sc->sc_uarttype = pa->hwtype; - - sc->sc_hwflags = 0; - sc->sc_swflags = 0; - com_attach_subr(sc); } diff --git a/sys/dev/puc/files.puc b/sys/dev/puc/files.puc index 093c34df6c3..e69de29bb2d 100644 --- a/sys/dev/puc/files.puc +++ b/sys/dev/puc/files.puc @@ -1,9 +0,0 @@ -# $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 -attach lpt at puc with lpt_puc -file dev/puc/lpt_puc.c lpt_puc diff --git a/sys/dev/puc/lpt_puc.c b/sys/dev/puc/lpt_puc.c index c84f2cd4cb0..f59e8ae944b 100644 --- a/sys/dev/puc/lpt_puc.c +++ b/sys/dev/puc/lpt_puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpt_puc.c,v 1.6 2011/10/25 20:02:20 deraadt Exp $ */ +/* $OpenBSD: lpt_puc.c,v 1.7 2011/11/15 22:27:53 deraadt Exp $ */ /* $NetBSD: lpt_puc.c,v 1.1 1998/06/26 18:52:41 cgd Exp $ */ /* @@ -54,7 +54,7 @@ void lpt_puc_attach(struct device *, struct device *, void *); int lpt_puc_detach(struct device *, int); struct cfattach lpt_puc_ca = { - sizeof(struct lpt_softc), lpt_puc_probe, lpt_puc_attach, lpt_puc_detach + sizeof(struct lpt_softc), lpt_puc_probe, lpt_puc_attach, lpt_puc_detach, }; int @@ -97,16 +97,11 @@ lpt_puc_attach(parent, self, aux) } printf(" %s", intrstr); - sc->sc_state = 0; - lpt_attach_common(sc); } int lpt_puc_detach(struct device *self, int flags) { - - /* cardbus_intr_disestablish(psc->sc_cc, psc->sc_cf, csc->cc_ih); */ - return (0); } |