diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-10-29 16:43:35 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-10-29 16:43:35 +0000 |
| commit | a9b316d20b3daf879810242e334acb1a967ac23c (patch) | |
| tree | a517735ccfe36979189833fc0aa68d6c90e7e8ba /sys | |
| parent | e3b6f090fc5ebf7945a933b9a42b1b5b7fc78889 (diff) | |
Reorganize malo_intr() a bit. Check for unhandled interrupt flags and
do not call wakeup() for each and every command sent. I think more and more
will not tsleep(). OK mglocker@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/malo.c | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c index 2c0c167d748..a86ca4a0e96 100644 --- a/sys/dev/ic/malo.c +++ b/sys/dev/ic/malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: malo.c,v 1.15 2006/10/29 16:41:35 claudio Exp $ */ +/* $OpenBSD: malo.c,v 1.16 2006/10/29 16:43:34 claudio Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -222,9 +222,13 @@ malo_intr(void *arg) /* not for us */ return (0); + if (status & 0x1) + malo_tx_intr(sc); + if (status & 0x2) + malo_rx_intr(sc); if (status & 0x4) { -#ifdef MALO_DEBUG struct malo_cmdheader *hdr = sc->sc_cmd_mem; +#ifdef MALO_DEBUG int i; printf("%s: command answer", sc->sc_dev.dv_xname); @@ -237,15 +241,26 @@ malo_intr(void *arg) } printf("\n"); #endif - /* wakeup caller */ - wakeup(sc); - } - - if (status & 0x1) - malo_tx_intr(sc); + switch (hdr->cmd & ~MALO_CMD_RESPONSE) { + case MALO_CMD_SET_CHANNEL: + bus_dmamap_sync(sc->sc_dmat, sc->sc_cmd_dmam, 0, + PAGE_SIZE, BUS_DMASYNC_POSTWRITE | + BUS_DMASYNC_POSTREAD); + if (hdr->result != 0) + DPRINTF(("%s: command failed: %x\n", + sc->sc_dev.dv_xname, hdr->result)); + break; + case MALO_CMD_GET_HW_SPEC: + case MALO_CMD_SET_PRESCAN: + case MALO_CMD_SET_POSTSCAN: + /* wakeup caller */ + wakeup(sc); + break; + } + } - if (status & 0x2) - malo_rx_intr(sc); + if (status & ~0x7) + DPRINTF(("%s: unkown interrupt %x\n", status)); /* just ack the interrupt */ malo_ctl_write4(sc, 0x0c30, 0); |