summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2005-06-29 18:22:50 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2005-06-29 18:22:50 +0000
commitaafedf61e5246f604a88a8de569f65c3a499b6db (patch)
tree2f65f8b206a3fe8eba8cad167595a0c25c6b5eab
parent33c6f1ba35e1071f464cb6cf6420298a8e9af423 (diff)
initialize timeouts needed by pccom
-rw-r--r--sys/dev/cardbus/com_cardbus.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index 55c34e5d41d..07e9975303d 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_cardbus.c,v 1.11 2005/06/27 21:38:57 deraadt Exp $ */
+/* $OpenBSD: com_cardbus.c,v 1.12 2005/06/29 18:22:49 deraadt Exp $ */
/* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
/*
@@ -237,7 +237,7 @@ com_cardbus_gofigure(struct cardbus_attach_args *ca,
}
void
-com_cardbus_attach (struct device *parent, struct device *self, void *aux)
+com_cardbus_attach(struct device *parent, struct device *self, void *aux)
{
struct com_softc *sc = (struct com_softc*)self;
struct com_cardbus_softc *csc = (struct com_cardbus_softc*)self;
@@ -269,6 +269,9 @@ com_cardbus_attach (struct device *parent, struct device *self, void *aux)
sc->sc_iobase = csc->cc_addr;
sc->sc_frequency = COM_FREQ;
+ timeout_set(&sc->sc_dtr_tmo, com_raisedtr, sc);
+ timeout_set(&sc->sc_diag_tmo, comdiag, sc);
+
sc->enable = com_cardbus_enable;
sc->disable = com_cardbus_disable;
sc->enabled = 0;