8 files changed, 416 insertions, 318 deletions

diff --git a/sound/drivers/vx/vx_hwdep.c b/sound/drivers/vx/vx_hwdep.c
index 9a3dc3c3b3..c4993b004c 100644
--- a/sound/drivers/vx/vx_hwdep.c
+++ b/sound/drivers/vx/vx_hwdep.c
@@ -23,6 +23,7 @@
 #include <sound/driver.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
+#include <linux/vmalloc.h>
 #include <sound/core.h>
 #include <sound/hwdep.h>
 #include <sound/vx_core.h>
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 953e5f3ea0..88e52dc84c 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -4,9 +4,24 @@
 # More hacking for modularisation.
 #
 # Prompt user for primary drivers.
+
+config OBSOLETE_OSS_DRIVER
+        bool "Obsolete OSS drivers"
+        depends on SOUND_PRIME
+        help
+          This option enables support for obsolete OSS drivers that
+          are scheduled for removal in the near future since there
+          are ALSA drivers for the same hardware.
+
+          Please contact Adrian Bunk <bunk@stusta.de> if you had to
+          say Y here because your soundcard is not properly supported
+          by ALSA.
+
+          If unsure, say N.
+
 config SOUND_BT878
         tristate "BT878 audio dma"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         ---help---
           Audio DMA support for bt878 based grabber boards.  As you might have
           already noticed, bt878 is listed with two functions in /proc/pci.
@@ -22,7 +37,7 @@ config SOUND_BT878
 
 config SOUND_CMPCI
         tristate "C-Media PCI (CMI8338/8738)"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you have a PCI sound card using the CMI8338
           or the CMI8738 chipset.  Data on these chips are available at
@@ -61,7 +76,7 @@ config SOUND_CMPCI_JOYSTICK
 
 config SOUND_EMU10K1
         tristate "Creative SBLive! (EMU10K1)"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         ---help---
           Say Y or M if you have a PCI sound card using the EMU10K1 chipset,
           such as the Creative SBLive!, SB PCI512 or Emu-APS.
@@ -95,7 +110,7 @@ config SOUND_FUSION
 
 config SOUND_CS4281
         tristate "Crystal Sound CS4281"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Picture and feature list at
           <http://www.pcbroker.com/crystal4281.html>.
@@ -112,7 +127,7 @@ config SOUND_BCM_CS4297A
 
 config SOUND_ES1370
         tristate "Ensoniq AudioPCI (ES1370)"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you have a PCI sound card utilizing the Ensoniq
           ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
@@ -125,7 +140,7 @@ config SOUND_ES1370
 
 config SOUND_ES1371
         tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you have a PCI sound card utilizing the Ensoniq
           ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
@@ -138,7 +153,7 @@ config SOUND_ES1371
 
 config SOUND_ESSSOLO1
         tristate "ESS Technology Solo1" 
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you have a PCI sound card utilizing the ESS Technology
           Solo1 chip. To find out if your sound card uses a
@@ -149,7 +164,7 @@ config SOUND_ESSSOLO1
 
 config SOUND_MAESTRO
         tristate "ESS Maestro, Maestro2, Maestro2E driver"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you have a sound system driven by ESS's Maestro line
           of PCI sound chips.  These include the Maestro 1, Maestro 2, and
@@ -158,7 +173,7 @@ config SOUND_MAESTRO
 
 config SOUND_MAESTRO3
         tristate "ESS Maestro3/Allegro driver (EXPERIMENTAL)"
-        depends on SOUND_PRIME && PCI && EXPERIMENTAL
+        depends on SOUND_PRIME && PCI && EXPERIMENTAL && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you have a sound system driven by ESS's Maestro 3
           PCI sound chip.
@@ -172,14 +187,14 @@ config SOUND_ICH
 
 config SOUND_HARMONY
         tristate "PA Harmony audio driver"
-        depends on GSC_LASI && SOUND_PRIME
+        depends on GSC_LASI && SOUND_PRIME && OBSOLETE_OSS_DRIVER
         help
           Say 'Y' or 'M' to include support for Harmony soundchip
           on HP 712, 715/new and many other GSC based machines.
 
 config SOUND_SONICVIBES
         tristate "S3 SonicVibes"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you have a PCI sound card utilizing the S3
           SonicVibes chipset. To find out if your sound card uses a
@@ -218,7 +233,7 @@ config SOUND_VRC5477
 
 config SOUND_AU1000
         tristate "Au1000 Sound"
-        depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500)
+        depends on SOUND_PRIME && (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && OBSOLETE_OSS_DRIVER
 
 config SOUND_AU1550_AC97
         tristate "Au1550 AC97 Sound"
@@ -492,7 +507,7 @@ config MSND_FIFOSIZE
 
 config SOUND_VIA82CXXX
         tristate "VIA 82C686 Audio Codec"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Say Y here to include support for the audio codec found on VIA
           82Cxxx-based chips. Typically these are built into a motherboard.
@@ -563,7 +578,7 @@ config SOUND_AD1889
 
 config SOUND_SGALAXY
         tristate "Aztech Sound Galaxy (non-PnP) cards"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         help
           This module initializes the older non Plug and Play sound galaxy
           cards from Aztech. It supports the Waverider Pro 32 - 3D and the
@@ -599,7 +614,7 @@ config SOUND_ACI_MIXER
 
 config SOUND_CS4232
         tristate "Crystal CS4232 based (PnP) cards"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         help
           Say Y here if you have a card based on the Crystal CS4232 chip set,
           which uses its own Plug and Play protocol.
@@ -613,7 +628,7 @@ config SOUND_CS4232
 
 config SOUND_SSCAPE
         tristate "Ensoniq SoundScape support"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         help
           Answer Y if you have a sound card based on the Ensoniq SoundScape
           chipset. Such cards are being manufactured at least by Ensoniq, Spea
@@ -625,7 +640,7 @@ config SOUND_SSCAPE
 
 config SOUND_GUS
         tristate "Gravis Ultrasound support"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         help
           Say Y here for any type of Gravis Ultrasound card, including the GUS
           or GUS MAX.  See also <file:Documentation/sound/oss/ultrasound> for more
@@ -727,7 +742,7 @@ config SOUND_MPU401
 
 config SOUND_NM256
         tristate "NM256AV/NM256ZX audio support"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         help
           Say M here to include audio support for the NeoMagic 256AV/256ZX
           chipsets. These are the audio chipsets found in the Sony
@@ -739,7 +754,7 @@ config SOUND_NM256
 
 config SOUND_MAD16
         tristate "OPTi MAD16 and/or Mozart based cards"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         ---help---
           Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi
           82C928 or 82C929 or 82C931) audio interface chip. These chips are
@@ -860,7 +875,7 @@ config SOUND_SB
 
 config SOUND_AWE32_SYNTH
         tristate "AWE32 synth"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         help
           Say Y here if you have a Sound Blaster SB32, AWE32-PnP, SB AWE64 or
           similar sound card. See <file:Documentation/sound/oss/README.awe>,
@@ -870,7 +885,7 @@ config SOUND_AWE32_SYNTH
 
 config SOUND_WAVEFRONT
         tristate "Full support for Turtle Beach WaveFront (Tropez Plus, Tropez, Maui) synth/soundcards"
-        depends on SOUND_OSS && m
+        depends on SOUND_OSS && m && OBSOLETE_OSS_DRIVER
         help
           Answer Y or M if you have a Tropez Plus, Tropez or Maui sound card
           and read the files <file:Documentation/sound/oss/Wavefront> and
@@ -878,7 +893,7 @@ config SOUND_WAVEFRONT
 
 config SOUND_MAUI
         tristate "Limited support for Turtle Beach Wave Front (Maui, Tropez) synthesizers"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         help
           Say Y here if you have a Turtle Beach Wave Front, Maui, or Tropez
           sound card.
@@ -904,7 +919,7 @@ config MAUI_BOOT_FILE
 
 config SOUND_YM3812
         tristate "Yamaha FM synthesizer (YM3812/OPL-3) support"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         ---help---
           Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4).
           Answering Y is usually a safe and recommended choice, however some
@@ -920,7 +935,7 @@ config SOUND_YM3812
 
 config SOUND_OPL3SA1
         tristate "Yamaha OPL3-SA1 audio controller"
-        depends on SOUND_OSS
+        depends on SOUND_OSS && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you have a Yamaha OPL3-SA1 sound chip, which is
           usually built into motherboards. Read
@@ -946,7 +961,7 @@ config SOUND_OPL3SA2
 
 config SOUND_YMFPCI
         tristate "Yamaha YMF7xx PCI audio (native mode)"
-        depends on SOUND_OSS && PCI
+        depends on SOUND_OSS && PCI && OBSOLETE_OSS_DRIVER
         help
           Support for Yamaha cards including the YMF711, YMF715, YMF718,
           YMF719, YMF724, Waveforce 192XG, and Waveforce 192 Digital.
@@ -1088,11 +1103,11 @@ config SOUND_KAHLUA
 
 config SOUND_ALI5455
         tristate "ALi5455 audio support"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
 
 config SOUND_FORTE
         tristate "ForteMedia FM801 driver"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you want driver support for the ForteMedia FM801 PCI
           audio controller (Abit AU10, Genius Sound Maker, HP Workstation
@@ -1100,7 +1115,7 @@ config SOUND_FORTE
 
 config SOUND_RME96XX
         tristate "RME Hammerfall (RME96XX) support"
-        depends on SOUND_PRIME && PCI
+        depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER
         help
           Say Y or M if you have a Hammerfall or Hammerfall light
           multichannel card from RME. If you want to access advanced
@@ -1108,7 +1123,7 @@ config SOUND_RME96XX
 
 config SOUND_AD1980
         tristate "AD1980 front/back switch plugin"
-        depends on SOUND_PRIME
+        depends on SOUND_PRIME && OBSOLETE_OSS_DRIVER
 
 config SOUND_SH_DAC_AUDIO
         tristate "SuperH DAC audio support"
diff --git a/sound/oss/msnd.c b/sound/oss/msnd.c
index 4f1ff1bccd..a7ad2b0a2a 100644
--- a/sound/oss/msnd.c
+++ b/sound/oss/msnd.c
@@ -24,7 +24,6 @@
  *
  ********************************************************************/
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
diff --git a/sound/oss/os.h b/sound/oss/os.h
index 80dce329cc..0490562c7f 100644
--- a/sound/oss/os.h
+++ b/sound/oss/os.h
@@ -5,10 +5,8 @@
 #undef  DO_TIMINGS
 
 #include <linux/module.h>
-#include <linux/version.h>
 
 #ifdef __KERNEL__
-#include <linux/utsname.h>
 #include <linux/string.h>
 #include <linux/fs.h>
 #include <asm/dma.h>
diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
index 7609c68a89..318dc51009 100644
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -44,7 +44,6 @@ TODO:
 #define RMEVERSION "0.8"
 #endif
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/sched.h>
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index c09cdeedc1..8a9917c919 100644
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -2,7 +2,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>
-#include <linux/version.h>
 #include <linux/linkage.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h
index ae3bb6c6ed..bfff788e98 100644
--- a/sound/ppc/pmac.h
+++ b/sound/ppc/pmac.h
@@ -22,7 +22,6 @@
 #ifndef __PMAC_H
 #define __PMAC_H
 
-#include <linux/version.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include "awacs.h"
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index f4361c518e..1f8d27a615 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -61,13 +61,37 @@ MODULE_DESCRIPTION("Sun CS4231");
 MODULE_LICENSE("GPL");
 MODULE_SUPPORTED_DEVICE("{{Sun,CS4231}}");
 
-typedef struct snd_cs4231 {
-        spinlock_t              lock;
-        void __iomem            *port;
+#ifdef SBUS_SUPPORT
+typedef struct sbus_dma_info {
+       spinlock_t      lock;
+       int             dir;
+       void __iomem    *regs;
+} sbus_dma_info_t;
+#endif
+
+typedef struct snd_cs4231 cs4231_t;
+
+typedef struct cs4231_dma_control {
+        void            (*prepare)(struct cs4231_dma_control *dma_cont, int dir);
+        void            (*enable)(struct cs4231_dma_control *dma_cont, int on);
+        int             (*request)(struct cs4231_dma_control *dma_cont, dma_addr_t bus_addr, size_t len);
+        unsigned int    (*address)(struct cs4231_dma_control *dma_cont);
+        void            (*reset)(cs4231_t *chip); 
+        void            (*preallocate)(cs4231_t *chip, snd_pcm_t *pcm); 
 #ifdef EBUS_SUPPORT
-        struct ebus_dma_info    eb2c;
-        struct ebus_dma_info    eb2p;
+        struct          ebus_dma_info   ebus_info;
+#endif
+#ifdef SBUS_SUPPORT
+        struct          sbus_dma_info   sbus_info;
 #endif
+} cs4231_dma_control_t;
+
+struct snd_cs4231 {
+        spinlock_t              lock;
+        void __iomem            *port;
+
+        cs4231_dma_control_t    p_dma;
+        cs4231_dma_control_t    c_dma;
 
         u32                     flags;
 #define CS4231_FLAG_EBUS        0x00000001
@@ -106,7 +130,7 @@ typedef struct snd_cs4231 {
         unsigned int            irq[2];
         unsigned int            regs_size;
         struct snd_cs4231       *next;
-} cs4231_t;
+};
 
 static cs4231_t *cs4231_list;
 
@@ -251,6 +275,15 @@ static cs4231_t *cs4231_list;
 #define APCPNVA 0x38UL  /* APC Play DMA Next Address */
 #define APCPNC  0x3cUL  /* APC Play Next Count */
 
+/* Defines for SBUS DMA-routines */
+
+#define APCVA  0x0UL    /* APC DMA Address */
+#define APCC   0x4UL    /* APC Count */
+#define APCNVA 0x8UL    /* APC DMA Next Address */
+#define APCNC  0xcUL    /* APC Next Count */
+#define APC_PLAY 0x30UL /* Play registers start at 0x30 */
+#define APC_RECORD 0x20UL /* Record registers start at 0x20 */
+
 /* APCCSR bits */
 
 #define APC_INT_PENDING 0x800000 /* Interrupt Pending */
@@ -569,8 +602,7 @@ static void snd_cs4231_mce_down(cs4231_t *chip)
         spin_unlock_irqrestore(&chip->lock, flags);
 }
 
-#ifdef EBUS_SUPPORT
-static void snd_cs4231_ebus_advance_dma(struct ebus_dma_info *p, snd_pcm_substream_t *substream, unsigned int *periods_sent)
+static void snd_cs4231_advance_dma(struct cs4231_dma_control *dma_cont, snd_pcm_substream_t *substream, unsigned int *periods_sent)
 {
         snd_pcm_runtime_t *runtime = substream->runtime;
 
@@ -581,129 +613,41 @@ static void snd_cs4231_ebus_advance_dma(struct ebus_dma_info *p, snd_pcm_substre
                 if (period_size >= (1 << 24))
                         BUG();
 
-                if (ebus_dma_request(p, runtime->dma_addr + offset, period_size))
+                if (dma_cont->request(dma_cont, runtime->dma_addr + offset, period_size))
                         return;
                 (*periods_sent) = ((*periods_sent) + 1) % runtime->periods;
         }
 }
-#endif
-
-#ifdef SBUS_SUPPORT
-static void snd_cs4231_sbus_advance_dma(snd_pcm_substream_t *substream, unsigned int *periods_sent)
-{
-        cs4231_t *chip = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-
-        unsigned int period_size = snd_pcm_lib_period_bytes(substream);
-        unsigned int offset = period_size * (*periods_sent % runtime->periods);
-
-        if (runtime->period_size > 0xffff + 1)
-                BUG();
-
-        switch (substream->stream) {
-        case SNDRV_PCM_STREAM_PLAYBACK:
-                sbus_writel(runtime->dma_addr + offset, chip->port + APCPNVA);
-                sbus_writel(period_size, chip->port + APCPNC);
-                break;
-        case SNDRV_PCM_STREAM_CAPTURE:
-                sbus_writel(runtime->dma_addr + offset, chip->port + APCCNVA);
-                sbus_writel(period_size, chip->port + APCCNC);
-                break;
-        }
-
-        (*periods_sent) = (*periods_sent + 1) % runtime->periods;
-}
-#endif
 
 static void cs4231_dma_trigger(snd_pcm_substream_t *substream, unsigned int what, int on)
 {
         cs4231_t *chip = snd_pcm_substream_chip(substream);
+        cs4231_dma_control_t *dma_cont;
 
-#ifdef EBUS_SUPPORT
-        if (chip->flags & CS4231_FLAG_EBUS) {
-                if (what & CS4231_PLAYBACK_ENABLE) {
-                        if (on) {
-                                ebus_dma_prepare(&chip->eb2p, 0);
-                                ebus_dma_enable(&chip->eb2p, 1);
-                                snd_cs4231_ebus_advance_dma(&chip->eb2p,
-                                        chip->playback_substream,
-                                        &chip->p_periods_sent);
-                        } else {
-                                ebus_dma_enable(&chip->eb2p, 0);
-                        }
-                }
-                if (what & CS4231_RECORD_ENABLE) {
-                        if (on) {
-                                ebus_dma_prepare(&chip->eb2c, 1);
-                                ebus_dma_enable(&chip->eb2c, 1);
-                                snd_cs4231_ebus_advance_dma(&chip->eb2c,
-                                        chip->capture_substream,
-                                        &chip->c_periods_sent);
-                        } else {
-                                ebus_dma_enable(&chip->eb2c, 0);
-                        }
-                }
-        } else {
-#endif
-#ifdef SBUS_SUPPORT
-        u32 csr = sbus_readl(chip->port + APCCSR);
-        /* I don't know why, but on sbus the period counter must
-         * only start counting after the first period is sent.
-         * Therefore this dummy thing.
-         */
-        unsigned int dummy = 0;
-
-        switch (what) {
-        case CS4231_PLAYBACK_ENABLE:
+        if (what & CS4231_PLAYBACK_ENABLE) {
+                dma_cont = &chip->p_dma;
                 if (on) {
-                        csr &= ~APC_XINT_PLAY;
-                        sbus_writel(csr, chip->port + APCCSR);
-
-                        csr &= ~APC_PPAUSE;
-                        sbus_writel(csr, chip->port + APCCSR);
-
-                        snd_cs4231_sbus_advance_dma(substream, &dummy);
-
-                        csr |=  APC_GENL_INT | APC_PLAY_INT | APC_XINT_ENA |
-                                APC_XINT_PLAY | APC_XINT_EMPT | APC_XINT_GENL |
-                                APC_XINT_PENA | APC_PDMA_READY;
-                        sbus_writel(csr, chip->port + APCCSR);
+                        dma_cont->prepare(dma_cont, 0);
+                        dma_cont->enable(dma_cont, 1);
+                        snd_cs4231_advance_dma(dma_cont,
+                                chip->playback_substream,
+                                &chip->p_periods_sent);
                 } else {
-                        csr |= APC_PPAUSE;
-                        sbus_writel(csr, chip->port + APCCSR);
-
-                        csr &= ~APC_PDMA_READY;
-                        sbus_writel(csr, chip->port + APCCSR);
+                        dma_cont->enable(dma_cont, 0);
                 }
-                break;
-        case CS4231_RECORD_ENABLE:
+        }
+        if (what & CS4231_RECORD_ENABLE) {
+                dma_cont = &chip->c_dma;
                 if (on) {
-                        csr &= ~APC_XINT_CAPT;
-                        sbus_writel(csr, chip->port + APCCSR);
-
-                        csr &= ~APC_CPAUSE;
-                        sbus_writel(csr, chip->port + APCCSR);
-
-                        snd_cs4231_sbus_advance_dma(substream, &dummy);
-
-                        csr |=  APC_GENL_INT | APC_CAPT_INT | APC_XINT_ENA |
-                                APC_XINT_CAPT | APC_XINT_CEMP | APC_XINT_GENL |
-                                APC_CDMA_READY;
-
-                        sbus_writel(csr, chip->port + APCCSR);
+                        dma_cont->prepare(dma_cont, 1);
+                        dma_cont->enable(dma_cont, 1);
+                        snd_cs4231_advance_dma(dma_cont,
+                                chip->capture_substream,
+                                &chip->c_periods_sent);
                 } else {
-                        csr |= APC_CPAUSE;
-                        sbus_writel(csr, chip->port + APCCSR);
-
-                        csr &= ~APC_CDMA_READY;
-                        sbus_writel(csr, chip->port + APCCSR);
+                        dma_cont->enable(dma_cont, 0);
                 }
-                break;
-        }
-#endif
-#ifdef EBUS_SUPPORT
         }
-#endif
 }
 
 static int snd_cs4231_trigger(snd_pcm_substream_t *substream, int cmd)
@@ -1136,10 +1080,7 @@ static int snd_cs4231_playback_prepare(snd_pcm_substream_t *substream)
         if (runtime->period_size > 0xffff + 1)
                 BUG();
 
-        snd_cs4231_out(chip, CS4231_PLY_LWR_CNT, (runtime->period_size - 1) & 0x00ff);
-        snd_cs4231_out(chip, CS4231_PLY_UPR_CNT, (runtime->period_size - 1) >> 8 & 0x00ff);
         chip->p_periods_sent = 0;
-
         spin_unlock_irqrestore(&chip->lock, flags);
 
         return 0;
@@ -1171,16 +1112,14 @@ static int snd_cs4231_capture_hw_free(snd_pcm_substream_t *substream)
 static int snd_cs4231_capture_prepare(snd_pcm_substream_t *substream)
 {
         cs4231_t *chip = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
         unsigned long flags;
 
         spin_lock_irqsave(&chip->lock, flags);
         chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_RECORD_ENABLE |
                                             CS4231_RECORD_PIO);
 
-        snd_cs4231_out(chip, CS4231_REC_LWR_CNT, (runtime->period_size - 1) & 0x00ff);
-        snd_cs4231_out(chip, CS4231_REC_LWR_CNT, (runtime->period_size - 1) >> 8 & 0x00ff);
 
+        chip->c_periods_sent = 0;
         spin_unlock_irqrestore(&chip->lock, flags);
 
         return 0;
@@ -1199,134 +1138,55 @@ static void snd_cs4231_overrange(cs4231_t *chip)
                 chip->capture_substream->runtime->overrange++;
 }
 
-static irqreturn_t snd_cs4231_generic_interrupt(cs4231_t *chip)
-{
-        unsigned long flags;
-        unsigned char status;
-
-        /*This is IRQ is not raised by the cs4231*/
-        if (!(__cs4231_readb(chip, CS4231P(chip, STATUS)) & CS4231_GLOBALIRQ))
-                return IRQ_NONE;
-
-        status = snd_cs4231_in(chip, CS4231_IRQ_STATUS);
-
-        if (status & CS4231_TIMER_IRQ) {
-                if (chip->timer)
-                        snd_timer_interrupt(chip->timer, chip->timer->sticks);
-        }               
-
-        if (status & CS4231_RECORD_IRQ)
-                snd_cs4231_overrange(chip);
-
-        /* ACK the CS4231 interrupt. */
-        spin_lock_irqsave(&chip->lock, flags);
-        snd_cs4231_outm(chip, CS4231_IRQ_STATUS, ~CS4231_ALL_IRQS | ~status, 0);
-        spin_unlock_irqrestore(&chip->lock, flags);
-
-        return 0;
-}
-
-#ifdef SBUS_SUPPORT
-static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-        cs4231_t *chip = dev_id;
-
-        /* ACK the APC interrupt. */
-        u32 csr = sbus_readl(chip->port + APCCSR);
-
-        sbus_writel(csr, chip->port + APCCSR);
-
-        if ((chip->image[CS4231_IFACE_CTRL] & CS4231_PLAYBACK_ENABLE) &&
-            (csr & APC_PLAY_INT) &&
-            (csr & APC_XINT_PNVA) &&
-            !(csr & APC_XINT_EMPT)) {
-                snd_cs4231_sbus_advance_dma(chip->playback_substream,
-                                            &chip->p_periods_sent);
-                snd_pcm_period_elapsed(chip->playback_substream);
-        }
-
-        if ((chip->image[CS4231_IFACE_CTRL] & CS4231_RECORD_ENABLE) &&
-            (csr & APC_CAPT_INT) &&
-            (csr & APC_XINT_CNVA)) {
-                snd_cs4231_sbus_advance_dma(chip->capture_substream,
-                                            &chip->c_periods_sent);
-                snd_pcm_period_elapsed(chip->capture_substream);
-        }
-
-        return snd_cs4231_generic_interrupt(chip);
-}
-#endif
-
-#ifdef EBUS_SUPPORT
-static void snd_cs4231_ebus_play_callback(struct ebus_dma_info *p, int event, void *cookie)
+static void snd_cs4231_play_callback(cs4231_t *cookie)
 {
         cs4231_t *chip = cookie;
 
         if (chip->image[CS4231_IFACE_CTRL] & CS4231_PLAYBACK_ENABLE) {
                 snd_pcm_period_elapsed(chip->playback_substream);
-                snd_cs4231_ebus_advance_dma(p, chip->playback_substream,
+                snd_cs4231_advance_dma(&chip->p_dma, chip->playback_substream,
                                             &chip->p_periods_sent);
         }
 }
 
-static void snd_cs4231_ebus_capture_callback(struct ebus_dma_info *p, int event, void *cookie)
+static void snd_cs4231_capture_callback(cs4231_t *cookie)
 {
         cs4231_t *chip = cookie;
 
         if (chip->image[CS4231_IFACE_CTRL] & CS4231_RECORD_ENABLE) {
                 snd_pcm_period_elapsed(chip->capture_substream);
-                snd_cs4231_ebus_advance_dma(p, chip->capture_substream,
+                snd_cs4231_advance_dma(&chip->c_dma, chip->capture_substream,
                                             &chip->c_periods_sent);
         }
 }
-#endif
 
 static snd_pcm_uframes_t snd_cs4231_playback_pointer(snd_pcm_substream_t *substream)
 {
         cs4231_t *chip = snd_pcm_substream_chip(substream);
-        size_t ptr, residue, period_bytes;
-
+        cs4231_dma_control_t *dma_cont = &chip->p_dma;
+        size_t ptr;
+        
         if (!(chip->image[CS4231_IFACE_CTRL] & CS4231_PLAYBACK_ENABLE))
                 return 0;
-        period_bytes = snd_pcm_lib_period_bytes(substream);
-        ptr = period_bytes * chip->p_periods_sent;
-#ifdef EBUS_SUPPORT
-        if (chip->flags & CS4231_FLAG_EBUS) {
-                residue = ebus_dma_residue(&chip->eb2p);
-        } else {
-#endif
-#ifdef SBUS_SUPPORT
-                residue = sbus_readl(chip->port + APCPC);
-#endif
-#ifdef EBUS_SUPPORT
-        }
-#endif
-        ptr += period_bytes - residue;
-
+        ptr = dma_cont->address(dma_cont);
+        if (ptr != 0)
+                ptr -= substream->runtime->dma_addr;
+        
         return bytes_to_frames(substream->runtime, ptr);
 }
 
 static snd_pcm_uframes_t snd_cs4231_capture_pointer(snd_pcm_substream_t * substream)
 {
         cs4231_t *chip = snd_pcm_substream_chip(substream);
-        size_t ptr, residue, period_bytes;
+        cs4231_dma_control_t *dma_cont = &chip->c_dma;
+        size_t ptr;
         
         if (!(chip->image[CS4231_IFACE_CTRL] & CS4231_RECORD_ENABLE))
                 return 0;
-        period_bytes = snd_pcm_lib_period_bytes(substream);
-        ptr = period_bytes * chip->c_periods_sent;
-#ifdef EBUS_SUPPORT
-        if (chip->flags & CS4231_FLAG_EBUS) {
-                residue = ebus_dma_residue(&chip->eb2c);
-        } else {
-#endif
-#ifdef SBUS_SUPPORT
-                residue = sbus_readl(chip->port + APCCC);
-#endif
-#ifdef EBUS_SUPPORT
-        }
-#endif
-        ptr += period_bytes - residue;
+        ptr = dma_cont->address(dma_cont);
+        if (ptr != 0)
+                ptr -= substream->runtime->dma_addr;
+        
         return bytes_to_frames(substream->runtime, ptr);
 }
 
@@ -1362,30 +1222,8 @@ static int snd_cs4231_probe(cs4231_t *chip)
         spin_lock_irqsave(&chip->lock, flags);
 
 
-        /* Reset DMA engine.  */
-#ifdef EBUS_SUPPORT
-        if (chip->flags & CS4231_FLAG_EBUS) {
-                /* Done by ebus_dma_register */
-        } else {
-#endif
-#ifdef SBUS_SUPPORT
-                sbus_writel(APC_CHIP_RESET, chip->port + APCCSR);
-                sbus_writel(0x00, chip->port + APCCSR);
-                sbus_writel(sbus_readl(chip->port + APCCSR) | APC_CDC_RESET,
-                            chip->port + APCCSR);
-  
-                udelay(20);
-  
-                sbus_writel(sbus_readl(chip->port + APCCSR) & ~APC_CDC_RESET,
-                            chip->port + APCCSR);
-                sbus_writel(sbus_readl(chip->port + APCCSR) | (APC_XINT_ENA |
-                                                               APC_XINT_PENA |
-                                                               APC_XINT_CENA),
-                            chip->port + APCCSR);
-#endif
-#ifdef EBUS_SUPPORT
-        }
-#endif
+        /* Reset DMA engine (sbus only).  */
+        chip->p_dma.reset(chip);
 
         __cs4231_readb(chip, CS4231P(chip, STATUS));    /* clear any pendings IRQ */
         __cs4231_writeb(chip, 0, CS4231P(chip, STATUS));
@@ -1505,8 +1343,8 @@ static int snd_cs4231_playback_close(snd_pcm_substream_t *substream)
 {
         cs4231_t *chip = snd_pcm_substream_chip(substream);
 
-        chip->playback_substream = NULL;
         snd_cs4231_close(chip, CS4231_MODE_PLAY);
+        chip->playback_substream = NULL;
 
         return 0;
 }
@@ -1515,8 +1353,8 @@ static int snd_cs4231_capture_close(snd_pcm_substream_t *substream)
 {
         cs4231_t *chip = snd_pcm_substream_chip(substream);
 
-        chip->capture_substream = NULL;
         snd_cs4231_close(chip, CS4231_MODE_RECORD);
+        chip->capture_substream = NULL;
 
         return 0;
 }
@@ -1571,21 +1409,7 @@ int snd_cs4231_pcm(cs4231_t *chip)
         pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
         strcpy(pcm->name, "CS4231");
 
-#ifdef EBUS_SUPPORT
-        if (chip->flags & CS4231_FLAG_EBUS) {
-                snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                                      snd_dma_pci_data(chip->dev_u.pdev),
-                                                      64*1024, 128*1024);
-        } else {
-#endif
-#ifdef SBUS_SUPPORT
-                snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_SBUS,
-                                                      snd_dma_sbus_data(chip->dev_u.sdev),
-                                                      64*1024, 128*1024);
-#endif
-#ifdef EBUS_SUPPORT
-        }
-#endif
+        chip->p_dma.preallocate(chip, pcm);
 
         chip->pcm = pcm;
 
@@ -1942,6 +1766,180 @@ out_err:
 }
 
 #ifdef SBUS_SUPPORT
+
+static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        unsigned long flags;
+        unsigned char status;
+        u32 csr;
+        cs4231_t *chip = dev_id;
+
+        /*This is IRQ is not raised by the cs4231*/
+        if (!(__cs4231_readb(chip, CS4231P(chip, STATUS)) & CS4231_GLOBALIRQ))
+                return IRQ_NONE;
+
+        /* ACK the APC interrupt. */
+        csr = sbus_readl(chip->port + APCCSR);
+
+        sbus_writel(csr, chip->port + APCCSR);
+
+        if ((csr & APC_PDMA_READY) && 
+            (csr & APC_PLAY_INT) &&
+            (csr & APC_XINT_PNVA) &&
+            !(csr & APC_XINT_EMPT))
+                        snd_cs4231_play_callback(chip);
+
+        if ((csr & APC_CDMA_READY) && 
+            (csr & APC_CAPT_INT) &&
+            (csr & APC_XINT_CNVA) &&
+            !(csr & APC_XINT_EMPT))
+                        snd_cs4231_capture_callback(chip);
+        
+        status = snd_cs4231_in(chip, CS4231_IRQ_STATUS);
+
+        if (status & CS4231_TIMER_IRQ) {
+                if (chip->timer)
+                        snd_timer_interrupt(chip->timer, chip->timer->sticks);
+        }               
+
+        if ((status & CS4231_RECORD_IRQ) && (csr & APC_CDMA_READY))
+                snd_cs4231_overrange(chip);
+
+        /* ACK the CS4231 interrupt. */
+        spin_lock_irqsave(&chip->lock, flags);
+        snd_cs4231_outm(chip, CS4231_IRQ_STATUS, ~CS4231_ALL_IRQS | ~status, 0);
+        spin_unlock_irqrestore(&chip->lock, flags);
+
+        return 0;
+}
+
+/*
+ * SBUS DMA routines
+ */
+
+int sbus_dma_request(struct cs4231_dma_control *dma_cont, dma_addr_t bus_addr, size_t len)
+{
+        unsigned long flags;
+        u32 test, csr;
+        int err;
+        sbus_dma_info_t *base = &dma_cont->sbus_info;
+        
+        if (len >= (1 << 24))
+                return -EINVAL;
+        spin_lock_irqsave(&base->lock, flags);
+        csr = sbus_readl(base->regs + APCCSR);
+        err = -EINVAL;
+        test = APC_CDMA_READY;
+        if ( base->dir == APC_PLAY )
+                test = APC_PDMA_READY;
+        if (!(csr & test))
+                goto out;
+        err = -EBUSY;
+        csr = sbus_readl(base->regs + APCCSR);
+        test = APC_XINT_CNVA;
+        if ( base->dir == APC_PLAY )
+                test = APC_XINT_PNVA;
+        if (!(csr & test))
+                goto out;
+        err = 0;
+        sbus_writel(bus_addr, base->regs + base->dir + APCNVA);
+        sbus_writel(len, base->regs + base->dir + APCNC);
+out:
+        spin_unlock_irqrestore(&base->lock, flags);
+        return err;
+}
+
+void sbus_dma_prepare(struct cs4231_dma_control *dma_cont, int d)
+{
+        unsigned long flags;
+        u32 csr, test;
+        sbus_dma_info_t *base = &dma_cont->sbus_info;
+
+        spin_lock_irqsave(&base->lock, flags);
+        csr = sbus_readl(base->regs + APCCSR);
+        test =  APC_GENL_INT | APC_PLAY_INT | APC_XINT_ENA |
+                APC_XINT_PLAY | APC_XINT_PEMP | APC_XINT_GENL |
+                 APC_XINT_PENA;
+        if ( base->dir == APC_RECORD )
+                test = APC_GENL_INT | APC_CAPT_INT | APC_XINT_ENA |
+                        APC_XINT_CAPT | APC_XINT_CEMP | APC_XINT_GENL;
+        csr |= test;
+        sbus_writel(csr, base->regs + APCCSR);
+        spin_unlock_irqrestore(&base->lock, flags);
+}
+
+void sbus_dma_enable(struct cs4231_dma_control *dma_cont, int on)
+{
+        unsigned long flags;
+        u32 csr, shift;
+        sbus_dma_info_t *base = &dma_cont->sbus_info;
+
+        spin_lock_irqsave(&base->lock, flags);
+        if (!on) {
+                if (base->dir == APC_PLAY) { 
+                        sbus_writel(0, base->regs + base->dir + APCNVA); 
+                        sbus_writel(1, base->regs + base->dir + APCC); 
+                }
+                else
+                {
+                        sbus_writel(0, base->regs + base->dir + APCNC); 
+                        sbus_writel(0, base->regs + base->dir + APCVA); 
+                } 
+        } 
+        udelay(600); 
+        csr = sbus_readl(base->regs + APCCSR);
+        shift = 0;
+        if ( base->dir == APC_PLAY )
+                shift = 1;
+        if (on)
+                csr &= ~(APC_CPAUSE << shift);
+        else
+                csr |= (APC_CPAUSE << shift); 
+        sbus_writel(csr, base->regs + APCCSR);
+        if (on)
+                csr |= (APC_CDMA_READY << shift);
+        else
+                csr &= ~(APC_CDMA_READY << shift);
+        sbus_writel(csr, base->regs + APCCSR);
+        
+        spin_unlock_irqrestore(&base->lock, flags);
+}
+
+unsigned int sbus_dma_addr(struct cs4231_dma_control *dma_cont)
+{
+        sbus_dma_info_t *base = &dma_cont->sbus_info;
+
+        return sbus_readl(base->regs + base->dir + APCVA);
+}
+
+void sbus_dma_reset(cs4231_t *chip)
+{
+        sbus_writel(APC_CHIP_RESET, chip->port + APCCSR);
+        sbus_writel(0x00, chip->port + APCCSR);
+        sbus_writel(sbus_readl(chip->port + APCCSR) | APC_CDC_RESET,
+                    chip->port + APCCSR);
+  
+        udelay(20);
+  
+        sbus_writel(sbus_readl(chip->port + APCCSR) & ~APC_CDC_RESET,
+                    chip->port + APCCSR);
+        sbus_writel(sbus_readl(chip->port + APCCSR) | (APC_XINT_ENA |
+                       APC_XINT_PENA |
+                       APC_XINT_CENA),
+                       chip->port + APCCSR);
+}
+
+void sbus_dma_preallocate(cs4231_t *chip, snd_pcm_t *pcm)
+{
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_SBUS,
+                                              snd_dma_sbus_data(chip->dev_u.sdev),
+                                              64*1024, 128*1024);
+}
+
+/*
+ * Init and exit routines
+ */
+
 static int snd_cs4231_sbus_free(cs4231_t *chip)
 {
         if (chip->irq[0])
@@ -1983,6 +1981,8 @@ static int __init snd_cs4231_sbus_create(snd_card_t *card,
                 return -ENOMEM;
 
         spin_lock_init(&chip->lock);
+        spin_lock_init(&chip->c_dma.sbus_info.lock);
+        spin_lock_init(&chip->p_dma.sbus_info.lock);
         init_MUTEX(&chip->mce_mutex);
         init_MUTEX(&chip->open_mutex);
         chip->card = card;
@@ -1998,6 +1998,25 @@ static int __init snd_cs4231_sbus_create(snd_card_t *card,
                 return -EIO;
         }
 
+        chip->c_dma.sbus_info.regs = chip->port;
+        chip->p_dma.sbus_info.regs = chip->port;
+        chip->c_dma.sbus_info.dir = APC_RECORD;
+        chip->p_dma.sbus_info.dir = APC_PLAY;
+
+        chip->p_dma.prepare = sbus_dma_prepare;
+        chip->p_dma.enable = sbus_dma_enable;
+        chip->p_dma.request = sbus_dma_request;
+        chip->p_dma.address = sbus_dma_addr;
+        chip->p_dma.reset = sbus_dma_reset;
+        chip->p_dma.preallocate = sbus_dma_preallocate;
+
+        chip->c_dma.prepare = sbus_dma_prepare;
+        chip->c_dma.enable = sbus_dma_enable;
+        chip->c_dma.request = sbus_dma_request;
+        chip->c_dma.address = sbus_dma_addr;
+        chip->c_dma.reset = sbus_dma_reset;
+        chip->c_dma.preallocate = sbus_dma_preallocate;
+
         if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt,
                         SA_SHIRQ, "cs4231", chip)) {
                 snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %s\n",
@@ -2051,15 +2070,70 @@ static int cs4231_sbus_attach(struct sbus_dev *sdev)
 #endif
 
 #ifdef EBUS_SUPPORT
+
+static void snd_cs4231_ebus_play_callback(struct ebus_dma_info *p, int event, void *cookie)
+{
+        cs4231_t *chip = cookie;
+        
+        snd_cs4231_play_callback(chip);
+}
+
+static void snd_cs4231_ebus_capture_callback(struct ebus_dma_info *p, int event, void *cookie)
+{
+        cs4231_t *chip = cookie;
+
+        snd_cs4231_capture_callback(chip);
+}
+
+/*
+ * EBUS DMA wrappers
+ */
+
+int _ebus_dma_request(struct cs4231_dma_control *dma_cont, dma_addr_t bus_addr, size_t len)
+{
+        return ebus_dma_request(&dma_cont->ebus_info, bus_addr, len);
+}
+
+void _ebus_dma_enable(struct cs4231_dma_control *dma_cont, int on)
+{
+        ebus_dma_enable(&dma_cont->ebus_info, on);
+}
+
+void _ebus_dma_prepare(struct cs4231_dma_control *dma_cont, int dir)
+{
+        ebus_dma_prepare(&dma_cont->ebus_info, dir);
+}
+
+unsigned int _ebus_dma_addr(struct cs4231_dma_control *dma_cont)
+{
+        return ebus_dma_addr(&dma_cont->ebus_info);
+}
+
+void _ebus_dma_reset(cs4231_t *chip)
+{
+        return;
+}
+
+void _ebus_dma_preallocate(cs4231_t *chip, snd_pcm_t *pcm)
+{
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                      snd_dma_pci_data(chip->dev_u.pdev),
+                                      64*1024, 128*1024);
+}
+
+/*
+ * Init and exit routines
+ */
+
 static int snd_cs4231_ebus_free(cs4231_t *chip)
 {
-        if (chip->eb2c.regs) {
-                ebus_dma_unregister(&chip->eb2c);
-                iounmap(chip->eb2c.regs);
+        if (chip->c_dma.ebus_info.regs) {
+                ebus_dma_unregister(&chip->c_dma.ebus_info);
+                iounmap(chip->c_dma.ebus_info.regs);
         }
-        if (chip->eb2p.regs) {
-                ebus_dma_unregister(&chip->eb2p);
-                iounmap(chip->eb2p.regs);
+        if (chip->p_dma.ebus_info.regs) {
+                ebus_dma_unregister(&chip->p_dma.ebus_info);
+                iounmap(chip->p_dma.ebus_info.regs);
         }
 
         if (chip->port)
@@ -2097,8 +2171,8 @@ static int __init snd_cs4231_ebus_create(snd_card_t *card,
                 return -ENOMEM;
 
         spin_lock_init(&chip->lock);
-        spin_lock_init(&chip->eb2c.lock);
-        spin_lock_init(&chip->eb2p.lock);
+        spin_lock_init(&chip->c_dma.ebus_info.lock);
+        spin_lock_init(&chip->p_dma.ebus_info.lock);
         init_MUTEX(&chip->mce_mutex);
         init_MUTEX(&chip->open_mutex);
         chip->flags |= CS4231_FLAG_EBUS;
@@ -2106,43 +2180,57 @@ static int __init snd_cs4231_ebus_create(snd_card_t *card,
         chip->dev_u.pdev = edev->bus->self;
         memcpy(&chip->image, &snd_cs4231_original_image,
                sizeof(snd_cs4231_original_image));
-        strcpy(chip->eb2c.name, "cs4231(capture)");
-        chip->eb2c.flags = EBUS_DMA_FLAG_USE_EBDMA_HANDLER;
-        chip->eb2c.callback = snd_cs4231_ebus_capture_callback;
-        chip->eb2c.client_cookie = chip;
-        chip->eb2c.irq = edev->irqs[0];
-        strcpy(chip->eb2p.name, "cs4231(play)");
-        chip->eb2p.flags = EBUS_DMA_FLAG_USE_EBDMA_HANDLER;
-        chip->eb2p.callback = snd_cs4231_ebus_play_callback;
-        chip->eb2p.client_cookie = chip;
-        chip->eb2p.irq = edev->irqs[1];
+        strcpy(chip->c_dma.ebus_info.name, "cs4231(capture)");
+        chip->c_dma.ebus_info.flags = EBUS_DMA_FLAG_USE_EBDMA_HANDLER;
+        chip->c_dma.ebus_info.callback = snd_cs4231_ebus_capture_callback;
+        chip->c_dma.ebus_info.client_cookie = chip;
+        chip->c_dma.ebus_info.irq = edev->irqs[0];
+        strcpy(chip->p_dma.ebus_info.name, "cs4231(play)");
+        chip->p_dma.ebus_info.flags = EBUS_DMA_FLAG_USE_EBDMA_HANDLER;
+        chip->p_dma.ebus_info.callback = snd_cs4231_ebus_play_callback;
+        chip->p_dma.ebus_info.client_cookie = chip;
+        chip->p_dma.ebus_info.irq = edev->irqs[1];
+
+        chip->p_dma.prepare = _ebus_dma_prepare;
+        chip->p_dma.enable = _ebus_dma_enable;
+        chip->p_dma.request = _ebus_dma_request;
+        chip->p_dma.address = _ebus_dma_addr;
+        chip->p_dma.reset = _ebus_dma_reset;
+        chip->p_dma.preallocate = _ebus_dma_preallocate;
+
+        chip->c_dma.prepare = _ebus_dma_prepare;
+        chip->c_dma.enable = _ebus_dma_enable;
+        chip->c_dma.request = _ebus_dma_request;
+        chip->c_dma.address = _ebus_dma_addr;
+        chip->c_dma.reset = _ebus_dma_reset;
+        chip->c_dma.preallocate = _ebus_dma_preallocate;
 
         chip->port = ioremap(edev->resource[0].start, 0x10);
-        chip->eb2p.regs = ioremap(edev->resource[1].start, 0x10);
-        chip->eb2c.regs = ioremap(edev->resource[2].start, 0x10);
-        if (!chip->port || !chip->eb2p.regs || !chip->eb2c.regs) {
+        chip->p_dma.ebus_info.regs = ioremap(edev->resource[1].start, 0x10);
+        chip->c_dma.ebus_info.regs = ioremap(edev->resource[2].start, 0x10);
+        if (!chip->port || !chip->p_dma.ebus_info.regs || !chip->c_dma.ebus_info.regs) {
                 snd_cs4231_ebus_free(chip);
                 snd_printdd("cs4231-%d: Unable to map chip registers.\n", dev);
                 return -EIO;
         }
 
-        if (ebus_dma_register(&chip->eb2c)) {
+        if (ebus_dma_register(&chip->c_dma.ebus_info)) {
                 snd_cs4231_ebus_free(chip);
                 snd_printdd("cs4231-%d: Unable to register EBUS capture DMA\n", dev);
                 return -EBUSY;
         }
-        if (ebus_dma_irq_enable(&chip->eb2c, 1)) {
+        if (ebus_dma_irq_enable(&chip->c_dma.ebus_info, 1)) {
                 snd_cs4231_ebus_free(chip);
                 snd_printdd("cs4231-%d: Unable to enable EBUS capture IRQ\n", dev);
                 return -EBUSY;
         }
 
-        if (ebus_dma_register(&chip->eb2p)) {
+        if (ebus_dma_register(&chip->p_dma.ebus_info)) {
                 snd_cs4231_ebus_free(chip);
                 snd_printdd("cs4231-%d: Unable to register EBUS play DMA\n", dev);
                 return -EBUSY;
         }
-        if (ebus_dma_irq_enable(&chip->eb2p, 1)) {
+        if (ebus_dma_irq_enable(&chip->p_dma.ebus_info, 1)) {
                 snd_cs4231_ebus_free(chip);
                 snd_printdd("cs4231-%d: Unable to enable EBUS play IRQ\n", dev);
                 return -EBUSY;