diff options
| author | onoe <onoe@NetBSD.org> | 2001-06-28 14:38:56 +0000 |
|---|---|---|
| committer | onoe <onoe@NetBSD.org> | 2001-06-28 14:38:56 +0000 |
| commit | 3ad99107cbee524fb6e8fb6659607ab79a4bd7ee (patch) | |
| tree | e5377f7677f8ace4fbdbfcb33ed1deac3b47afbc /sys/dev | |
| parent | a0eef76f357daad7a675581adcdfe8c2f5b920eb (diff) | |
Simplify to update sc_intmask in fwohci_intr().
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ieee1394/fwohci.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c index c4071c8b2ae..2219426aedc 100644 --- a/sys/dev/ieee1394/fwohci.c +++ b/sys/dev/ieee1394/fwohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci.c,v 1.33 2001/06/28 14:37:56 onoe Exp $ */ +/* $NetBSD: fwohci.c,v 1.34 2001/06/28 14:38:56 onoe Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -303,31 +303,18 @@ fwohci_intr(void *arg) intmask &= OHCI_Int_SelfIDComplete; OHCI_CSR_WRITE(sc, OHCI_REG_IntMaskClear, OHCI_Int_BusReset); - sc->sc_intmask = intmask; - sc->sc_intmask |= OHCI_Int_BusReset; + sc->sc_intmask = OHCI_Int_BusReset; } + sc->sc_intmask |= intmask; - if (intmask & OHCI_Int_SelfIDComplete) - sc->sc_intmask |= OHCI_Int_SelfIDComplete; - - if (intmask & OHCI_Int_ReqTxComplete) - sc->sc_intmask |= OHCI_Int_ReqTxComplete; - if (intmask & OHCI_Int_RespTxComplete) - sc->sc_intmask |= OHCI_Int_RespTxComplete; - if (intmask & OHCI_Int_RQPkt) - sc->sc_intmask |= OHCI_Int_RQPkt; - if (intmask & OHCI_Int_RSPkt) - sc->sc_intmask |= OHCI_Int_RSPkt; if (intmask & OHCI_Int_IsochTx) { iso = OHCI_CSR_READ(sc, OHCI_REG_IsoXmitIntEventClear); OHCI_CSR_WRITE(sc, OHCI_REG_IsoXmitIntEventClear, iso); - sc->sc_intmask |= OHCI_Int_IsochTx; } if (intmask & OHCI_Int_IsochRx) { iso = OHCI_CSR_READ(sc, OHCI_REG_IsoRecvIntEventClear); OHCI_CSR_WRITE(sc, OHCI_REG_IsoRecvIntEventClear, iso); sc->sc_iso |= iso; - sc->sc_intmask |= OHCI_Int_IsochRx; } if (!progress) { |
