[src/trunk]: src/sys/dev/isa Use separate interrupt handlers for play and rec...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d908b4024bc5
branches:  trunk
changeset: 500812:d908b4024bc5
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Dec 18 21:31:32 2000 +0000

description:
Use separate interrupt handlers for play and record the chip has
support for it and we're configured for separate play and record
DRQs.  This makes full-duplex audio work on the Windows Sound System
(found in many Alpha systems).

Submitted by Juergen Weiss <weiss%uni-mainz.de@localhost> in kern/11178.

diffstat:

 sys/dev/isa/ad1848_isa.c |  43 ++++++++++++++++++++++++++++++-------------
 sys/dev/isa/ad1848var.h  |   8 +++++---
 2 files changed, 35 insertions(+), 16 deletions(-)

diffs (102 lines):

diff -r aecbff5e92a3 -r d908b4024bc5 sys/dev/isa/ad1848_isa.c
--- a/sys/dev/isa/ad1848_isa.c  Mon Dec 18 21:27:01 2000 +0000
+++ b/sys/dev/isa/ad1848_isa.c  Mon Dec 18 21:31:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ad1848_isa.c,v 1.16 2000/06/28 16:27:51 mrg Exp $      */
+/*     $NetBSD: ad1848_isa.c,v 1.17 2000/12/18 21:31:32 thorpej Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -521,7 +521,7 @@
        ad1848_isa_halt_output(isc);
        ad1848_isa_halt_input(isc);
 
-       isc->sc_intr = 0;
+       isc->sc_pintr = isc->sc_rintr = NULL;
 
        if (isc->sc_playdrq != -1)
                isa_dmamap_destroy(isc->sc_ic, isc->sc_playdrq);
@@ -556,8 +556,13 @@
            DMAMODE_READ | DMAMODE_LOOPDEMAND, BUS_DMA_NOWAIT);
 
        isc->sc_recrun = 1;
-       isc->sc_intr = intr;
-       isc->sc_arg = arg;
+       if (sc->mode == 2 && isc->sc_playdrq != isc->sc_recdrq) {
+               isc->sc_rintr = intr;
+               isc->sc_rarg = arg;
+       } else {
+               isc->sc_pintr = intr;
+               isc->sc_parg = arg;
+       }
 
        blksize = (blksize * 8) / (param->precision * param->factor * param->channels) - 1;
 
@@ -593,8 +598,8 @@
            DMAMODE_WRITE | DMAMODE_LOOPDEMAND, BUS_DMA_NOWAIT);
 
        isc->sc_playrun = 1;
-       isc->sc_intr = intr;
-       isc->sc_arg = arg;
+       isc->sc_pintr = intr;
+       isc->sc_parg = arg;
 
        blksize = (blksize * 8) / (param->precision * param->factor * param->channels) - 1;
 
@@ -664,15 +669,27 @@
        isc->sc_interrupts++;
 
        /* Handle interrupt */
-       if (isc->sc_intr && (status & INTERRUPT_STATUS)) {
-               (*isc->sc_intr)(isc->sc_arg);
-               retval = 1;
-       }
+       if ((status & INTERRUPT_STATUS) != 0) {
+               if (sc->mode == 2 && isc->sc_playdrq != isc->sc_recdrq) {
+                       status = ad_read(sc, CS_IRQ_STATUS);
+                       if ((status & CS_IRQ_PI) && isc->sc_pintr != NULL) {
+                               (*isc->sc_pintr)(isc->sc_parg);
+                               retval = 1;
+                       }
+                       if ((status & CS_IRQ_CI) && isc->sc_rintr != NULL) {
+                               (*isc->sc_rintr)(isc->sc_rarg);
+                               retval = 1;
+                       }
+               } else {
+                       if (isc->sc_pintr != NULL) {
+                               (*isc->sc_pintr)(isc->sc_parg);
+                               retval = 1;
+                       }
+               }
 
-       /* clear interrupt */
-       if (status & INTERRUPT_STATUS)
+               /* Clear interrupt */
                ADWRITE(sc, AD1848_STATUS, 0);
-
+       }
        return(retval);
 }
 
diff -r aecbff5e92a3 -r d908b4024bc5 sys/dev/isa/ad1848var.h
--- a/sys/dev/isa/ad1848var.h   Mon Dec 18 21:27:01 2000 +0000
+++ b/sys/dev/isa/ad1848var.h   Mon Dec 18 21:31:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ad1848var.h,v 1.34 2000/12/06 18:57:37 matt Exp $      */
+/*     $NetBSD: ad1848var.h,v 1.35 2000/12/18 21:31:32 thorpej Exp $   */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -89,8 +89,10 @@
        bus_size_t sc_rec_maxsize;      /* record/capture DMA size */
        
        u_long  sc_interrupts;          /* number of interrupts taken */
-       void    (*sc_intr)(void *);     /* dma completion intr handler */
-       void    *sc_arg;                /* arg for sc_intr() */
+       void    (*sc_pintr)(void *);    /* play dma completion intr handler */
+       void    *sc_parg;               /* arg for sc_pintr() */
+       void    (*sc_rintr)(void *);    /* rec. dma completion intr handler */
+       void    *sc_rarg;               /* arg for sc_rintr() */
 
        /* Only used by pss XXX */
        int     sc_iobase;