[src/trunk]: src/sys/dev/pci Disable ISA DMA emulation for SoundBlaster modul...

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

details:   https://anonhg.NetBSD.org/src/rev/a2073fcdeb7f
branches:  trunk
changeset: 544124:a2073fcdeb7f
user:      minoura <minoura%NetBSD.org@localhost>
date:      Wed Mar 12 13:36:22 2003 +0000

description:
Disable ISA DMA emulation for SoundBlaster module explicitly.
This fixes the floppy access problem on some hardware.
Problem reported by Miroslav Kure via Jason Wright <jason [at]
thought [dot] net> of OpenBSD. Thanks.

Fix from ALSA driver; although this setting is undocumented but
according to Jaroslav Kysela <perex [at] suse [dot] cz> of ALSA,
there's no error reported so far.

diffstat:

 sys/dev/pci/yds.c    |  5 +++--
 sys/dev/pci/ydsreg.h |  3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 7ee8fb5c7748 -r a2073fcdeb7f sys/dev/pci/yds.c
--- a/sys/dev/pci/yds.c Wed Mar 12 13:28:19 2003 +0000
+++ b/sys/dev/pci/yds.c Wed Mar 12 13:36:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: yds.c,v 1.16 2003/02/01 06:23:39 thorpej Exp $ */
+/*     $NetBSD: yds.c,v 1.17 2003/03/12 13:36:22 minoura Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.16 2003/02/01 06:23:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.17 2003/03/12 13:36:22 minoura Exp $");
 
 #include "mpu.h"
 
@@ -565,6 +565,7 @@
        reg |= ((YDS_PCI_EX_LEGACY_IMOD) |
                (YDS_PCI_LEGACY_FMEN |
                 YDS_PCI_LEGACY_MEN /*| YDS_PCI_LEGACY_MIEN*/));
+       reg |= YDS_PCI_EX_LEGACY_SMOD_DISABLE;
        if (FLEXIBLE) {
                pci_conf_write(sc->sc_pc, sc->sc_pcitag, YDS_PCI_LEGACY, reg);
                delay(100*1000);
diff -r 7ee8fb5c7748 -r a2073fcdeb7f sys/dev/pci/ydsreg.h
--- a/sys/dev/pci/ydsreg.h      Wed Mar 12 13:28:19 2003 +0000
+++ b/sys/dev/pci/ydsreg.h      Wed Mar 12 13:36:22 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ydsreg.h,v 1.3 2003/03/12 13:28:19 minoura Exp $       */
+/*     $NetBSD: ydsreg.h,v 1.4 2003/03/12 13:36:23 minoura Exp $       */
 
 /*
  * Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -77,6 +77,7 @@
 # define YDS_PCI_EX_LEGACY_JSIO_205    (0x00c0 << 16)
 # define YDS_PCI_EX_LEGACY_MAIM                (0x0100 << 16)
 # define YDS_PCI_EX_LEGACY_SMOD_PCI    (0x0000 << 16)
+# define YDS_PCI_EX_LEGACY_SMOD_DISABLE        (0x0800 << 16)
 # define YDS_PCI_EX_LEGACY_SMOD_DDMA   (0x1000 << 16)
 # define YDS_PCI_EX_LEGACY_SBVER_3     (0x0000 << 16)
 # define YDS_PCI_EX_LEGACY_SBVER_2     (0x2000 << 16)