diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2006-03-17 10:49:13 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2006-03-17 10:49:13 +0000 |
| commit | 727012a9c88348ea4807c8571aa7d15d02d62b68 (patch) | |
| tree | 57998d966e37af8713820d0c19487f6552cb0da1 /sys/dev/ic | |
| parent | d695dc5ddf1cfa88937f155cf754e30e223bfbbd (diff) | |
remove the last remnants of AMI_POLLING
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ami.c | 11 | ||||
| -rw-r--r-- | sys/dev/ic/amivar.h | 3 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c index 983e9597e2f..a854fed92df 100644 --- a/sys/dev/ic/ami.c +++ b/sys/dev/ic/ami.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami.c,v 1.119 2006/03/15 14:31:29 dlg Exp $ */ +/* $OpenBSD: ami.c,v 1.120 2006/03/17 10:49:12 dlg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -341,8 +341,6 @@ ami_attach(struct ami_softc *sc) TAILQ_INSERT_TAIL(&sc->sc_free_ccb, ccb, ccb_link); } - timeout_set(&sc->sc_poll_tmo, (void (*)(void *))ami_intr, sc); - (sc->sc_init)(sc); { paddr_t pa = htole32(AMIMEM_DVA(am)); @@ -1594,13 +1592,6 @@ ami_intr(void *v) } } -#ifdef AMI_POLLING - if (!TAILQ_EMPTY(&sc->sc_ccbq) && !timeout_pending(&sc->sc_poll_tmo)) { - AMI_DPRINTF(AMI_D_INTR, ("tmo ")); - timeout_add(&sc->sc_poll_tmo, 2); - } -#endif - splx(s); AMI_DPRINTF(AMI_D_INTR, ("exit ")); return (rv); diff --git a/sys/dev/ic/amivar.h b/sys/dev/ic/amivar.h index 89cb46f05b2..e079c08c531 100644 --- a/sys/dev/ic/amivar.h +++ b/sys/dev/ic/amivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: amivar.h,v 1.37 2005/12/13 12:13:59 dlg Exp $ */ +/* $OpenBSD: amivar.h,v 1.38 2006/03/17 10:49:12 dlg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -123,7 +123,6 @@ struct ami_softc { int sc_timeout; struct timeout sc_requeue_tmo; - struct timeout sc_poll_tmo; int sc_dis_poll; char sc_fwver[16]; |