[src/netbsd-1-6]: src/sys/dev/pci Pullup rev 1.32 (requested by kleink in tic...

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

details:   https://anonhg.NetBSD.org/src/rev/312b421bc6c0
branches:  netbsd-1-6
changeset: 531136:312b421bc6c0
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Mar 15 05:05:26 2004 +0000

description:
Pullup rev 1.32 (requested by kleink in ticket #1613)

Audio 2's DMA current address register implements only the least
significant 20 bits, so make sure its memory allocation won't cross
a 1M boundary.

diffstat:

 sys/dev/pci/eso.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 1daf2ab771bf -r 312b421bc6c0 sys/dev/pci/eso.c
--- a/sys/dev/pci/eso.c Mon Mar 15 04:59:31 2004 +0000
+++ b/sys/dev/pci/eso.c Mon Mar 15 05:05:26 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: eso.c,v 1.24 2002/04/25 00:52:21 kleink Exp $  */
+/*     $NetBSD: eso.c,v 1.24.4.1 2004/03/15 05:05:26 jmc Exp $ */
 
 /*
  * Copyright (c) 1999, 2000 Klaus J. Klein
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.24 2002/04/25 00:52:21 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.24.4.1 2004/03/15 05:05:26 jmc Exp $");
 
 #include "mpu.h"
 
@@ -1547,13 +1547,13 @@
        /*
         * Apparently the Audio 1 DMA controller's current address
         * register can't roll over a 64K address boundary, so we have to
-        * take care of that ourselves.  The second channel DMA controller
-        * doesn't have that restriction, however.
+        * take care of that ourselves.  Similarly, the Audio 2 DMA
+        * controller needs a 1M address boundary.
         */
        if (direction == AUMODE_RECORD)
                boundary = 0x10000;
        else
-               boundary = 0;
+               boundary = 0x100000;
 
 #ifdef alpha
        /*