Update of /cvsroot/alsa/alsa-driver/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17318/pci

Modified Files:
        Kconfig Makefile atiixp.c 
Log Message:
moved atiixp driver to alsa-kernel tree.


Index: Kconfig
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/Kconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Kconfig     9 Mar 2004 11:58:32 -0000       1.14
+++ Kconfig     11 Mar 2004 13:16:11 -0000      1.15
@@ -23,10 +23,3 @@
          Say 'Y' or 'M' to include support for RME Hammerfall DSP MADI
          soundcards.
 
-config SND_ATIIXP
-       tristate "ATI IXP 150/200/250"
-       depends on SND
-       select SND_AC97_CODEC
-       help
-         Say 'Y' or 'M' to include support for ATI IXP 150/200/250 AC97 controller.
-

Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile    9 Mar 2004 11:58:32 -0000       1.21
+++ Makefile    11 Mar 2004 13:16:11 -0000      1.22
@@ -15,11 +15,9 @@
 
 snd-intel8x0m-objs := intel8x0m.o
 snd-hdspm-objs := hdspm.o
-snd-atiixp-objs := atiixp.o
 
 obj-$(CONFIG_SND_INTEL8X0M) += snd-intel8x0m.o
 obj-$(CONFIG_SND_HDSPM) +=snd-hdspm.o
-obj-$(CONFIG_SND_ATIIXP) += snd-atiixp.o
 
 #
 #

Index: atiixp.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/atiixp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- atiixp.c    6 Mar 2004 16:55:13 -0000       1.3
+++ atiixp.c    11 Mar 2004 13:16:11 -0000      1.4
@@ -1,1572 +1,2 @@
-/*
- *   ALSA driver for ATI IXP 150/200/250 AC97 controllers
- *
- *     Copyright (c) 2004 Takashi Iwai <[EMAIL PROTECTED]>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- */
-
-#include <sound/driver.h>
-#include <asm/io.h>
-#include <linux/delay.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/pcm_params.h>
-#include <sound/info.h>
-#include <sound/ac97_codec.h>
-#define SNDRV_GET_ID
-#include <sound/initval.h>
-
-MODULE_AUTHOR("Takashi Iwai <[EMAIL PROTECTED]>");
-MODULE_DESCRIPTION("ATI IXP AC97 controller");
-MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{ATI,IXP150,200,250}}");
-
-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;     /* Index 0-MAX */
-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;      /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
-static int ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 48000};
-static int spdif_aclink[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
-
-MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(index, "Index value for ATI IXP controller.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
-MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
-MODULE_PARM_DESC(id, "ID string for ATI IXP controller.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
-MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(enable, "Enable audio part of ATI IXP controller.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(ac97_clock, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(ac97_clock, "AC'97 codec clock (default 48000Hz).");
-MODULE_PARM_SYNTAX(ac97_clock, SNDRV_ENABLED ",default:48000");
-MODULE_PARM(spdif_aclink, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(spdif_aclink, "S/PDIF over AC-link.");
-MODULE_PARM_SYNTAX(spdif_aclink, SNDRV_ENABLED "," SNDRV_BOOLEAN_TRUE_DESC);
-
-
-/*
- */
-
-#define ATI_REG_ISR                    0x00    /* interrupt source */
-#define  ATI_REG_ISR_IN_XRUN           (1U<<0)
-#define  ATI_REG_ISR_IN_STATUS         (1U<<1)
-#define  ATI_REG_ISR_OUT_XRUN          (1U<<2)
-#define  ATI_REG_ISR_OUT_STATUS                (1U<<3)
-#define  ATI_REG_ISR_SPDF_XRUN         (1U<<4)
-#define  ATI_REG_ISR_SPDF_STATUS       (1U<<5)
-#define  ATI_REG_ISR_PHYS_INTR         (1U<<8)
-#define  ATI_REG_ISR_PHYS_MISMATCH     (1U<<9)
-#define  ATI_REG_ISR_CODEC0_NOT_READY  (1U<<10)
-#define  ATI_REG_ISR_CODEC1_NOT_READY  (1U<<11)
-#define  ATI_REG_ISR_CODEC2_NOT_READY  (1U<<12)
-#define  ATI_REG_ISR_NEW_FRAME         (1U<<13)
-
-#define ATI_REG_IER                    0x04    /* interrupt enable */
-#define  ATI_REG_IER_IN_XRUN_EN                (1U<<0)
-#define  ATI_REG_IER_IO_STATUS_EN      (1U<<1)
-#define  ATI_REG_IER_OUT_XRUN_EN       (1U<<2)
-#define  ATI_REG_IER_OUT_XRUN_COND     (1U<<3)
-#define  ATI_REG_IER_SPDF_XRUN_EN      (1U<<4)
-#define  ATI_REG_IER_SPDF_STATUS_EN    (1U<<5)
-#define  ATI_REG_IER_PHYS_INTR_EN      (1U<<8)
-#define  ATI_REG_IER_PHYS_MISMATCH_EN  (1U<<9)
-#define  ATI_REG_IER_CODEC0_INTR_EN    (1U<<10)
-#define  ATI_REG_IER_CODEC1_INTR_EN    (1U<<11)
-#define  ATI_REG_IER_CODEC2_INTR_EN    (1U<<12)
-#define  ATI_REG_IER_NEW_FRAME_EN      (1U<<13)        /* (RO */
-#define  ATI_REG_IER_SET_BUS_BUSY      (1U<<14)        /* (WO) audio is running */
-
-#define ATI_REG_CMD                    0x08    /* command */
-#define  ATI_REG_CMD_POWERDOWN         (1U<<0)
-#define  ATI_REG_CMD_RECEIVE_EN                (1U<<1)
-#define  ATI_REG_CMD_SEND_EN           (1U<<2)
-#define  ATI_REG_CMD_STATUS_MEM                (1U<<3)
-#define  ATI_REG_CMD_SPDF_OUT_EN       (1U<<4)
-#define  ATI_REG_CMD_SPDF_STATUS_MEM   (1U<<5)
-#define  ATI_REG_CMD_SPDF_THRESHOLD    (3U<<6)
-#define  ATI_REG_CMD_SPDF_THRESHOLD_SHIFT      6
-#define  ATI_REG_CMD_IN_DMA_EN         (1U<<8)
-#define  ATI_REG_CMD_OUT_DMA_EN                (1U<<9)
-#define  ATI_REG_CMD_SPDF_DMA_EN       (1U<<10)
-#define  ATI_REG_CMD_SPDF_OUT_STOPPED  (1U<<11)
-#define  ATI_REG_CMD_SPDF_CONFIG_MASK  (7U<<12)
-#define   ATI_REG_CMD_SPDF_CONFIG_34   (1U<<12)
-#define   ATI_REG_CMD_SPDF_CONFIG_78   (2U<<12)
-#define   ATI_REG_CMD_SPDF_CONFIG_69   (3U<<12)
-#define   ATI_REG_CMD_SPDF_CONFIG_01   (4U<<12)
-#define  ATI_REG_CMD_INTERLEAVE_SPDF   (1U<<16)
-#define  ATI_REG_CMD_AUDIO_PRESENT     (1U<<20)
-#define  ATI_REG_CMD_INTERLEAVE_IN     (1U<<21)
-#define  ATI_REG_CMD_INTERLEAVE_OUT    (1U<<22)
-#define  ATI_REG_CMD_LOOPBACK_EN       (1U<<23)
-#define  ATI_REG_CMD_PACKED_DIS                (1U<<24)
-#define  ATI_REG_CMD_BURST_EN          (1U<<25)
-#define  ATI_REG_CMD_PANIC_EN          (1U<<26)
-#define  ATI_REG_CMD_MODEM_PRESENT     (1U<<27)
-#define  ATI_REG_CMD_ACLINK_ACTIVE     (1U<<28)
-#define  ATI_REG_CMD_AC_SOFT_RESET     (1U<<29)
-#define  ATI_REG_CMD_AC_SYNC           (1U<<30)
-#define  ATI_REG_CMD_AC_RESET          (1U<<31)
-
-#define ATI_REG_PHYS_OUT_ADDR          0x0c
-#define  ATI_REG_PHYS_OUT_CODEC_MASK   (3U<<0)
-#define  ATI_REG_PHYS_OUT_RW           (1U<<2)
-#define  ATI_REG_PHYS_OUT_ADDR_EN      (1U<<8)
-#define  ATI_REG_PHYS_OUT_ADDR_SHIFT   9
-#define  ATI_REG_PHYS_OUT_DATA_SHIFT   16
-
-#define ATI_REG_PHYS_IN_ADDR           0x10
-#define  ATI_REG_PHYS_IN_READ_FLAG     (1U<<8)
-#define  ATI_REG_PHYS_IN_ADDR_SHIFT    9
-#define  ATI_REG_PHYS_IN_DATA_SHIFT    16
-
-#define ATI_REG_SLOTREQ                        0x14
-
-#define ATI_REG_COUNTER                        0x18
-#define  ATI_REG_COUNTER_SLOT          (3U<<0) /* slot # */
-#define  ATI_REG_COUNTER_BITCLOCK      (31U<<8)
-
-#define ATI_REG_IN_FIFO_THRESHOLD      0x1c
-
-#define ATI_REG_IN_DMA_LINKPTR         0x20
-#define ATI_REG_IN_DMA_DT_START                0x24    /* RO */
-#define ATI_REG_IN_DMA_DT_NEXT         0x28    /* RO */
-#define ATI_REG_IN_DMA_DT_CUR          0x2c    /* RO */
-#define ATI_REG_IN_DMA_DT_SIZE         0x30
-
-#define ATI_REG_OUT_DMA_SLOT           0x34
-#define  ATI_REG_OUT_DMA_SLOT_BIT(x)   (1U << ((x) - 3))
-#define  ATI_REG_OUT_DMA_SLOT_MASK     0x1ff
-#define  ATI_REG_OUT_DMA_THRESHOLD_MASK        0xf800
-#define  ATI_REG_OUT_DMA_THRESHOLD_SHIFT       11
-
-#define ATI_REG_OUT_DMA_LINKPTR                0x38
-#define ATI_REG_OUT_DMA_DT_START       0x3c    /* RO */
-#define ATI_REG_OUT_DMA_DT_NEXT                0x40    /* RO */
-#define ATI_REG_OUT_DMA_DT_CUR         0x44    /* RO */
-#define ATI_REG_OUT_DMA_DT_SIZE                0x48
-
-#define ATI_REG_SPDF_CMD               0x4c
-#define  ATI_REG_SPDF_CMD_LFSR         (1U<<4)
-#define  ATI_REG_SPDF_CMD_SINGLE_CH    (1U<<5)
-#define  ATI_REG_SPDF_CMD_LFSR_ACC     (0xff<<8)       /* RO */
-
-#define ATI_REG_SPDF_DMA_LINKPTR       0x50
-#define ATI_REG_SPDF_DMA_DT_START      0x54    /* RO */
-#define ATI_REG_SPDF_DMA_DT_NEXT       0x58    /* RO */
-#define ATI_REG_SPDF_DMA_DT_CUR                0x5c    /* RO */
-#define ATI_REG_SPDF_DMA_DT_SIZE       0x60
-
-#define ATI_REG_MODEM_MIRROR           0x7c
-#define ATI_REG_AUDIO_MIRROR           0x80
-
-#define ATI_REG_6CH_REORDER            0x84    /* reorder slots for 6ch */
-#define  ATI_REG_6CH_REORDER_EN                (1U<<0) /* 3,4,7,8,6,9 -> 3,4,6,9,7,8 
*/
-
-#define ATI_REG_FIFO_FLUSH             0x88
-#define  ATI_REG_FIFO_OUT_FLUSH                (1U<<0)
-#define  ATI_REG_FIFO_IN_FLUSH         (1U<<1)
-
-/* LINKPTR */
-#define  ATI_REG_LINKPTR_EN            (1U<<0)
-
-/* [INT|OUT|SPDIF]_DMA_DT_SIZE */
-#define  ATI_REG_DMA_DT_SIZE           (0xffffU<<0)
-#define  ATI_REG_DMA_FIFO_USED         (0x1fU<<16)
-#define  ATI_REG_DMA_FIFO_FREE         (0x1fU<<21)
-#define  ATI_REG_DMA_STATE             (7U<<26)
-
-
-#define ATI_MEM_REGION         256     /* i/o memory size */
-#define ATI_MAX_DESCRIPTORS    256     /* max number of descriptor packets */
-
-
-/*
- */
-
-typedef struct snd_atiixp atiixp_t;
-typedef struct snd_atiixp_dma atiixp_dma_t;
-typedef struct snd_atiixp_dma_ops atiixp_dma_ops_t;
-#define chip_t atiixp_t
-
-
-/*
- * DMA packate descriptor
- */
-
-typedef struct atiixp_dma_desc {
-       u32 addr;       /* DMA buffer address */
-       u16 status;     /* status bits */
-       u16 size;       /* size of the packet in dwords */
-       u32 next;       /* address of the next packet descriptor */
-} atiixp_dma_desc_t;
-
-/*
- * stream enum
- */
-enum { ATI_DMA_PLAYBACK, ATI_DMA_CAPTURE, ATI_DMA_SPDIF };
-
-/*
- * constants and callbacks for each DMA type
- */
-struct snd_atiixp_dma_ops {
-       int type;                       /* ATI_DMA_XXX */
-       unsigned int llp_offset;        /* LINKPTR offset */
-       void (*enable_dma)(atiixp_t *chip, int on);     /* called from open callback */
-       void (*enable_transfer)(atiixp_t *chip, int on); /* called from trigger 
(START/STOP) */
-       void (*flush_dma)(atiixp_t *chip);              /* called from trigger (STOP 
only) */
-};
-
-/*
- * DMA stream
- */
-struct snd_atiixp_dma {
-       const atiixp_dma_ops_t *ops;
-       struct snd_dma_device desc_dev;
-       struct snd_dma_buffer desc_buf;
-       snd_pcm_substream_t *substream; /* assigned PCM substream */
-       unsigned int buf_addr, buf_bytes;       /* DMA buffer address, bytes */
-       unsigned int period_bytes, periods;
-       int running;
-       struct ac97_pcm *pcm;
-       int pcm_open_flag;
-};
-
-/*
- * ATI IXP chip
- */
-struct snd_atiixp {
-       snd_card_t *card;
-       struct pci_dev *pci;
-
-       struct resource *res;           /* memory i/o */
-       unsigned long addr;
-       unsigned long remap_addr;
-       int irq;
-       
-       ac97_bus_t *ac97_bus;
-       ac97_t *ac97[3];                /* IXP can have up to 3 codecs */
-
-       spinlock_t reg_lock;
-       spinlock_t ac97_lock;
-
-       atiixp_dma_t dmas[3];           /* playback, capture, spdif */
-
-       int max_channels;               /* max. channels for PCM out */
-
-       unsigned int codec_not_ready_bits;      /* for codec detection */
-
-       int spdif_over_aclink;          /* passed from the module option */
-};
-
-
-/*
- */
-static struct pci_device_id snd_atiixp_ids[] = {
-       { 0x1002, 0x4341, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-};
-
-MODULE_DEVICE_TABLE(pci, snd_atiixp_ids);
-
-
-/*
- * lowlevel functions
- */
-
-/*
- * update the bits of the given register.
- * return 1 if the bits changed.
- */
-static int snd_atiixp_update_bits(atiixp_t *chip, unsigned int reg,
-                                unsigned int mask, unsigned int value)
-{
-       unsigned long addr = chip->remap_addr + reg;
-       unsigned int data, old_data;
-       old_data = data = readl(addr);
-       data &= ~mask;
-       data |= value;
-       if (old_data == data)
-               return 0;
-       writel(data, addr);
-       return 1;
-}
-
-/*
- * macros for easy use
- */
-#define atiixp_write(chip,reg,value) \
-       writel(value, chip->remap_addr + ATI_REG_##reg)
-#define atiixp_read(chip,reg) \
-       readl(chip->remap_addr + ATI_REG_##reg)
-#define atiixp_update(chip,reg,mask,val) \
-       snd_atiixp_update_bits(chip, ATI_REG_##reg, mask, val)
-
-/* delay for one tick */
-#define do_delay() do { \
-       set_current_state(TASK_UNINTERRUPTIBLE); \
-       schedule_timeout(1); \
-} while (0)
-
-
-/*
- * handling DMA packets
- *
- * we allocate a linear buffer for the DMA, and split it to  each packet.
- * in a future version, a scatter-gather buffer should be implemented.
- */
-
-#define ATI_DESC_LIST_SIZE \
-       PAGE_ALIGN(ATI_MAX_DESCRIPTORS * sizeof(atiixp_dma_desc_t))
-
-/*
- * build packets ring for the given buffer size.
- *
- * IXP handles the buffer descriptors, which are connected as a linked
- * list.  although we can change the list dynamically, in this version,
- * a static RING of buffer descriptors is used.
- *
- * the ring is built in this function, and is set up to the hardware. 
- */
-static int atiixp_build_dma_packets(atiixp_t *chip, atiixp_dma_t *dma,
-                                  snd_pcm_substream_t *substream,
-                                  unsigned int periods,
-                                  unsigned int period_bytes)
-{
-       unsigned int i;
-       u32 addr, desc_addr;
-       unsigned long flags;
-
-       if (periods > ATI_MAX_DESCRIPTORS)
-               return -ENOMEM;
-
-       if (dma->desc_buf.area == NULL) {
-               memset(&dma->desc_dev, 0, sizeof(dma->desc_dev));
-               dma->desc_dev.type = SNDRV_DMA_TYPE_DEV;
-               dma->desc_dev.dev = snd_dma_pci_data(chip->pci);
-               if (snd_dma_alloc_pages(&dma->desc_dev, ATI_DESC_LIST_SIZE, 
&dma->desc_buf) < 0)
-                       return -ENOMEM;
-               dma->period_bytes = dma->periods = 0; /* clear */
-       }
-
-       if (dma->periods == dma->periods && dma->period_bytes == period_bytes)
-               return 0;
-
-       /* reset DMA before changing the descriptor table */
-       spin_lock_irqsave(&chip->reg_lock, flags);
-       writel(0, chip->remap_addr + dma->ops->llp_offset);
-       dma->ops->enable_dma(chip, 0);
-       dma->ops->enable_dma(chip, 1);
-       spin_unlock_irqrestore(&chip->reg_lock, flags);
-
-       /* fill the entries */
-       addr = (u32)substream->runtime->dma_addr;
-       desc_addr = (u32)dma->desc_buf.addr;
-       for (i = 0; i < periods; i++) {
-               atiixp_dma_desc_t *desc = &((atiixp_dma_desc_t 
*)dma->desc_buf.area)[i];
-               desc->addr = cpu_to_le32(addr);
-               desc->status = 0;
-               desc->size = period_bytes >> 2; /* in dwords */
-               desc_addr += sizeof(atiixp_dma_desc_t);
-               if (i == periods - 1)
-                       desc->next = cpu_to_le32((u32)dma->desc_buf.addr);
-               else
-                       desc->next = cpu_to_le32(desc_addr);
-               addr += period_bytes;
-       }
-
-       writel(cpu_to_le32((u32)dma->desc_buf.addr | ATI_REG_LINKPTR_EN),
-              chip->remap_addr + dma->ops->llp_offset);
-
-       dma->period_bytes = period_bytes;
-       dma->periods = periods;
-
-       return 0;
-}
-
-/*
- * remove the ring buffer and release it if assigned
- */
-static void atiixp_clear_dma_packets(atiixp_t *chip, atiixp_dma_t *dma, 
snd_pcm_substream_t *substream)
-{
-       if (dma->desc_buf.area) {
-               writel(0, chip->remap_addr + dma->ops->llp_offset);
-               snd_dma_free_pages(&dma->desc_dev, &dma->desc_buf);
-               dma->desc_buf.area = NULL;
-       }
-}
-
-/*
- * AC97 interface
- */
-static int snd_atiixp_acquire_codec(atiixp_t *chip)
-{
-       int timeout = 1000;
-
-       while (atiixp_read(chip, PHYS_OUT_ADDR) & ATI_REG_PHYS_OUT_ADDR_EN) {
-               if (! timeout--) {
-                       snd_printk(KERN_WARNING "atiixp: codec acquire timeout\n");
-                       return -EBUSY;
-               }
-               udelay(1);
-       }
-       return 0;
-}
-
-static unsigned short snd_atiixp_codec_read(atiixp_t *chip, unsigned short codec, 
unsigned short reg)
-{
-       unsigned int data;
-       int timeout;
-
-       if (snd_atiixp_acquire_codec(chip) < 0)
-               return 0xffff;
-       data = (reg << ATI_REG_PHYS_OUT_ADDR_SHIFT) |
-               ATI_REG_PHYS_OUT_ADDR_EN |
-               ATI_REG_PHYS_OUT_RW |
-               codec;
-       atiixp_write(chip, PHYS_OUT_ADDR, data);
-       if (snd_atiixp_acquire_codec(chip) < 0)
-               return 0xffff;
-       timeout = 1000;
-       do {
-               data = atiixp_read(chip, PHYS_IN_ADDR);
-               if (data & ATI_REG_PHYS_IN_READ_FLAG)
-                       return data >> ATI_REG_PHYS_IN_DATA_SHIFT;
-               udelay(1);
-       } while (--timeout);
-       snd_printk(KERN_WARNING "atiixp: codec read timeout\n");
-       return 0xffff;
-}
-
-
-static void snd_atiixp_codec_write(atiixp_t *chip, unsigned short codec, unsigned 
short reg, unsigned short val)
-{
-       unsigned int data;
-    
-       if (snd_atiixp_acquire_codec(chip) < 0)
-               return;
-       data = ((unsigned int)val << ATI_REG_PHYS_OUT_DATA_SHIFT) |
-               ((unsigned int)reg << ATI_REG_PHYS_OUT_ADDR_SHIFT) |
-               ATI_REG_PHYS_OUT_ADDR_EN | codec;
-       atiixp_write(chip, PHYS_OUT_ADDR, data);
-}
-
-
-static unsigned short snd_atiixp_ac97_read(ac97_t *ac97, unsigned short reg)
-{
-       atiixp_t *chip = snd_magic_cast(atiixp_t, ac97->private_data, return 0xffff);
-       unsigned short data;
-       spin_lock(&chip->ac97_lock);
-       data = snd_atiixp_codec_read(chip, ac97->num, reg);
-       spin_unlock(&chip->ac97_lock);
-       return data;
-    
-}
-
-static void snd_atiixp_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short 
val)
-{
-       atiixp_t *chip = snd_magic_cast(atiixp_t, ac97->private_data, return);
-       spin_lock(&chip->ac97_lock);
-       snd_atiixp_codec_write(chip, ac97->num, reg, val);
-       spin_unlock(&chip->ac97_lock);
-}
-
-/*
- * reset AC link
- */
-static int snd_atiixp_aclink_reset(atiixp_t *chip)
-{
-       int timeout;
-
-       /* reset powerdoewn */
-       if (atiixp_update(chip, CMD, ATI_REG_CMD_POWERDOWN, 0))
-               udelay(10);
-
-       /* perform a software reset */
-       atiixp_update(chip, CMD, ATI_REG_CMD_AC_SOFT_RESET, ATI_REG_CMD_AC_SOFT_RESET);
-       atiixp_read(chip, CMD);
-       udelay(10);
-       atiixp_update(chip, CMD, ATI_REG_CMD_AC_SOFT_RESET, 0);
-    
-       timeout = 10;
-       while (! (atiixp_read(chip, CMD) & ATI_REG_CMD_ACLINK_ACTIVE)) {
-               /* do a hard reset */
-               atiixp_update(chip, CMD, ATI_REG_CMD_AC_SYNC|ATI_REG_CMD_AC_RESET,
-                             ATI_REG_CMD_AC_SYNC);
-               atiixp_read(chip, CMD);
-               do_delay();
-               atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);
-               if (--timeout) {
-                       snd_printk(KERN_ERR "atiixp: codec reset timeout\n");
-                       break;
-               }
-       }
-
-       /* deassert RESET and assert SYNC to make sure */
-       atiixp_update(chip, CMD, ATI_REG_CMD_AC_SYNC|ATI_REG_CMD_AC_RESET,
-                     ATI_REG_CMD_AC_SYNC|ATI_REG_CMD_AC_RESET);
-
-       return 0;
-}
-
-#if 0 /* for P/M */
-static int snd_atiixp_aclink_down(atiixp_t *chip)
-{
-       unsigned long flags;
-
-       if (atiixp_read(chip, MODEM_MIRROR) & ATI_REG_MODEM_MIRROR_RUNNING)
-               return -EBUSY;
-       atiixp_update(chip, CMD,
-                    ATI_REG_CMD_POWERDOWN | ATI_REG_CMD_AC_RESET,
-                    ATI_REG_CMD_POWERDOWN);
-       return 0;
-}
-#endif
-
-/*
- * auto-detection of codecs
- *
- * the IXP chip can generate interrupts for the non-existing codecs.
- * NEW_FRAME interrupt is used to make sure that the interrupt is generated
- * even if all three codecs are connected.
- */
-
-#define ALL_CODEC_NOT_READY \
-           (ATI_REG_ISR_CODEC0_NOT_READY |\
-            ATI_REG_ISR_CODEC1_NOT_READY |\
-            ATI_REG_ISR_CODEC2_NOT_READY)
-#define CODEC_CHECK_BITS (ALL_CODEC_NOT_READY|ATI_REG_ISR_NEW_FRAME)
-
-static int snd_atiixp_codec_detect(atiixp_t *chip)
-{
-       int timeout;
-
-       chip->codec_not_ready_bits = 0;
-       atiixp_write(chip, IER, CODEC_CHECK_BITS);
-       /* wait for the interrupts */
-       timeout = HZ / 10;
-       while (timeout-- > 0) {
-               do_delay();
-               if (chip->codec_not_ready_bits)
-                       break;
-       }
-       atiixp_write(chip, IER, 0); /* disable irqs */
-
-       if ((chip->codec_not_ready_bits & ALL_CODEC_NOT_READY) == ALL_CODEC_NOT_READY) 
{
-               snd_printk(KERN_ERR "atiixp: no codec detected!\n");
-               return -ENXIO;
-       }
-       return 0;
-}
-
-
-/*
- * enable DMA and irqs
- */
-static int snd_atiixp_chip_start(atiixp_t *chip)
-{
-       unsigned int reg;
-
-       /* enable burst mode */
-       reg = atiixp_read(chip, CMD);
-       reg |= 0x02 << ATI_REG_CMD_SPDF_THRESHOLD_SHIFT;
-       reg |= ATI_REG_CMD_BURST_EN;
-       atiixp_write(chip, CMD, reg);
-
-       /* clear all interrupt source */
-       atiixp_write(chip, ISR, 0xffffffff);
-       /* enable irqs */
-       atiixp_write(chip, IER,
-                    ATI_REG_IER_IO_STATUS_EN |
-                    ATI_REG_IER_IN_XRUN_EN |
-                    ATI_REG_IER_OUT_XRUN_EN |
-                    ATI_REG_IER_SPDF_XRUN_EN |
-                    ATI_REG_IER_SPDF_STATUS_EN);
-       return 0;
-}
-
-
-/*
- * disable DMA and IRQs
- */
-static int snd_atiixp_chip_stop(atiixp_t *chip)
-{
-       /* clear interrupt source */
-       atiixp_write(chip, ISR, atiixp_read(chip, ISR));
-       /* disable irqs */
-       atiixp_write(chip, IER, 0);
-       return 0;
-}
-
-
-/*
- * PCM section
- */
-
-/*
- * pointer callback simplly reads XXX_DMA_DT_CUR register as the current
- * position.  when SG-buffer is implemented, the offset must be calculated
- * correctly...
- */
-static snd_pcm_uframes_t snd_atiixp_pcm_pointer(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
-       atiixp_dma_t *dma = (atiixp_dma_t *)runtime->private_data;
-       unsigned int curptr;
-       unsigned long flags;
-
-       spin_lock_irqsave(&chip->reg_lock, flags);
-       curptr = readl(chip->remap_addr + dma->ops->llp_offset + 12); /* 
XXX_DMA_DT_CUR */
-       if (curptr < dma->buf_addr) {
-               snd_printdd("curptr = %x, base = %x\n", curptr, dma->buf_addr);
-               curptr = 0;
-       } else {
-               curptr -= dma->buf_addr;
-               if (curptr >= dma->buf_bytes) {
-                       snd_printdd("curptr = %x, size = %x\n", curptr, 
dma->buf_bytes);
-                       curptr = 0;
-               }
-       }
-       spin_unlock_irqrestore(&chip->reg_lock, flags);
-       return bytes_to_frames(runtime, curptr);
-}
-
-/*
- * XRUN detected, and stop the PCM substream
- */
-static void snd_atiixp_xrun_dma(atiixp_t *chip, atiixp_dma_t *dma)
-{
-       if (! dma->substream || ! dma->running)
-               return;
-       snd_printd(KERN_DEBUG "atiixp: XRUN detected (DMA %d)\n", dma->ops->type);
-       snd_pcm_stop(dma->substream, SNDRV_PCM_STATE_XRUN);
-}
-
-/*
- * the period ack.  update the substream.
- */
-static void snd_atiixp_update_dma(atiixp_t *chip, atiixp_dma_t *dma)
-{
-       if (! dma->substream || ! dma->running)
-               return;
-       snd_pcm_period_elapsed(dma->substream);
-}
-
-/* set BUS_BUSY interrupt bit if any DMA is running */
-/* call with spinlock held */
-static void snd_atiixp_check_bus_busy(atiixp_t *chip)
-{
-       unsigned int bus_busy;
-       if (atiixp_read(chip, CMD) & (ATI_REG_CMD_SEND_EN |
-                                     ATI_REG_CMD_RECEIVE_EN |
-                                     ATI_REG_CMD_SPDF_OUT_EN))
-               bus_busy = ATI_REG_IER_SET_BUS_BUSY;
-       else
-               bus_busy = 0;
-       atiixp_update(chip, IER, ATI_REG_IER_SET_BUS_BUSY, bus_busy);
-}
-
-/* common trigger callback
- * calling the lowlevel callbacks in it
- */
-static int snd_atiixp_pcm_trigger(snd_pcm_substream_t *substream, int cmd)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       atiixp_dma_t *dma = (atiixp_dma_t *)substream->runtime->private_data;
-       int err = 0;
-
-       snd_assert(dma->ops->enable_transfer && dma->ops->flush_dma, return -EINVAL);
-
-       spin_lock(&chip->reg_lock);
-       switch (cmd) {
-       case SNDRV_PCM_TRIGGER_START:
-               dma->ops->enable_transfer(chip, 1);
-               dma->running = 1;
-               break;
-       case SNDRV_PCM_TRIGGER_STOP:
-               dma->ops->enable_transfer(chip, 0);
-               dma->running = 0;
-               break;
-       default:
-               err = -EINVAL;
-               break;
-       }
-       if (! err) {
-               snd_atiixp_check_bus_busy(chip);
-               if (cmd == SNDRV_PCM_TRIGGER_STOP) {
-                       dma->ops->flush_dma(chip);
-                       snd_atiixp_check_bus_busy(chip);
-               }
-       }
-       spin_unlock(&chip->reg_lock);
-       return err;
-}
-
-
-/*
- * lowlevel callbacks for each DMA type
- *
- * every callback is supposed to be called in chip->reg_lock spinlock
- */
-
-/* flush FIFO of analog OUT DMA */
-static void atiixp_out_flush_dma(atiixp_t *chip)
-{
-       atiixp_write(chip, FIFO_FLUSH, ATI_REG_FIFO_OUT_FLUSH);
-}
-
-/* enable/disable analog OUT DMA */
-static void atiixp_out_enable_dma(atiixp_t *chip, int on)
-{
-       unsigned int data;
-       data = atiixp_read(chip, CMD);
-       if (on) {
-               if (data & ATI_REG_CMD_OUT_DMA_EN)
-                       return;
-               atiixp_out_flush_dma(chip);
-               data |= ATI_REG_CMD_OUT_DMA_EN;
-       } else
-               data &= ~ATI_REG_CMD_OUT_DMA_EN;
-       atiixp_write(chip, CMD, data);
-}
-
-/* start/stop transfer over OUT DMA */
-static void atiixp_out_enable_transfer(atiixp_t *chip, int on)
-{
-       atiixp_update(chip, CMD, ATI_REG_CMD_SEND_EN,
-                     on ? ATI_REG_CMD_SEND_EN : 0);
-}
-
-/* enable/disable analog IN DMA */
-static void atiixp_in_enable_dma(atiixp_t *chip, int on)
-{
-       atiixp_update(chip, CMD, ATI_REG_CMD_IN_DMA_EN,
-                     on ? ATI_REG_CMD_IN_DMA_EN : 0);
-}
-
-/* start/stop analog IN DMA */
-static void atiixp_in_enable_transfer(atiixp_t *chip, int on)
-{
-       if (on) {
-               unsigned int data = atiixp_read(chip, CMD);
-               if (! (data & ATI_REG_CMD_RECEIVE_EN)) {
-                       data |= ATI_REG_CMD_RECEIVE_EN;
-#if 0 /* FIXME: this causes the endless loop */
-                       /* wait until slot 3/4 are finished */
-                       while ((atiixp_read(chip, COUNTER) &
-                               ATI_REG_COUNTER_SLOT) != 5)
-                               ;
-#endif
-                       atiixp_write(chip, CMD, data);
-               }
-       } else
-               atiixp_update(chip, CMD, ATI_REG_CMD_RECEIVE_EN, 0);
-}
-
-/* flush FIFO of analog IN DMA */
-static void atiixp_in_flush_dma(atiixp_t *chip)
-{
-       atiixp_write(chip, FIFO_FLUSH, ATI_REG_FIFO_IN_FLUSH);
-}
-
-/* enable/disable SPDIF OUT DMA */
-static void atiixp_spdif_enable_dma(atiixp_t *chip, int on)
-{
-       atiixp_update(chip, CMD, ATI_REG_CMD_SPDF_DMA_EN,
-                     on ? ATI_REG_CMD_SPDF_DMA_EN : 0);
-}
-
-/* start/stop SPDIF OUT DMA */
-static void atiixp_spdif_enable_transfer(atiixp_t *chip, int on)
-{
-       unsigned int data;
-       data = atiixp_read(chip, CMD);
-       if (on) {
-               data |= ATI_REG_CMD_SPDF_OUT_EN;
-               if (chip->spdif_over_aclink)
-                       data |= ATI_REG_CMD_SEND_EN;
-       }  else {
-               data &= ~ATI_REG_CMD_SPDF_OUT_EN;
-               if (chip->spdif_over_aclink)
-                       data &= ~ATI_REG_CMD_SEND_EN;
-       }
-       atiixp_write(chip, CMD, data);
-}
-
-/* flush FIFO of SPDIF OUT DMA */
-static void atiixp_spdif_flush_dma(atiixp_t *chip)
-{
-       int timeout;
-
-       /* DMA off, transfer on */
-       atiixp_spdif_enable_dma(chip, 0);
-       atiixp_spdif_enable_transfer(chip, 1);
-       
-       timeout = 100;
-       do {
-               if (! (atiixp_read(chip, SPDF_DMA_DT_SIZE) & ATI_REG_DMA_FIFO_USED))
-                       break;
-               udelay(1);
-       } while (timeout-- > 0);
-
-       atiixp_spdif_enable_transfer(chip, 0);
-}
-
-/* set up slots and formats for SPDIF OUT */
-static int snd_atiixp_spdif_prepare(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       unsigned int data;
-
-       spin_lock(&chip->reg_lock);
-       if (chip->spdif_over_aclink) {
-               /* enable slots 10/11 */
-               atiixp_update(chip, CMD, ATI_REG_CMD_SPDF_CONFIG_MASK,
-                             ATI_REG_CMD_SPDF_CONFIG_01);
-               data = atiixp_read(chip, OUT_DMA_SLOT);
-               data |= ATI_REG_OUT_DMA_SLOT_BIT(10) |
-                       ATI_REG_OUT_DMA_SLOT_BIT(11);
-               data |= 0x04 << ATI_REG_OUT_DMA_THRESHOLD_SHIFT;
-               atiixp_write(chip, OUT_DMA_SLOT, data);
-       } else {
-               atiixp_update(chip, CMD, ATI_REG_CMD_SPDF_CONFIG_MASK, 0);
-       }
-
-       atiixp_update(chip, CMD, ATI_REG_CMD_INTERLEAVE_SPDF,
-                     substream->runtime->format == SNDRV_PCM_FORMAT_S16_LE ?
-                     ATI_REG_CMD_INTERLEAVE_SPDF : 0);
-       spin_unlock(&chip->reg_lock);
-       return 0;
-}
-
-/* set up slots and formats for analog OUT */
-static int snd_atiixp_playback_prepare(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       unsigned int data;
-
-       spin_lock(&chip->reg_lock);
-       data = atiixp_read(chip, OUT_DMA_SLOT) & ~ATI_REG_OUT_DMA_SLOT_MASK;
-       switch (substream->runtime->channels) {
-       case 8:
-               data |= ATI_REG_OUT_DMA_SLOT_BIT(10) |
-                       ATI_REG_OUT_DMA_SLOT_BIT(11);
-               /* fallthru */
-       case 6:
-               data |= ATI_REG_OUT_DMA_SLOT_BIT(7) |
-                       ATI_REG_OUT_DMA_SLOT_BIT(8);
-               /* fallthru */
-       case 4:
-               data |= ATI_REG_OUT_DMA_SLOT_BIT(6) |
-                       ATI_REG_OUT_DMA_SLOT_BIT(9);
-               /* fallthru */
-       default:
-               data |= ATI_REG_OUT_DMA_SLOT_BIT(3) |
-                       ATI_REG_OUT_DMA_SLOT_BIT(4);
-               break;
-       }
-
-       /* set output threshold */
-       data |= 0x04 << ATI_REG_OUT_DMA_THRESHOLD_SHIFT;
-       atiixp_write(chip, OUT_DMA_SLOT, data);
-
-       atiixp_update(chip, CMD, ATI_REG_CMD_INTERLEAVE_OUT,
-                     substream->runtime->format == SNDRV_PCM_FORMAT_S16_LE ?
-                     ATI_REG_CMD_INTERLEAVE_OUT : 0);
-
-       /*
-        * enable 6 channel re-ordering bit if needed
-        */
-       atiixp_update(chip, 6CH_REORDER, ATI_REG_6CH_REORDER_EN,
-                     substream->runtime->channels >= 6 ? ATI_REG_6CH_REORDER_EN: 0);
-    
-       spin_unlock(&chip->reg_lock);
-       return 0;
-}
-
-/* set up slots and formats for analog IN */
-static int snd_atiixp_capture_prepare(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-
-       spin_lock(&chip->reg_lock);
-       atiixp_update(chip, CMD, ATI_REG_CMD_INTERLEAVE_IN,
-                     substream->runtime->format == SNDRV_PCM_FORMAT_S16_LE ?
-                     ATI_REG_CMD_INTERLEAVE_IN : 0);
-       spin_unlock(&chip->reg_lock);
-       return 0;
-}
-
-/*
- * hw_params - allocate the buffer and set up buffer descriptors
- */
-static int snd_atiixp_pcm_hw_params(snd_pcm_substream_t *substream,
-                                  snd_pcm_hw_params_t *hw_params)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       atiixp_dma_t *dma = (atiixp_dma_t *)substream->runtime->private_data;
-       int err;
-
-       err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-       if (err < 0)
-               return err;
-       dma->buf_addr = substream->runtime->dma_addr;
-       dma->buf_bytes = params_buffer_bytes(hw_params);
-
-       err = atiixp_build_dma_packets(chip, dma, substream,
-                                      params_periods(hw_params),
-                                      params_period_bytes(hw_params));
-       if (err < 0)
-               return err;
-
-       if (dma->pcm) {
-               /* PCM is bound to AC97 codec(s)
-                * set up the AC97 codecs
-                */
-               if (dma->pcm_open_flag) {
-                       snd_ac97_pcm_close(dma->pcm);
-                       dma->pcm_open_flag = 0;
-               }
-               err = snd_ac97_pcm_open(dma->pcm, params_rate(hw_params),
-                                       params_channels(hw_params),
-                                       dma->pcm->r[0].slots);
-               if (err >= 0)
-                       dma->pcm_open_flag = 1;
-       }
-
-       return err;
-}
-
-static int snd_atiixp_pcm_hw_free(snd_pcm_substream_t * substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       atiixp_dma_t *dma = (atiixp_dma_t *)substream->runtime->private_data;
-
-       if (dma->pcm_open_flag) {
-               snd_ac97_pcm_close(dma->pcm);
-               dma->pcm_open_flag = 0;
-       }
-       atiixp_clear_dma_packets(chip, dma, substream);
-       snd_pcm_lib_free_pages(substream);
-       return 0;
-}
-
-
-/*
- * pcm hardware definition, identical for all DMA types
- */
-static snd_pcm_hardware_t snd_atiixp_pcm_hw =
-{
-       .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                                SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                SNDRV_PCM_INFO_MMAP_VALID),
-       .formats =              SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
-       .rates =                SNDRV_PCM_RATE_48000,
-       .rate_min =             48000,
-       .rate_max =             48000,
-       .channels_min =         2,
-       .channels_max =         2,
-       .buffer_bytes_max =     256 * 1024,
-       .period_bytes_min =     32,
-       .period_bytes_max =     128 * 1024,
-       .periods_min =          2,
-       .periods_max =          ATI_MAX_DESCRIPTORS,
-};
-
-static int snd_atiixp_pcm_open(snd_pcm_substream_t *substream, atiixp_dma_t *dma)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       snd_pcm_runtime_t *runtime = substream->runtime;
-       unsigned long flags;
-       int err;
-
-       snd_assert(dma->ops && dma->ops->enable_dma, return -EINVAL);
-
-       dma->substream = substream;
-       runtime->hw = snd_atiixp_pcm_hw;
-       if (dma->pcm) {
-               runtime->hw.rates = dma->pcm->rates;
-               snd_pcm_limit_hw_rates(runtime);
-       } else {
-               /* SPDIF */
-               runtime->hw.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100 | 
SNDRV_PCM_RATE_32000;
-               runtime->hw.rate_min = 32000;
-       }
-       if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) 
< 0)
-               return err;
-       runtime->private_data = dma;
-
-       /* enable DMA bits */
-       spin_lock_irqsave(&chip->reg_lock, flags);
-       dma->ops->enable_dma(chip, 1);
-       spin_unlock_irqrestore(&chip->reg_lock, flags);
-
-       return 0;
-}
-
-static int snd_atiixp_pcm_close(snd_pcm_substream_t *substream, atiixp_dma_t *dma)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       /* disable DMA bits */
-       snd_assert(dma->ops && dma->ops->enable_dma, return -EINVAL);
-       spin_lock_irq(&chip->reg_lock);
-       dma->ops->enable_dma(chip, 0);
-       spin_unlock_irq(&chip->reg_lock);
-       dma->substream = NULL;
-       return 0;
-}
-
-/*
- */
-static int snd_atiixp_playback_open(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       int err;
-
-       err = snd_atiixp_pcm_open(substream, &chip->dmas[ATI_DMA_PLAYBACK]);
-       substream->runtime->hw.channels_max = chip->max_channels;
-       if (chip->max_channels > 2)
-               /* channels must be even */
-               snd_pcm_hw_constraint_step(substream->runtime, 0,
-                                          SNDRV_PCM_HW_PARAM_CHANNELS, 2);
-
-       return 0;
-}
-
-static int snd_atiixp_playback_close(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       return snd_atiixp_pcm_close(substream, &chip->dmas[ATI_DMA_PLAYBACK]);
-}
-
-static int snd_atiixp_capture_open(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       return snd_atiixp_pcm_open(substream, &chip->dmas[ATI_DMA_CAPTURE]);
-}
-
-static int snd_atiixp_capture_close(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       return snd_atiixp_pcm_close(substream, &chip->dmas[ATI_DMA_CAPTURE]);
-}
-
-static int snd_atiixp_spdif_open(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       return snd_atiixp_pcm_open(substream, &chip->dmas[ATI_DMA_SPDIF]);
-}
-
-static int snd_atiixp_spdif_close(snd_pcm_substream_t *substream)
-{
-       atiixp_t *chip = snd_pcm_substream_chip(substream);
-       return snd_atiixp_pcm_close(substream, &chip->dmas[ATI_DMA_SPDIF]);
-}
-
-/* AC97 playback */
-static snd_pcm_ops_t snd_atiixp_playback_ops = {
-       .open =         snd_atiixp_playback_open,
-       .close =        snd_atiixp_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    snd_atiixp_pcm_hw_params,
-       .hw_free =      snd_atiixp_pcm_hw_free,
-       .prepare =      snd_atiixp_playback_prepare,
-       .trigger =      snd_atiixp_pcm_trigger,
-       .pointer =      snd_atiixp_pcm_pointer,
-};
-
-/* AC97 capture */
-static snd_pcm_ops_t snd_atiixp_capture_ops = {
-       .open =         snd_atiixp_capture_open,
-       .close =        snd_atiixp_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    snd_atiixp_pcm_hw_params,
-       .hw_free =      snd_atiixp_pcm_hw_free,
-       .prepare =      snd_atiixp_capture_prepare,
-       .trigger =      snd_atiixp_pcm_trigger,
-       .pointer =      snd_atiixp_pcm_pointer,
-};
-
-/* SPDIF playback */
-static snd_pcm_ops_t snd_atiixp_spdif_ops = {
-       .open =         snd_atiixp_spdif_open,
-       .close =        snd_atiixp_spdif_close,
-       .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    snd_atiixp_pcm_hw_params,
-       .hw_free =      snd_atiixp_pcm_hw_free,
-       .prepare =      snd_atiixp_spdif_prepare,
-       .trigger =      snd_atiixp_pcm_trigger,
-       .pointer =      snd_atiixp_pcm_pointer,
-};
-
-static struct ac97_pcm atiixp_pcm_defs[] __devinitdata = {
-       /* front PCM */
-       {
-               .exclusive = 1,
-               .r = {  {
-                               .slots = (1 << AC97_SLOT_PCM_LEFT) |
-                                        (1 << AC97_SLOT_PCM_RIGHT) |
-                                        (1 << AC97_SLOT_PCM_CENTER) |
-                                        (1 << AC97_SLOT_PCM_SLEFT) |
-                                        (1 << AC97_SLOT_PCM_SRIGHT) |
-                                        (1 << AC97_SLOT_LFE)
-                       }
-               }
-       },
-       /* PCM IN #1 */
-       {
-               .stream = 1,
-               .exclusive = 1,
-               .r = {  {
-                               .slots = (1 << AC97_SLOT_PCM_LEFT) |
-                                        (1 << AC97_SLOT_PCM_RIGHT)
-                       }
-               }
-       },
-       /* S/PDIF OUT (optional) */
-       {
-               .exclusive = 1,
-               .spdif = 1,
-               .r = {  {
-                               .slots = (1 << AC97_SLOT_SPDIF_LEFT2) |
-                                        (1 << AC97_SLOT_SPDIF_RIGHT2)
-                       }
-               }
-       },
-};
-
-static atiixp_dma_ops_t snd_atiixp_playback_dma_ops = {
-       .type = ATI_DMA_PLAYBACK,
-       .llp_offset = ATI_REG_OUT_DMA_LINKPTR,
-       .enable_dma = atiixp_out_enable_dma,
-       .enable_transfer = atiixp_out_enable_transfer,
-       .flush_dma = atiixp_out_flush_dma,
-};
-       
-static atiixp_dma_ops_t snd_atiixp_capture_dma_ops = {
-       .type = ATI_DMA_CAPTURE,
-       .llp_offset = ATI_REG_IN_DMA_LINKPTR,
-       .enable_dma = atiixp_in_enable_dma,
-       .enable_transfer = atiixp_in_enable_transfer,
-       .flush_dma = atiixp_in_flush_dma,
-};
-       
-static atiixp_dma_ops_t snd_atiixp_spdif_dma_ops = {
-       .type = ATI_DMA_SPDIF,
-       .llp_offset = ATI_REG_SPDF_DMA_LINKPTR,
-       .enable_dma = atiixp_spdif_enable_dma,
-       .enable_transfer = atiixp_spdif_enable_transfer,
-       .flush_dma = atiixp_spdif_flush_dma,
-};
-       
-
-static int __devinit snd_atiixp_pcm_new(atiixp_t *chip)
-{
-       snd_pcm_t *pcm;
-       ac97_bus_t *pbus = chip->ac97_bus;
-       int err, i, num_pcms;
-
-       /* initialize constants */
-       chip->dmas[ATI_DMA_PLAYBACK].ops = &snd_atiixp_playback_dma_ops;
-       chip->dmas[ATI_DMA_CAPTURE].ops = &snd_atiixp_capture_dma_ops;
-       chip->dmas[ATI_DMA_SPDIF].ops = &snd_atiixp_spdif_dma_ops;
-
-       /* assign AC97 pcm */
-       if (chip->spdif_over_aclink)
-               num_pcms = 3;
-       else
-               num_pcms = 2;
-       err = snd_ac97_pcm_assign(pbus, num_pcms, atiixp_pcm_defs);
-       if (err < 0)
-               return err;
-
-       chip->max_channels = 2;
-       if (pbus->pcms[0].r[0].slots & (1 << AC97_SLOT_PCM_SLEFT)) {
-               if (pbus->pcms[0].r[0].slots & (1 << AC97_SLOT_LFE))
-                       chip->max_channels = 6;
-               else
-                       chip->max_channels = 4;
-       }
-
-       chip->dmas[ATI_DMA_PLAYBACK].pcm = &pbus->pcms[0];
-       chip->dmas[ATI_DMA_CAPTURE].pcm = &pbus->pcms[1];
-       if (chip->spdif_over_aclink)
-               chip->dmas[ATI_DMA_SPDIF].pcm = &pbus->pcms[2];
-
-       /* PCM #0: analog I/O */
-       err = snd_pcm_new(chip->card, "ATI IXP AC97", 0, 1, 1, &pcm);
-       if (err < 0)
-               return err;
-       snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_atiixp_playback_ops);
-       snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_atiixp_capture_ops);
-       pcm->private_data = chip;
-       strcpy(pcm->name, "ATI IXP AC97");
-
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             snd_dma_pci_data(chip->pci), 64*1024, 
128*1024);
-
-       /* no SPDIF support on codec? */
-       if (chip->dmas[ATI_DMA_SPDIF].pcm && ! chip->dmas[ATI_DMA_SPDIF].pcm->rates)
-               return 0;
-               
-       /* PCM #1: spdif playback */
-       err = snd_pcm_new(chip->card, "ATI IXP IEC958", 1, 1, 0, &pcm);
-       if (err < 0)
-               return err;
-       snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_atiixp_spdif_ops);
-       pcm->private_data = chip;
-       strcpy(pcm->name, "ATI IXP IEC958");
-
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             snd_dma_pci_data(chip->pci), 64*1024, 
128*1024);
-
-       /* pre-select AC97 SPDIF slots 10/11 */
-       for (i = 0; i < 3; i++) {
-               if (chip->ac97[i])
-                       snd_ac97_update_bits(chip->ac97[i], AC97_EXTENDED_STATUS, 0x03 
<< 4, 0x03 << 4);
-       }
-
-       return 0;
-}
-
-
-
-/*
- * interrupt handler
- */
-static irqreturn_t snd_atiixp_interrupt(int irq, void *dev_id, struct pt_regs *regs)
-{
-       atiixp_t *chip = snd_magic_cast(atiixp_t, dev_id, return IRQ_NONE);
-       unsigned int status;
-
-       status = atiixp_read(chip, ISR);
-
-       if (! status)
-               return IRQ_NONE;
-
-       /* process audio DMA */
-       if (status & ATI_REG_ISR_OUT_XRUN)
-               snd_atiixp_xrun_dma(chip,  &chip->dmas[ATI_DMA_PLAYBACK]);
-       else if (status & ATI_REG_ISR_OUT_STATUS)
-               snd_atiixp_update_dma(chip, &chip->dmas[ATI_DMA_PLAYBACK]);
-       if (status & ATI_REG_ISR_IN_XRUN)
-               snd_atiixp_xrun_dma(chip,  &chip->dmas[ATI_DMA_CAPTURE]);
-       else if (status & ATI_REG_ISR_IN_STATUS)
-               snd_atiixp_update_dma(chip, &chip->dmas[ATI_DMA_CAPTURE]);
-       if (status & ATI_REG_ISR_SPDF_XRUN)
-               snd_atiixp_xrun_dma(chip,  &chip->dmas[ATI_DMA_SPDIF]);
-       else if (status & ATI_REG_ISR_SPDF_STATUS)
-               snd_atiixp_update_dma(chip, &chip->dmas[ATI_DMA_SPDIF]);
-
-       /* for codec detection */
-       if (status & CODEC_CHECK_BITS) {
-               unsigned int detected;
-               detected = status & CODEC_CHECK_BITS;
-               spin_lock(&chip->reg_lock);
-               chip->codec_not_ready_bits |= detected;
-               atiixp_update(chip, IER, detected, 0); /* disable the detected irqs */
-               spin_unlock(&chip->reg_lock);
-       }
-
-       /* ack */
-       atiixp_write(chip, ISR, status);
-
-       return IRQ_HANDLED;
-}
-
-
-/*
- * ac97 mixer section
- */
-
-static int __devinit snd_atiixp_mixer_new(atiixp_t *chip, int clock)
-{
-       ac97_bus_t bus, *pbus;
-       ac97_t ac97;
-       int i, err;
-       static unsigned int codec_skip[3] = {
-               ATI_REG_ISR_CODEC0_NOT_READY,
-               ATI_REG_ISR_CODEC1_NOT_READY,
-               ATI_REG_ISR_CODEC2_NOT_READY,
-       };
-
-       if (snd_atiixp_codec_detect(chip) < 0)
-               return -ENXIO;
-
-       memset(&bus, 0, sizeof(bus));
-       bus.write = snd_atiixp_ac97_write;
-       bus.read = snd_atiixp_ac97_read;
-       bus.private_data = chip;
-       bus.clock = clock;
-       if ((err = snd_ac97_bus(chip->card, &bus, &pbus)) < 0)
-               return err;
-       chip->ac97_bus = pbus;
-
-       for (i = 0; i < 3; i++) {
-               if (chip->codec_not_ready_bits & codec_skip[i])
-                       continue;
-               memset(&ac97, 0, sizeof(ac97));
-               ac97.private_data = chip;
-               ac97.pci = chip->pci;
-               ac97.num = i;
-               if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97[i])) < 0)
-                       return err;
-       }
-
-       /* snd_ac97_tune_hardware(chip->ac97, ac97_quirks); */
-
-       return 0;
-}
-
-
-/*
- * proc interface for register dump
- */
-
-static void snd_atiixp_proc_read(snd_info_entry_t *entry, snd_info_buffer_t *buffer)
-{
-       atiixp_t *chip = snd_magic_cast(atiixp_t, entry->private_data, return);
-       int i;
-
-       for (i = 0; i < 256; i += 4)
-               snd_iprintf(buffer, "%02x: %08x\n", i, readl(chip->remap_addr + i));
-}
-
-static void __devinit snd_atiixp_proc_init(atiixp_t *chip)
-{
-       snd_info_entry_t *entry;
-
-       if (! snd_card_proc_new(chip->card, "atiixp", &entry))
-               snd_info_set_text_ops(entry, chip, 1024, snd_atiixp_proc_read);
-}
-
-
-
-/*
- * destructor
- */
-
-static int snd_atiixp_free(atiixp_t *chip)
-{
-       if (chip->irq < 0)
-               goto __hw_end;
-       snd_atiixp_chip_stop(chip);
-       synchronize_irq(chip->irq);
-      __hw_end:
-       if (chip->remap_addr)
-               iounmap((void *) chip->remap_addr);
-       if (chip->res) {
-               release_resource(chip->res);
-               kfree_nocheck(chip->res);
-       }
-       if (chip->irq >= 0)
-               free_irq(chip->irq, (void *)chip);
-       snd_magic_kfree(chip);
-       return 0;
-}
-
-static int snd_atiixp_dev_free(snd_device_t *device)
-{
-       atiixp_t *chip = snd_magic_cast(atiixp_t, device->device_data, return -ENXIO);
-       return snd_atiixp_free(chip);
-}
-
-/*
- * constructor for chip instance
- */
-static int __devinit snd_atiixp_create(snd_card_t *card,
-                                     struct pci_dev *pci,
-                                     atiixp_t **r_chip)
-{
-       static snd_device_ops_t ops = {
-               .dev_free =     snd_atiixp_dev_free,
-       };
-       atiixp_t *chip;
-       int err;
-
-       if ((err = pci_enable_device(pci)) < 0)
-               return err;
-
-       chip = snd_magic_kcalloc(atiixp_t, 0, GFP_KERNEL);
-       if (chip == NULL)
-               return -ENOMEM;
-
-       spin_lock_init(&chip->reg_lock);
-       spin_lock_init(&chip->ac97_lock);
-       chip->card = card;
-       chip->pci = pci;
-       chip->irq = -1;
-       chip->addr = pci_resource_start(pci, 0);
-       if ((chip->res = request_mem_region(chip->addr, ATI_MEM_REGION, "ATI IXP 
AC97")) == NULL) {
-               snd_printk("unable to grab I/O memory 0x%lx\n", chip->addr);
-               snd_atiixp_free(chip);
-               return -EBUSY;
-       }
-       chip->remap_addr = (unsigned long) ioremap_nocache(chip->addr, ATI_MEM_REGION);
-       if (chip->remap_addr == 0) {
-               snd_printk("AC'97 space ioremap problem\n");
-               snd_atiixp_free(chip);
-               return -EIO;
-       }
-
-       if (request_irq(pci->irq, snd_atiixp_interrupt, SA_INTERRUPT|SA_SHIRQ, 
card->shortname, (void *)chip)) {
-               snd_printk("unable to grab IRQ %d\n", pci->irq);
-               snd_atiixp_free(chip);
-               return -EBUSY;
-       }
-       chip->irq = pci->irq;
-       pci_set_master(pci);
-       synchronize_irq(chip->irq);
-
-       if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
-               snd_atiixp_free(chip);
-               return err;
-       }
-
-       snd_card_set_dev(card, &pci->dev);
-
-       *r_chip = chip;
-       return 0;
-}
-
-
-static int __devinit snd_atiixp_probe(struct pci_dev *pci,
-                                    const struct pci_device_id *pci_id)
-{
-       static int dev;
-       snd_card_t *card;
-       atiixp_t *chip;
-       unsigned char revision;
-       int err;
-
-       if (dev >= SNDRV_CARDS)
-               return -ENODEV;
-       if (!enable[dev]) {
-               dev++;
-               return -ENOENT;
-       }
-
-       card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-       if (card == NULL)
-               return -ENOMEM;
-
-       pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
-
-       strcpy(card->driver, "ATIIXP");
-       strcpy(card->shortname, "ATI IXP");
-       if ((err = snd_atiixp_create(card, pci, &chip)) < 0)
-               goto __error;
-
-       if ((err = snd_atiixp_aclink_reset(chip)) < 0)
-               goto __error;
-
-       chip->spdif_over_aclink = spdif_aclink[dev];
-
-       if ((err = snd_atiixp_mixer_new(chip, ac97_clock[dev])) < 0)
-               goto __error;
-
-       if ((err = snd_atiixp_pcm_new(chip)) < 0)
-               goto __error;
-       
-       snd_atiixp_proc_init(chip);
-
-       snd_atiixp_chip_start(chip);
-
-       sprintf(card->longname, "%s rev %x at 0x%lx, irq %i",
-               card->shortname, revision, chip->addr, chip->irq);
-
-       if ((err = snd_card_register(card)) < 0)
-               goto __error;
-
-       pci_set_drvdata(pci, chip);
-       dev++;
-       return 0;
-
- __error:
-       snd_card_free(card);
-       return err;
-}
-
-static void __devexit snd_atiixp_remove(struct pci_dev *pci)
-{
-       atiixp_t *chip = snd_magic_cast(atiixp_t, pci_get_drvdata(pci), return);
-       if (chip)
-               snd_card_free(chip->card);
-       pci_set_drvdata(pci, NULL);
-}
-
-static struct pci_driver driver = {
-       .name = "ATI IXP AC97 controller",
-       .id_table = snd_atiixp_ids,
-       .probe = snd_atiixp_probe,
-       .remove = __devexit_p(snd_atiixp_remove),
-};
-
-
-static int __init alsa_card_atiixp_init(void)
-{
-       int err;
-
-        if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-               printk(KERN_ERR "ATI IXP AC97 controller not found or device busy\n");
-#endif
-                return err;
-        }
-
-        return 0;
-}
-
-static void __exit alsa_card_atiixp_exit(void)
-{
-       pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_atiixp_init)
-module_exit(alsa_card_atiixp_exit)
-
-#ifndef MODULE
-
-/* format is: snd-atiixp=enable,index,id,ac97_clock,spdif_aclink */
-
-static int __init alsa_card_atiixp_setup(char *str)
-{
-       static unsigned __initdata nr_dev = 0;
-
-       if (nr_dev >= SNDRV_CARDS)
-               return 0;
-       (void)(get_option(&str,&enable[nr_dev]) == 2 &&
-              get_option(&str,&index[nr_dev]) == 2 &&
-              get_id(&str,&id[nr_dev]) == 2 &&
-              get_option(&str,&ac97_clock[nr_dev]) == 2 &&
-              get_option(&str,&spdif_aclink[nr_dev]) == 2
-              );
-       nr_dev++;
-       return 1;
-}
-
-__setup("snd-atiixp=", alsa_card_atiixp_setup);
-
-#endif /* ifndef MODULE */
-
-EXPORT_NO_SYMBOLS;  /* for 2.2/2.4 kernels */
-
+#include "../alsa-kernel/pci/atiixp.c"
+EXPORT_NO_SYMBOLS;



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to