ChangeSet 1.2181.25.7, 2005/03/22 08:58:26+01:00, [EMAIL PROTECTED]

        [ALSA] emu10k1 - add support for p16v chip (24-bit playback)
        
        EMU10K1/EMU10K2 driver
        Add 24bit, 96khz support for multichannel playback on the Audigy 2 
sound cards.
        
        Signed-off-by: James Courtier-Dutton <[EMAIL PROTECTED]>
        Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>



 include/sound/emu10k1.h          |   51 ++
 sound/pci/emu10k1/Makefile       |    2 
 sound/pci/emu10k1/emu10k1.c      |   17 
 sound/pci/emu10k1/emu10k1_main.c |   17 
 sound/pci/emu10k1/emumixer.c     |    6 
 sound/pci/emu10k1/emuproc.c      |   12 
 sound/pci/emu10k1/io.c           |   32 +
 sound/pci/emu10k1/irq.c          |   18 
 sound/pci/emu10k1/p16v.c         |  734 +++++++++++++++++++++++++++++++++++++++
 sound/pci/emu10k1/p16v.h         |  299 +++++++++++++++
 10 files changed, 1169 insertions(+), 19 deletions(-)


diff -Nru a/include/sound/emu10k1.h b/include/sound/emu10k1.h
--- a/include/sound/emu10k1.h   2005-03-30 16:10:27 -08:00
+++ b/include/sound/emu10k1.h   2005-03-30 16:10:27 -08:00
@@ -280,6 +280,46 @@
 #define AC97ADDRESS_READY      0x80            /* Read-only bit, reflects 
CODEC READY signal   */
 #define AC97ADDRESS_ADDRESS    0x7f            /* Address of indexed AC97 
register             */
 
+/* Available on the Audigy 2 and Audigy 4 only. This is the P16V chip. */
+#define PTR2                   0x20            /* Indexed register set pointer 
register        */
+#define DATA2                  0x24            /* Indexed register set data 
register           */
+#define IPR2                   0x28            /* P16V interrupt pending 
register              */
+#define IPR2_PLAYBACK_CH_0_LOOP      0x00001000 /* Playback Channel 0 loop     
                          */
+#define IPR2_PLAYBACK_CH_0_HALF_LOOP 0x00000100 /* Playback Channel 0 half 
loop                          */
+#define IPR2_CAPTURE_CH_0_LOOP       0x00100000 /* Capture Channel 0 loop      
                         */
+#define IPR2_CAPTURE_CH_0_HALF_LOOP  0x00010000 /* Capture Channel 0 half loop 
                         */
+                                               /* 0x00000100 Playback. Only in 
once per period.
+                                                * 0x00110000 Capture. Int on 
half buffer.
+                                                */
+#define INTE2                  0x2c            /* P16V Interrupt enable 
register.      */
+#define INTE2_PLAYBACK_CH_0_LOOP      0x00001000 /* Playback Channel 0 loop    
                           */
+#define INTE2_PLAYBACK_CH_0_HALF_LOOP 0x00000100 /* Playback Channel 0 half 
loop                          */
+#define INTE2_PLAYBACK_CH_1_LOOP      0x00002000 /* Playback Channel 1 loop    
                           */
+#define INTE2_PLAYBACK_CH_1_HALF_LOOP 0x00000200 /* Playback Channel 1 half 
loop                          */
+#define INTE2_PLAYBACK_CH_2_LOOP      0x00004000 /* Playback Channel 2 loop    
                           */
+#define INTE2_PLAYBACK_CH_2_HALF_LOOP 0x00000400 /* Playback Channel 2 half 
loop                          */
+#define INTE2_PLAYBACK_CH_3_LOOP      0x00008000 /* Playback Channel 3 loop    
                           */
+#define INTE2_PLAYBACK_CH_3_HALF_LOOP 0x00000800 /* Playback Channel 3 half 
loop                          */
+#define INTE2_CAPTURE_CH_0_LOOP       0x00100000 /* Capture Channel 0 loop     
                          */
+#define INTE2_CAPTURE_CH_0_HALF_LOOP  0x00010000 /* Caputre Channel 0 half 
loop                          */
+#define HCFG2                  0x34            /* Defaults: 0, win2000 sets it 
to 00004201 */
+                                               /* 0x00000000 2-channel output. 
*/
+                                               /* 0x00000200 8-channel output. 
*/
+                                               /* 0x00000004 pauses stream/irq 
fail. */
+                                               /* Rest of bits no nothing to 
sound output */
+                                               /* bit 0: Enable P16V audio.
+                                                * bit 1: Lock P16V record 
memory cache.
+                                                * bit 2: Lock P16V playback 
memory cache.
+                                                * bit 3: Dummy record insert 
zero samples.
+                                                * bit 8: Record 8-channel in 
phase.
+                                                * bit 9: Playback 8-channel in 
phase.
+                                                * bit 11-12: Playback mixer 
attenuation: 0=0dB, 1=-6dB, 2=-12dB, 3=Mute.
+                                                * bit 13: Playback mixer 
enable.
+                                                * bit 14: Route SRC48 mixer 
output to fx engine.
+                                                * bit 15: Enable IEEE 1394 
chip.
+                                                */
+#define IPR3                   0x38            /* Cdif interrupt pending 
register              */
+#define INTE3                  0x3c            /* Cdif interrupt enable 
register.      */
 
/************************************************************************************************/
 /* PCI function 1 registers, address = <val> + PCIBASE1                        
                        */
 
/************************************************************************************************/
@@ -1014,6 +1054,9 @@
        int max_cache_pages;                    /* max memory size / PAGE_SIZE 
*/
        struct snd_dma_buffer silent_page;      /* silent page */
        struct snd_dma_buffer ptb_pages;        /* page table pages */
+       struct snd_dma_device p16v_dma_dev;
+       struct snd_dma_buffer p16v_buffer;
+
        snd_util_memhdr_t *memhdr;              /* page allocation list */
        emu10k1_memblk_t *reserved_page;        /* reserved page */
 
@@ -1035,6 +1078,7 @@
        snd_pcm_t *pcm;
        snd_pcm_t *pcm_mic;
        snd_pcm_t *pcm_efx;
+       snd_pcm_t *pcm_p16v;
 
        spinlock_t synth_lock;
        void *synth;
@@ -1046,6 +1090,8 @@
        struct semaphore ptb_lock;
 
        emu10k1_voice_t voices[NUM_G];
+       emu10k1_voice_t p16v_voices[4];
+       int p16v_device_offset;
        emu10k1_pcm_mixer_t pcm_mixer[32];
        emu10k1_pcm_mixer_t efx_pcm_mixer[NUM_EFX_PLAYBACK];
        snd_kcontrol_t *ctl_send_routing;
@@ -1087,6 +1133,9 @@
 int snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm);
 int snd_emu10k1_pcm_mic(emu10k1_t * emu, int device, snd_pcm_t ** rpcm);
 int snd_emu10k1_pcm_efx(emu10k1_t * emu, int device, snd_pcm_t ** rpcm);
+int snd_p16v_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm);
+int snd_p16v_free(emu10k1_t * emu);
+int snd_p16v_mixer(emu10k1_t * emu);
 int snd_emu10k1_pcm_multi(emu10k1_t * emu, int device, snd_pcm_t ** rpcm);
 int snd_emu10k1_fx8010_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm);
 int snd_emu10k1_mixer(emu10k1_t * emu);
@@ -1104,6 +1153,8 @@
 /* I/O functions */
 unsigned int snd_emu10k1_ptr_read(emu10k1_t * emu, unsigned int reg, unsigned 
int chn);
 void snd_emu10k1_ptr_write(emu10k1_t *emu, unsigned int reg, unsigned int chn, 
unsigned int data);
+unsigned int snd_emu10k1_ptr20_read(emu10k1_t * emu, unsigned int reg, 
unsigned int chn);
+void snd_emu10k1_ptr20_write(emu10k1_t *emu, unsigned int reg, unsigned int 
chn, unsigned int data);
 unsigned int snd_emu10k1_efx_read(emu10k1_t *emu, unsigned int pc);
 void snd_emu10k1_intr_enable(emu10k1_t *emu, unsigned int intrenb);
 void snd_emu10k1_intr_disable(emu10k1_t *emu, unsigned int intrenb);
diff -Nru a/sound/pci/emu10k1/Makefile b/sound/pci/emu10k1/Makefile
--- a/sound/pci/emu10k1/Makefile        2005-03-30 16:10:27 -08:00
+++ b/sound/pci/emu10k1/Makefile        2005-03-30 16:10:27 -08:00
@@ -5,7 +5,7 @@
 
 snd-emu10k1-objs := emu10k1.o emu10k1_main.o \
                    irq.o memory.o voice.o emumpu401.o emupcm.o io.o \
-                   emuproc.o emumixer.o emufx.o timer.o
+                   emuproc.o emumixer.o emufx.o timer.o p16v.o
 snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o
 snd-emu10k1x-objs := emu10k1x.o
 
diff -Nru a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
--- a/sound/pci/emu10k1/emu10k1.c       2005-03-30 16:10:27 -08:00
+++ b/sound/pci/emu10k1/emu10k1.c       2005-03-30 16:10:27 -08:00
@@ -138,7 +138,13 @@
        if ((err = snd_emu10k1_pcm_efx(emu, 2, NULL)) < 0) {
                snd_card_free(card);
                return err;
-       }               
+       }
+       /* This stores the periods table. */
+       if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), 1024, 
&emu->p16v_buffer) < 0) {
+               snd_p16v_free(emu);
+               return -ENOMEM;
+       }
+
        if ((err = snd_emu10k1_mixer(emu)) < 0) {
                snd_card_free(card);
                return err;
@@ -152,8 +158,13 @@
        if ((err = snd_emu10k1_pcm_multi(emu, 3, NULL)) < 0) {
                snd_card_free(card);
                return err;
-       }               
-
+       }
+       if (emu->audigy && emu->revision == 4) { /* P16V */     
+               if ((err = snd_p16v_pcm(emu, 4, NULL)) < 0) {
+                       snd_card_free(card);
+                       return err;
+               }
+       }
        if (emu->audigy) {
                if ((err = snd_emu10k1_audigy_midi(emu)) < 0) {
                        snd_card_free(card);
diff -Nru a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
--- a/sound/pci/emu10k1/emu10k1_main.c  2005-03-30 16:10:27 -08:00
+++ b/sound/pci/emu10k1/emu10k1_main.c  2005-03-30 16:10:27 -08:00
@@ -39,6 +39,7 @@
 
 #include <sound/core.h>
 #include <sound/emu10k1.h>
+#include "p16v.h"
 
 #if 0
 MODULE_AUTHOR("Jaroslav Kysela <[EMAIL PROTECTED]>, Creative Labs, Inc.");
@@ -178,14 +179,17 @@
                tmp &= 0xfffff1ff;
                tmp |= (0x2<<9);
                snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, 0, tmp);
-
+               
                /* Setup SRCSel (Enable Spdif,I2S SRCMulti) */
-               outl(0x600000, emu->port + 0x20);
-               outl(0x14, emu->port + 0x24);
-
+               snd_emu10k1_ptr20_write(emu, SRCSel, 0, 0x14);
                /* Setup SRCMulti Input Audio Enable */
-               outl(0x6E0000, emu->port + 0x20);
-               outl(0xFF00FF00, emu->port + 0x24);
+               /* Use 0xFFFFFFFF to enable P16V sounds. */
+               snd_emu10k1_ptr20_write(emu, SRCMULTI_ENABLE, 0, 0xFFFFFFFF);
+
+               /* Enabled Phased (8-channel) P16V playback */
+               outl(0x0201, emu->port + HCFG2);
+               /* Set playback routing. */
+               snd_emu10k1_ptr_write(emu, CAPTURE_P16V_SOURCE, 0, 78e4);
        }
        if (emu->audigy && (emu->serial == 0x10011102) ) { /* audigy2 Value */
                /* Hacks for Alice3 to work independent of haP16V driver */
@@ -596,6 +600,7 @@
        if (emu->port)
                pci_release_regions(emu->pci);
        pci_disable_device(emu->pci);
+       snd_p16v_free(emu);
        kfree(emu);
        return 0;
 }
diff -Nru a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
--- a/sound/pci/emu10k1/emumixer.c      2005-03-30 16:10:27 -08:00
+++ b/sound/pci/emu10k1/emumixer.c      2005-03-30 16:10:27 -08:00
@@ -940,6 +940,10 @@
                if ((err = snd_ctl_add(card, kctl)))
                        return err;
        }
-
+       if (emu->audigy && emu->revision == 4) { /* P16V */
+               if ((err = snd_p16v_mixer(emu)))
+                       return err;
+       }
+               
        return 0;
 }
diff -Nru a/sound/pci/emu10k1/emuproc.c b/sound/pci/emu10k1/emuproc.c
--- a/sound/pci/emu10k1/emuproc.c       2005-03-30 16:10:27 -08:00
+++ b/sound/pci/emu10k1/emuproc.c       2005-03-30 16:10:27 -08:00
@@ -413,7 +413,7 @@
 
 
 static void snd_emu_proc_ptr_reg_read(snd_info_entry_t *entry,
-                                     snd_info_buffer_t * buffer, int iobase, 
int offset, int length)
+                                     snd_info_buffer_t * buffer, int iobase, 
int offset, int length, int voices)
 {
        emu10k1_t *emu = entry->private_data;
        unsigned long value;
@@ -425,7 +425,7 @@
        snd_iprintf(buffer, "Registers 0x%x\n", iobase);
        for(i = offset; i < offset+length; i++) {
                snd_iprintf(buffer, "%02X: ",i);
-               for (j = 0; j < 64; j++) {
+               for (j = 0; j < voices; j++) {
                        if(iobase == 0)
                                value = snd_ptr_read(emu, 0, i, j);
                        else
@@ -466,25 +466,25 @@
 static void snd_emu_proc_ptr_reg_read00a(snd_info_entry_t *entry,
                                         snd_info_buffer_t * buffer)
 {
-       snd_emu_proc_ptr_reg_read(entry, buffer, 0, 0, 0x40);
+       snd_emu_proc_ptr_reg_read(entry, buffer, 0, 0, 0x40, 64);
 }
 
 static void snd_emu_proc_ptr_reg_read00b(snd_info_entry_t *entry,
                                         snd_info_buffer_t * buffer)
 {
-       snd_emu_proc_ptr_reg_read(entry, buffer, 0, 0x40, 0x40);
+       snd_emu_proc_ptr_reg_read(entry, buffer, 0, 0x40, 0x40, 64);
 }
 
 static void snd_emu_proc_ptr_reg_read20a(snd_info_entry_t *entry,
                                         snd_info_buffer_t * buffer)
 {
-       snd_emu_proc_ptr_reg_read(entry, buffer, 0x20, 0, 0x40);
+       snd_emu_proc_ptr_reg_read(entry, buffer, 0x20, 0, 0x40, 4);
 }
 
 static void snd_emu_proc_ptr_reg_read20b(snd_info_entry_t *entry,
                                         snd_info_buffer_t * buffer)
 {
-       snd_emu_proc_ptr_reg_read(entry, buffer, 0x20, 0x40, 0x40);
+       snd_emu_proc_ptr_reg_read(entry, buffer, 0x20, 0x40, 0x40, 4);
 }
 #endif
 
diff -Nru a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
--- a/sound/pci/emu10k1/io.c    2005-03-30 16:10:27 -08:00
+++ b/sound/pci/emu10k1/io.c    2005-03-30 16:10:27 -08:00
@@ -91,6 +91,38 @@
        }
 }
 
+unsigned int snd_emu10k1_ptr20_read(emu10k1_t * emu, 
+                                         unsigned int reg, 
+                                         unsigned int chn)
+{
+       unsigned long flags;
+       unsigned int regptr, val;
+  
+       regptr = (reg << 16) | chn;
+
+       spin_lock_irqsave(&emu->emu_lock, flags);
+       outl(regptr, emu->port + 0x20 + PTR);
+       val = inl(emu->port + 0x20 + DATA);
+       spin_unlock_irqrestore(&emu->emu_lock, flags);
+       return val;
+}
+
+void snd_emu10k1_ptr20_write(emu10k1_t *emu, 
+                                  unsigned int reg, 
+                                  unsigned int chn, 
+                                  unsigned int data)
+{
+       unsigned int regptr;
+       unsigned long flags;
+
+       regptr = (reg << 16) | chn;
+
+       spin_lock_irqsave(&emu->emu_lock, flags);
+       outl(regptr, emu->port + 0x20 + PTR);
+       outl(data, emu->port + 0x20 + DATA);
+       spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
 void snd_emu10k1_intr_enable(emu10k1_t *emu, unsigned int intrenb)
 {
        unsigned long flags;
diff -Nru a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
--- a/sound/pci/emu10k1/irq.c   2005-03-30 16:10:27 -08:00
+++ b/sound/pci/emu10k1/irq.c   2005-03-30 16:10:27 -08:00
@@ -33,7 +33,7 @@
 irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        emu10k1_t *emu = dev_id;
-       unsigned int status, orig_status;
+       unsigned int status, status2, orig_status, orig_status2;
        int handled = 0;
 
        while ((status = inl(emu->port + IPR)) != 0) {
@@ -149,7 +149,7 @@
                }
                if (status) {
                        unsigned int bits;
-                       snd_printk(KERN_ERR "emu10k1: unhandled interrupt: 
0x%08x\n", status);
+                       //snd_printk(KERN_ERR "emu10k1: unhandled interrupt: 
0x%08x\n", status);
                        //make sure any interrupts we don't handle are disabled:
                        bits = INTE_FXDSPENABLE |
                                INTE_PCIERRORENABLE |
@@ -170,5 +170,19 @@
                }
                outl(orig_status, emu->port + IPR); /* ack all */
        }
+       while ((status2 = inl(emu->port + IPR2)) != 0) {
+               u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */
+               emu10k1_voice_t *pvoice = &(emu->p16v_voices[0]);
+               orig_status2 = status2;
+               if(status2 & mask) {
+                       if(pvoice->use) {
+                               snd_pcm_period_elapsed(pvoice->epcm->substream);
+                       } else { 
+                               snd_printk(KERN_ERR "p16v: status: 0x%08x, 
mask=0x%08x, pvoice=%p, use=%d\n", status2, mask, pvoice, pvoice->use);
+                       }
+               }
+               outl(orig_status2, emu->port + IPR2); /* ack all */
+       }
+
        return IRQ_RETVAL(handled);
 }
diff -Nru a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c
--- /dev/null   Wed Dec 31 16:00:00 196900
+++ b/sound/pci/emu10k1/p16v.c  2005-03-30 16:10:27 -08:00
@@ -0,0 +1,734 @@
+/*
+ *  Copyright (c) by James Courtier-Dutton <[EMAIL PROTECTED]>
+ *  Driver p16v chips
+ *  Version: 0.22
+ *
+ *  FEATURES currently supported:
+ *    Output fixed at S32_LE, 2 channel to hw:0,0
+ *    Rates: 44.1, 48, 96, 192.
+ *
+ *  Changelog:
+ *  0.8
+ *    Use separate card based buffer for periods table.
+ *  0.9
+ *    Use 2 channel output streams instead of 8 channel.
+ *       (8 channel output streams might be good for ASIO type output)
+ *    Corrected speaker output, so Front -> Front etc.
+ *  0.10
+ *    Fixed missed interrupts.
+ *  0.11
+ *    Add Sound card model number and names.
+ *    Add Analog volume controls.
+ *  0.12
+ *    Corrected playback interrupts. Now interrupt per period, instead of half 
period.
+ *  0.13
+ *    Use single trigger for multichannel.
+ *  0.14
+ *    Mic capture now works at fixed: S32_LE, 96000Hz, Stereo.
+ *  0.15
+ *    Force buffer_size / period_size == INTEGER.
+ *  0.16
+ *    Update p16v.c to work with changed alsa api.
+ *  0.17
+ *    Update p16v.c to work with changed alsa api. Removed boot_devs.
+ *  0.18
+ *    Merging with snd-emu10k1 driver.
+ *  0.19
+ *    One stereo channel at 24bit now works.
+ *  0.20
+ *    Added better register defines.
+ *  0.21
+ *    Integrated with snd-emu10k1 driver.
+ *  0.22
+ *    Removed #if 0 ... #endif
+ *
+ *
+ *  BUGS:
+ *    Some stability problems when unloading the snd-p16v kernel module.
+ *    --
+ *
+ *  TODO:
+ *    SPDIF out.
+ *    Find out how to change capture sample rates. E.g. To record SPDIF at 
48000Hz.
+ *    Currently capture fixed at 48000Hz.
+ *
+ *    --
+ *  GENERAL INFO:
+ *    Model: SB0240
+ *    P16V Chip: CA0151-DBS
+ *    Audigy 2 Chip: CA0102-IAT
+ *    AC97 Codec: STAC 9721
+ *    ADC: Philips 1361T (Stereo 24bit)
+ *    DAC: CS4382-K (8-channel, 24bit, 192Khz)
+ *
+ *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  Copyright (c) by Francisco Moraes <[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 <linux/delay.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/slab.h>
+#include <linux/moduleparam.h>
+#include <sound/core.h>
+#include <sound/initval.h>
+#include <sound/pcm.h>
+#include <sound/ac97_codec.h>
+#include <sound/info.h>
+#include <sound/emu10k1.h>
+#include "p16v.h"
+
+#define SET_CHANNEL 0  /* Testing channel outputs 0=Front, 1=Center/LFE, 
2=Unknown, 3=Rear */
+#define PCM_FRONT_CHANNEL 0
+#define PCM_REAR_CHANNEL 1
+#define PCM_CENTER_LFE_CHANNEL 2
+#define PCM_UNKNOWN_CHANNEL 3
+#define CONTROL_FRONT_CHANNEL 0
+#define CONTROL_REAR_CHANNEL 3
+#define CONTROL_CENTER_LFE_CHANNEL 1
+#define CONTROL_UNKNOWN_CHANNEL 2
+
+/* Card IDs:
+ * Class 0401: 1102:0004 (rev 04) Subsystem: 1102:2002 -> Audigy2 ZS 7.1 
Model:SB0350
+ * Class 0401: 1102:0004 (rev 04) Subsystem: 1102:1007 -> Audigy2 6.1    
Model:SB0240
+ * Class 0401: 1102:0004 (rev 04) Subsystem: 1102:1002 -> Audigy2 Platinum  
Model:SB msb0240230009266
+ * Class 0401: 1102:0004 (rev 04) Subsystem: 1102:2007 -> Audigy4 Pro 
Model:SB0380 M1SB0380472001901E
+ *
+ */
+
+ /* hardware definition */
+static snd_pcm_hardware_t snd_p16v_playback_hw = {
+       .info =                 (SNDRV_PCM_INFO_MMAP | 
+                                SNDRV_PCM_INFO_INTERLEAVED |
+                                SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                SNDRV_PCM_INFO_MMAP_VALID),
+       .formats =              SNDRV_PCM_FMTBIT_S32_LE, /* Only supports 
24-bit samples padded to 32 bits. */
+       .rates =                SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | 
SNDRV_PCM_RATE_48000 ,
+       .rate_min =             48000,
+       .rate_max =             192000,
+       .channels_min =         8, 
+       .channels_max =         8,
+       .buffer_bytes_max =     (32*1024),
+       .period_bytes_min =     64,
+       .period_bytes_max =     (16*1024),
+       .periods_min =          2,
+       .periods_max =          8,
+       .fifo_size =            0,
+};
+
+static void snd_p16v_pcm_free_substream(snd_pcm_runtime_t *runtime)
+{
+       snd_pcm_t *epcm = runtime->private_data;
+  
+       if (epcm) {
+               //snd_printk("epcm free: %p\n", epcm);
+               kfree(epcm);
+       }
+}
+
+/* open_playback callback */
+static int snd_p16v_pcm_open_playback_channel(snd_pcm_substream_t *substream, 
int channel_id)
+{
+       emu10k1_t *emu = snd_pcm_substream_chip(substream);
+        emu10k1_voice_t *channel = &(emu->p16v_voices[channel_id]);
+       emu10k1_pcm_t *epcm;
+       snd_pcm_runtime_t *runtime = substream->runtime;
+       int err;
+
+       epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        //snd_printk("epcm kcalloc: %p\n", epcm);
+
+       if (epcm == NULL)
+               return -ENOMEM;
+       epcm->emu = emu;
+       epcm->substream = substream;
+        //snd_printk("epcm device=%d, channel_id=%d\n", 
substream->pcm->device, channel_id);
+  
+       runtime->private_data = epcm;
+       runtime->private_free = snd_p16v_pcm_free_substream;
+  
+       runtime->hw = snd_p16v_playback_hw;
+
+        channel->emu = emu;
+        channel->number = channel_id;
+
+        channel->use=1;
+       //snd_printk("p16v: open channel_id=%d, channel=%p, use=0x%x\n", 
channel_id, channel, channel->use);
+        //printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, 
channel);
+        //channel->interrupt = snd_p16v_pcm_channel_interrupt;
+        channel->epcm=epcm;
+       if ((err = snd_pcm_hw_constraint_integer(runtime, 
SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
+                return err;
+
+       return 0;
+}
+
+/* close callback */
+static int snd_p16v_pcm_close_playback(snd_pcm_substream_t *substream)
+{
+       emu10k1_t *emu = snd_pcm_substream_chip(substream);
+       //snd_pcm_runtime_t *runtime = substream->runtime;
+        //emu10k1_pcm_t *epcm = runtime->private_data;
+        emu->p16v_voices[substream->pcm->device - 
emu->p16v_device_offset].use=0;
+/* FIXME: maybe zero others */
+       return 0;
+}
+
+static int snd_p16v_pcm_open_playback_front(snd_pcm_substream_t *substream)
+{
+       return snd_p16v_pcm_open_playback_channel(substream, PCM_FRONT_CHANNEL);
+}
+
+/* hw_params callback */
+static int snd_p16v_pcm_hw_params_playback(snd_pcm_substream_t *substream,
+                                     snd_pcm_hw_params_t * hw_params)
+{
+       int result;
+        //snd_printk("hw_params alloc: substream=%p\n", substream);
+       result = snd_pcm_lib_malloc_pages(substream,
+                                       params_buffer_bytes(hw_params));
+        //snd_printk("hw_params alloc: result=%d\n", result);
+       //dump_stack();
+       return result;
+}
+
+/* hw_free callback */
+static int snd_p16v_pcm_hw_free_playback(snd_pcm_substream_t *substream)
+{
+       int result;
+        //snd_printk("hw_params free: substream=%p\n", substream);
+       result = snd_pcm_lib_free_pages(substream);
+        //snd_printk("hw_params free: result=%d\n", result);
+       //dump_stack();
+       return result;
+}
+
+/* prepare playback callback */
+static int snd_p16v_pcm_prepare_playback(snd_pcm_substream_t *substream)
+{
+       emu10k1_t *emu = snd_pcm_substream_chip(substream);
+       snd_pcm_runtime_t *runtime = substream->runtime;
+       //emu10k1_pcm_t *epcm = runtime->private_data;
+       int channel = substream->pcm->device - emu->p16v_device_offset;
+       u32 *table_base = (u32 *)(emu->p16v_buffer.area+(8*16*channel));
+       u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size);
+       int i;
+       
+        //snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, 
channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, 
frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, 
runtime->channels, runtime->buffer_size, runtime->period_size, 
runtime->periods, frames_to_bytes(runtime, 1));
+        //snd_printk("dma_addr=%x, dma_area=%p, 
table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base);
+       //snd_printk("dma_addr=%x, dma_area=%p, 
dma_bytes(size)=%x\n",emu->p16v_buffer.addr, emu->p16v_buffer.area, 
emu->p16v_buffer.bytes);
+        switch (runtime->rate) {
+       case 44100:
+         snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, 0x8000); /* 
FIXME: This will change the capture rate as well! */
+         break;
+       case 48000:
+         snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, 0x1000); /* 
FIXME: This will change the capture rate as well! */
+         break;
+       case 96000:
+         snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, 0x4000); /* 
FIXME: This will change the capture rate as well! */
+         break;
+       case 192000:
+         snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, 0x2000); /* 
FIXME: This will change the capture rate as well! */
+         break;
+       default:
+         snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, 0x0000); /* 
FIXME: This will change the capture rate as well! */
+         break;
+       }
+       /* FIXME: Check emu->buffer.size before actually writing to it. */
+        for(i=0; i < runtime->periods; i++) {
+               table_base[i*2]=runtime->dma_addr+(i*period_size_bytes);
+               table_base[(i*2)+1]=period_size_bytes<<16;
+       }
+ 
+       snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_ADDR, channel, 
emu->p16v_buffer.addr+(8*16*channel));
+       snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_SIZE, channel, 
(runtime->periods - 1) << 19);
+       snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_PTR, channel, 0);
+       snd_emu10k1_ptr20_write(emu, PLAYBACK_DMA_ADDR, channel, 
runtime->dma_addr);
+       snd_emu10k1_ptr20_write(emu, PLAYBACK_PERIOD_SIZE, channel, 
frames_to_bytes(runtime, runtime->period_size)<<16); // buffer size in bytes
+       snd_emu10k1_ptr20_write(emu, PLAYBACK_POINTER, channel, 0);
+       snd_emu10k1_ptr20_write(emu, 0x07, channel, 0x0);
+       snd_emu10k1_ptr20_write(emu, 0x08, channel, 0);
+
+       return 0;
+}
+
+static void snd_p16v_intr_enable(emu10k1_t *emu, unsigned int intrenb)
+{
+       unsigned long flags;
+       unsigned int enable;
+
+       spin_lock_irqsave(&emu->emu_lock, flags);
+       enable = inl(emu->port + INTE2) | intrenb;
+       outl(enable, emu->port + INTE2);
+       spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
+static void snd_p16v_intr_disable(emu10k1_t *emu, unsigned int intrenb)
+{
+       unsigned long flags;
+       unsigned int disable;
+
+       spin_lock_irqsave(&emu->emu_lock, flags);
+       disable = inl(emu->port + INTE2) & (~intrenb);
+       outl(disable, emu->port + INTE2);
+       spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
+/* trigger_playback callback */
+static int snd_p16v_pcm_trigger_playback(snd_pcm_substream_t *substream,
+                                   int cmd)
+{
+       emu10k1_t *emu = snd_pcm_substream_chip(substream);
+       snd_pcm_runtime_t *runtime;
+       emu10k1_pcm_t *epcm;
+       int channel;
+       int result = 0;
+       struct list_head *pos;
+        snd_pcm_substream_t *s;
+       u32 basic = 0;
+       u32 inte = 0;
+       int running=0;
+
+       switch (cmd) {
+       case SNDRV_PCM_TRIGGER_START:
+               running=1;
+               break;
+       case SNDRV_PCM_TRIGGER_STOP:
+       default:
+               running=0;
+               break;
+       }
+        snd_pcm_group_for_each(pos, substream) {
+                s = snd_pcm_group_substream_entry(pos);
+               runtime = s->runtime;
+               epcm = runtime->private_data;
+               channel = substream->pcm->device-emu->p16v_device_offset;
+               //snd_printk("p16v channel=%d\n",channel);
+               epcm->running = running;
+               basic |= (0x1<<channel);
+               inte |= (INTE2_PLAYBACK_CH_0_LOOP<<channel);
+                snd_pcm_trigger_done(s, substream);
+        }
+       //snd_printk("basic=0x%x, inte=0x%x\n",basic, inte);
+
+       switch (cmd) {
+       case SNDRV_PCM_TRIGGER_START:
+               snd_p16v_intr_enable(emu, inte);
+               snd_emu10k1_ptr20_write(emu, BASIC_INTERRUPT, 0, 
snd_emu10k1_ptr20_read(emu, BASIC_INTERRUPT, 0)| (basic));
+               break;
+       case SNDRV_PCM_TRIGGER_STOP:
+               snd_emu10k1_ptr20_write(emu, BASIC_INTERRUPT, 0, 
snd_emu10k1_ptr20_read(emu, BASIC_INTERRUPT, 0) & ~(basic));
+               snd_p16v_intr_disable(emu, inte);
+               break;
+       default:
+               result = -EINVAL;
+               break;
+       }
+       return result;
+}
+
+/* pointer_playback callback */
+static snd_pcm_uframes_t
+snd_p16v_pcm_pointer_playback(snd_pcm_substream_t *substream)
+{
+       emu10k1_t *emu = snd_pcm_substream_chip(substream);
+       snd_pcm_runtime_t *runtime = substream->runtime;
+       emu10k1_pcm_t *epcm = runtime->private_data;
+       snd_pcm_uframes_t ptr, ptr1, ptr2,ptr3,ptr4 = 0;
+       int channel = substream->pcm->device - emu->p16v_device_offset;
+       if (!epcm->running)
+               return 0;
+
+       ptr3 = snd_emu10k1_ptr20_read(emu, PLAYBACK_LIST_PTR, channel);
+       ptr1 = snd_emu10k1_ptr20_read(emu, PLAYBACK_POINTER, channel);
+       ptr4 = snd_emu10k1_ptr20_read(emu, PLAYBACK_LIST_PTR, channel);
+       if (ptr3 != ptr4) ptr1 = snd_emu10k1_ptr20_read(emu, PLAYBACK_POINTER, 
channel);
+       ptr2 = bytes_to_frames(runtime, ptr1);
+       ptr2+= (ptr4 >> 3) * runtime->period_size;
+       ptr=ptr2;
+        if (ptr >= runtime->buffer_size)
+               ptr -= runtime->buffer_size;
+
+       return ptr;
+}
+
+/* operators */
+static snd_pcm_ops_t snd_p16v_playback_front_ops = {
+       .open =        snd_p16v_pcm_open_playback_front,
+       .close =       snd_p16v_pcm_close_playback,
+       .ioctl =       snd_pcm_lib_ioctl,
+       .hw_params =   snd_p16v_pcm_hw_params_playback,
+       .hw_free =     snd_p16v_pcm_hw_free_playback,
+       .prepare =     snd_p16v_pcm_prepare_playback,
+       .trigger =     snd_p16v_pcm_trigger_playback,
+       .pointer =     snd_p16v_pcm_pointer_playback,
+};
+
+int snd_p16v_free(emu10k1_t *chip)
+{
+       // release the data
+       if (chip->p16v_buffer.area) {
+               snd_dma_free_pages(&chip->p16v_buffer);
+               //snd_printk("period lables free: %p\n", &chip->p16v_buffer);
+       }
+       return 0;
+}
+
+static void snd_p16v_pcm_free(snd_pcm_t *pcm)
+{
+       emu10k1_t *emu = pcm->private_data;
+       //snd_printk("snd_p16v_pcm_free pcm: called\n");
+       snd_pcm_lib_preallocate_free_for_all(pcm);
+       emu->pcm = NULL;
+}
+
+int snd_p16v_pcm(emu10k1_t *emu, int device, snd_pcm_t **rpcm)
+{
+       snd_pcm_t *pcm;
+       snd_pcm_substream_t *substream;
+       int err;
+        int capture=0;
+  
+       //snd_printk("snd_p16v_pcm called. device=%d\n", device);
+       emu->p16v_device_offset = device;
+       if (rpcm)
+               *rpcm = NULL;
+        //if (device == 0) capture=1; 
+       if ((err = snd_pcm_new(emu->card, "p16v", device, 1, capture, &pcm)) < 
0)
+               return err;
+  
+       pcm->private_data = emu;
+       pcm->private_free = snd_p16v_pcm_free;
+
+       snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, 
&snd_p16v_playback_front_ops);
+
+       pcm->info_flags = 0;
+       pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
+       strcpy(pcm->name, "p16v");
+       emu->pcm = pcm;
+
+       for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; 
+           substream; 
+           substream = substream->next) {
+               if ((err = snd_pcm_lib_preallocate_pages(substream, 
+                                                        SNDRV_DMA_TYPE_DEV, 
+                                                        
snd_dma_pci_data(emu->pci), 
+                                                        64*1024, 64*1024)) < 
0) /* FIXME: 32*1024 for sound buffer, between 32and64 for Periods table. */
+                       return err;
+               //snd_printk("preallocate playback substream: err=%d\n", err);
+       }
+
+       for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; 
+             substream; 
+             substream = substream->next) {
+               if ((err = snd_pcm_lib_preallocate_pages(substream, 
+                                                  SNDRV_DMA_TYPE_DEV, 
+                                                  snd_dma_pci_data(emu->pci), 
+                                                  64*1024, 64*1024)) < 0)
+                       return err;
+               //snd_printk("preallocate capture substream: err=%d\n", err);
+       }
+  
+       if (rpcm)
+               *rpcm = pcm;
+  
+       return 0;
+}
+
+static int snd_p16v_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t 
* uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 255;
+        return 0;
+}
+
+static int snd_p16v_volume_get(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol, int 
reg, int high_low)
+{
+        emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+        u32 value;
+
+        value = snd_emu10k1_ptr20_read(emu, reg, high_low);
+       if (high_low == 1) {
+               ucontrol->value.integer.value[0] = 0xff - ((value >> 24) & 
0xff); /* Left */
+               ucontrol->value.integer.value[1] = 0xff - ((value >> 16) & 
0xff); /* Right */
+       } else {
+               ucontrol->value.integer.value[0] = 0xff - ((value >> 8) & 
0xff); /* Left */
+               ucontrol->value.integer.value[1] = 0xff - ((value >> 0) & 
0xff); /* Right */
+       }
+        return 0;
+}
+
+static int snd_p16v_volume_get_spdif_front(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 0;
+       int reg = PLAYBACK_VOLUME_MIXER7;
+        return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_get_spdif_center_lfe(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 1;
+       int reg = PLAYBACK_VOLUME_MIXER7;
+        return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
+}
+static int snd_p16v_volume_get_spdif_unknown(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 0;
+       int reg = PLAYBACK_VOLUME_MIXER8;
+        return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
+}
+static int snd_p16v_volume_get_spdif_rear(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 1;
+       int reg = PLAYBACK_VOLUME_MIXER8;
+        return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_get_analog_front(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 0;
+       int reg = PLAYBACK_VOLUME_MIXER9;
+        return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_get_analog_center_lfe(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 1;
+       int reg = PLAYBACK_VOLUME_MIXER9;
+        return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
+}
+static int snd_p16v_volume_get_analog_rear(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 1;
+       int reg = PLAYBACK_VOLUME_MIXER10;
+        return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_get_analog_unknown(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 0;
+       int reg = PLAYBACK_VOLUME_MIXER10;
+        return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_put(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol, int 
reg, int high_low)
+{
+        emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+        u32 value;
+        value = snd_emu10k1_ptr20_read(emu, reg, 0);
+        //value = value & 0xffff;
+       if (high_low == 1) {
+               value &= 0xffff;
+               value = value | ((0xff - ucontrol->value.integer.value[0]) << 
24) | ((0xff - ucontrol->value.integer.value[1]) << 16);
+       } else {
+               value &= 0xffff0000;
+               value = value | ((0xff - ucontrol->value.integer.value[0]) << 
8) | ((0xff - ucontrol->value.integer.value[1]) );
+       }
+               snd_emu10k1_ptr20_write(emu, reg, 0, value);
+        return 1;
+}
+
+static int snd_p16v_volume_put_spdif_front(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 0;
+       int reg = PLAYBACK_VOLUME_MIXER7;
+        return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_put_spdif_center_lfe(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 1;
+       int reg = PLAYBACK_VOLUME_MIXER7;
+        return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_put_spdif_unknown(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 0;
+       int reg = PLAYBACK_VOLUME_MIXER8;
+        return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_put_spdif_rear(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 1;
+       int reg = PLAYBACK_VOLUME_MIXER8;
+        return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_put_analog_front(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 0;
+       int reg = PLAYBACK_VOLUME_MIXER9;
+        return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_put_analog_center_lfe(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 1;
+       int reg = PLAYBACK_VOLUME_MIXER9;
+        return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_put_analog_rear(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 1;
+       int reg = PLAYBACK_VOLUME_MIXER10;
+        return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
+}
+
+static int snd_p16v_volume_put_analog_unknown(snd_kcontrol_t * kcontrol,
+                                       snd_ctl_elem_value_t * ucontrol)
+{
+       int high_low = 0;
+       int reg = PLAYBACK_VOLUME_MIXER10;
+        return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
+}
+
+static snd_kcontrol_new_t snd_p16v_volume_control_analog_front =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD Analog Front Volume",
+        .info =         snd_p16v_volume_info,
+        .get =          snd_p16v_volume_get_analog_front,
+        .put =          snd_p16v_volume_put_analog_front
+};
+
+static snd_kcontrol_new_t snd_p16v_volume_control_analog_center_lfe =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD Analog Center/LFE Volume",
+        .info =         snd_p16v_volume_info,
+        .get =          snd_p16v_volume_get_analog_center_lfe,
+        .put =          snd_p16v_volume_put_analog_center_lfe
+};
+
+static snd_kcontrol_new_t snd_p16v_volume_control_analog_unknown =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD Analog Unknown Volume",
+        .info =         snd_p16v_volume_info,
+        .get =          snd_p16v_volume_get_analog_unknown,
+        .put =          snd_p16v_volume_put_analog_unknown
+};
+
+static snd_kcontrol_new_t snd_p16v_volume_control_analog_rear =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD Analog Rear Volume",
+        .info =         snd_p16v_volume_info,
+        .get =          snd_p16v_volume_get_analog_rear,
+        .put =          snd_p16v_volume_put_analog_rear
+};
+
+static snd_kcontrol_new_t snd_p16v_volume_control_spdif_front =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD SPDIF Front Volume",
+        .info =         snd_p16v_volume_info,
+        .get =          snd_p16v_volume_get_spdif_front,
+        .put =          snd_p16v_volume_put_spdif_front
+};
+
+static snd_kcontrol_new_t snd_p16v_volume_control_spdif_center_lfe =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD SPDIF Center/LFE Volume",
+        .info =         snd_p16v_volume_info,
+        .get =          snd_p16v_volume_get_spdif_center_lfe,
+        .put =          snd_p16v_volume_put_spdif_center_lfe
+};
+
+static snd_kcontrol_new_t snd_p16v_volume_control_spdif_unknown =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD SPDIF Unknown Volume",
+        .info =         snd_p16v_volume_info,
+        .get =          snd_p16v_volume_get_spdif_unknown,
+        .put =          snd_p16v_volume_put_spdif_unknown
+};
+
+static snd_kcontrol_new_t snd_p16v_volume_control_spdif_rear =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "HD SPDIF Rear Volume",
+        .info =         snd_p16v_volume_info,
+        .get =          snd_p16v_volume_get_spdif_rear,
+        .put =          snd_p16v_volume_put_spdif_rear
+};
+
+int snd_p16v_mixer(emu10k1_t *emu)
+{
+        int err;
+        snd_kcontrol_t *kctl;
+        snd_card_t *card = emu->card;
+        if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_analog_front, emu)) 
== NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
+        if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_analog_rear, emu)) 
== NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
+        if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_analog_center_lfe, 
emu)) == NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
+        if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_analog_unknown, 
emu)) == NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
+        if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_spdif_front, emu)) 
== NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
+        if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_spdif_rear, emu)) == 
NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
+        if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_spdif_center_lfe, 
emu)) == NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
+        if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_spdif_unknown, emu)) 
== NULL)
+                return -ENOMEM;
+        if ((err = snd_ctl_add(card, kctl)))
+                return err;
+        return 0;
+}
+
diff -Nru a/sound/pci/emu10k1/p16v.h b/sound/pci/emu10k1/p16v.h
--- /dev/null   Wed Dec 31 16:00:00 196900
+++ b/sound/pci/emu10k1/p16v.h  2005-03-30 16:10:27 -08:00
@@ -0,0 +1,299 @@
+/*
+ *  Copyright (c) by James Courtier-Dutton <[EMAIL PROTECTED]>
+ *  Driver p16v chips
+ *  Version: 0.21
+ *
+ *  FEATURES currently supported:
+ *    Output fixed at S32_LE, 2 channel to hw:0,0
+ *    Rates: 44.1, 48, 96, 192.
+ *
+ *  Changelog:
+ *  0.8
+ *    Use separate card based buffer for periods table.
+ *  0.9
+ *    Use 2 channel output streams instead of 8 channel.
+ *       (8 channel output streams might be good for ASIO type output)
+ *    Corrected speaker output, so Front -> Front etc.
+ *  0.10
+ *    Fixed missed interrupts.
+ *  0.11
+ *    Add Sound card model number and names.
+ *    Add Analog volume controls.
+ *  0.12
+ *    Corrected playback interrupts. Now interrupt per period, instead of half 
period.
+ *  0.13
+ *    Use single trigger for multichannel.
+ *  0.14
+ *    Mic capture now works at fixed: S32_LE, 96000Hz, Stereo.
+ *  0.15
+ *    Force buffer_size / period_size == INTEGER.
+ *  0.16
+ *    Update p16v.c to work with changed alsa api.
+ *  0.17
+ *    Update p16v.c to work with changed alsa api. Removed boot_devs.
+ *  0.18
+ *    Merging with snd-emu10k1 driver.
+ *  0.19
+ *    One stereo channel at 24bit now works.
+ *  0.20
+ *    Added better register defines.
+ *  0.21
+ *    Split from p16v.c
+ *
+ *
+ *  BUGS:
+ *    Some stability problems when unloading the snd-p16v kernel module.
+ *    --
+ *
+ *  TODO:
+ *    SPDIF out.
+ *    Find out how to change capture sample rates. E.g. To record SPDIF at 
48000Hz.
+ *    Currently capture fixed at 48000Hz.
+ *
+ *    --
+ *  GENERAL INFO:
+ *    Model: SB0240
+ *    P16V Chip: CA0151-DBS
+ *    Audigy 2 Chip: CA0102-IAT
+ *    AC97 Codec: STAC 9721
+ *    ADC: Philips 1361T (Stereo 24bit)
+ *    DAC: CS4382-K (8-channel, 24bit, 192Khz)
+ *
+ *  This code was initally based on code from ALSA's emu10k1x.c which is:
+ *  Copyright (c) by Francisco Moraes <[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
+ *
+ */
+
+/********************************************************************************************************/
+/* Audigy2 P16V pointer-offset register set, accessed through the PTR2 and 
DATA2 registers                     */
+/********************************************************************************************************/
+                                                                               
                                            
+/* The sample rate of the SPDIF outputs is set by modifying a register in the 
EMU10K2 PTR register A_SPDIF_SAMPLERATE.
+ * The sample rate is also controlled by the same registers that control the 
rate of the EMU10K2 sample rate converters.
+ */
+
+/* Initally all registers from 0x00 to 0x3f have zero contents. */
+#define PLAYBACK_LIST_ADDR     0x00            /* Base DMA address of a list 
of pointers to each period/size */
+                                               /* One list entry: 4 bytes for 
DMA address, 
+                                                * 4 bytes for period_size << 
16.
+                                                * One list entry is 8 bytes 
long.
+                                                * One list entry for each 
period in the buffer.
+                                                */
+#define PLAYBACK_LIST_SIZE     0x01            /* Size of list in bytes << 16. 
E.g. 8 periods -> 0x00380000  */
+#define PLAYBACK_LIST_PTR      0x02            /* Pointer to the current 
period being played */
+#define PLAYBACK_UNKNOWN3      0x03            /* Not used */
+#define PLAYBACK_DMA_ADDR      0x04            /* Playback DMA addresss */
+#define PLAYBACK_PERIOD_SIZE   0x05            /* Playback period size. 
win2000 uses 0x04000000 */
+#define PLAYBACK_POINTER       0x06            /* Playback period pointer. 
Used with PLAYBACK_LIST_PTR to determine buffer position currently in DAC */
+#define PLAYBACK_FIFO_END_ADDRESS      0x07            /* Playback FIFO end 
address */
+#define PLAYBACK_FIFO_POINTER  0x08            /* Playback FIFO pointer and 
number of valid sound samples in cache */
+#define PLAYBACK_UNKNOWN9      0x09            /* Not used */
+#define CAPTURE_DMA_ADDR       0x10            /* Capture DMA address */
+#define CAPTURE_BUFFER_SIZE    0x11            /* Capture buffer size */
+#define CAPTURE_POINTER                0x12            /* Capture buffer 
pointer. Sample currently in ADC */
+#define CAPTURE_FIFO_POINTER   0x13            /* Capture FIFO pointer and 
number of valid sound samples in cache */
+#define CAPTURE_P16V_VOLUME1   0x14            /* Low: Capture volume 
0xXXXX3030 */
+#define CAPTURE_P16V_VOLUME2   0x15            /* High:Has no effect on 
capture volume */
+#define CAPTURE_P16V_SOURCE     0x16            /* P16V source select. Set to 
0x0700E4E5 for AC97 CAPTURE */
+                                               /* [0:1] Capture input 0 
channel select. 0 = Capture output 0.
+                                                *                              
         1 = Capture output 1.
+                                                *                              
         2 = Capture output 2.
+                                                *                              
         3 = Capture output 3.
+                                                * [3:2] Capture input 1 
channel select. 0 = Capture output 0.
+                                                *                              
         1 = Capture output 1.
+                                                *                              
         2 = Capture output 2.
+                                                *                              
         3 = Capture output 3.
+                                                * [5:4] Capture input 2 
channel select. 0 = Capture output 0.
+                                                *                              
         1 = Capture output 1.
+                                                *                              
         2 = Capture output 2.
+                                                *                              
         3 = Capture output 3.
+                                                * [7:6] Capture input 3 
channel select. 0 = Capture output 0.
+                                                *                              
         1 = Capture output 1.
+                                                *                              
         2 = Capture output 2.
+                                                *                              
         3 = Capture output 3.
+                                                * [9:8] Playback input 0 
channel select. 0 = Play output 0.
+                                                *                              
          1 = Play output 1.
+                                                *                              
          2 = Play output 2.
+                                                *                              
          3 = Play output 3.
+                                                * [11:10] Playback input 1 
channel select. 0 = Play output 0.
+                                                *                              
            1 = Play output 1.
+                                                *                              
            2 = Play output 2.
+                                                *                              
            3 = Play output 3.
+                                                * [13:12] Playback input 2 
channel select. 0 = Play output 0.
+                                                *                              
            1 = Play output 1.
+                                                *                              
            2 = Play output 2.
+                                                *                              
            3 = Play output 3.
+                                                * [15:14] Playback input 3 
channel select. 0 = Play output 0.
+                                                *                              
            1 = Play output 1.
+                                                *                              
            2 = Play output 2.
+                                                *                              
            3 = Play output 3.
+                                                * [19:16] Playback mixer 
output enable. 1 bit per channel.
+                                                * [23:20] Capture mixer output 
enable. 1 bit per channel.
+                                                * [26:24] FX engine channel 
capture 0 = 0x60-0x67.
+                                                *                              
     1 = 0x68-0x6f.
+                                                *                              
     2 = 0x70-0x77.
+                                                *                              
     3 = 0x78-0x7f.
+                                                *                              
     4 = 0x80-0x87.
+                                                *                              
     5 = 0x88-0x8f.
+                                                *                              
     6 = 0x90-0x97.
+                                                *                              
     7 = 0x98-0x9f.
+                                                * [31:27] Not used.
+                                                */
+
+                                               /* 0x1 = capture on.
+                                                * 0x100 = capture off.
+                                                * 0x200 = capture off.
+                                                * 0x1000 = capture off.
+                                                */
+#define CAPTURE_RATE_STATUS            0x17            /* Capture sample rate. 
Read only */
+                                               /* [15:0] Not used.
+                                                * [18:16] Channel 0 Detected 
sample rate. 0 - 44.1khz
+                                                *                              
 1 - 48 khz
+                                                *                              
 2 - 96 khz
+                                                *                              
 3 - 192 khz
+                                                *                              
 7 - undefined rate.
+                                                * [19] Channel 0. 1 - Valid, 0 
- Not Valid.
+                                                * [22:20] Channel 1 Detected 
sample rate. 
+                                                * [23] Channel 1. 1 - Valid, 0 
- Not Valid.
+                                                * [26:24] Channel 2 Detected 
sample rate. 
+                                                * [27] Channel 2. 1 - Valid, 0 
- Not Valid.
+                                                * [30:28] Channel 3 Detected 
sample rate. 
+                                                * [31] Channel 3. 1 - Valid, 0 
- Not Valid.
+                                                */
+/* 0x18 - 0x1f unused */
+#define PLAYBACK_LAST_SAMPLE    0x20           /* The sample currently being 
played. Read only */
+/* 0x21 - 0x3f unused */
+#define BASIC_INTERRUPT         0x40           /* Used by both playback and 
capture interrupt handler */
+                                               /* Playback (0x1<<channel_id) 
Don't touch high 16bits. */
+                                               /* Capture  
(0x100<<channel_id). not tested */
+                                               /* Start Playback [3:0] (one 
bit per channel)
+                                                * Start Capture [11:8] (one 
bit per channel)
+                                                * Record source select for 
channel 0 [18:16]
+                                                * Record source select for 
channel 1 [22:20]
+                                                * Record source select for 
channel 2 [26:24]
+                                                * Record source select for 
channel 3 [30:28]
+                                                * 0 - SPDIF channel.
+                                                * 1 - I2S channel.
+                                                * 2 - SRC48 channel.
+                                                * 3 - SRCMulti_SPDIF channel.
+                                                * 4 - SRCMulti_I2S channel.
+                                                * 5 - SPDIF channel.
+                                                * 6 - fxengine capture.
+                                                * 7 - AC97 capture.
+                                                */
+                                               /* Default 41110000.
+                                                * Writing 0xffffffff hangs the 
PC.
+                                                * Writing 0xffff0000 -> 
77770000 so it must be some sort of route.
+                                                * bit 0x1 starts DMA playback 
on channel_id 0
+                                                */
+/* 0x41,42 take values from 0 - 0xffffffff, but have no effect on playback */
+/* 0x43,0x48 do not remember settings */
+/* 0x41-45 unused */
+#define WATERMARK            0x46              /* Test bit to indicate cache 
level usage */
+                                               /* Values it can have while 
playing on channel 0. 
+                                                * 0000f000, 0000f004, 
0000f008, 0000f00c.
+                                                * Readonly.
+                                                */
+/* 0x47-0x4f unused */
+/* 0x50-0x5f Capture cache data */
+#define SRCSel                 0x60            /* SRCSel. Default 0x4. Bypass 
P16V 0x14 */
+                                               /* [0] 0 = 10K2 audio, 1 = 
SRC48 mixer output.
+                                                * [2] 0 = 10K2 audio, 1 = 
SRCMulti SPDIF mixer output.
+                                                * [4] 0 = 10K2 audio, 1 = 
SRCMulti I2S mixer output.
+                                                */
+                                               /* SRC48 converts samples rates 
44.1, 48, 96, 192 to 48 khz. */
+                                               /* SRCMulti converts 48khz 
samples rates to 44.1, 48, 96, 192 to 48. */
+                                               /* SRC48 and SRCMULTI sample 
rate select and output select. */
+                                               /* 0xffffffff -> 0xC0000015
+                                                * 0xXXXXXXX4 = Enable Front 
Left/Right
+                                                * Enable PCMs
+                                                */
+
+/* 0x61 -> 0x6c are Volume controls */
+#define PLAYBACK_VOLUME_MIXER1  0x61           /* SRC48 Low to mixer input 
volume control. */
+#define PLAYBACK_VOLUME_MIXER2  0x62           /* SRC48 High to mixer input 
volume control. */
+#define PLAYBACK_VOLUME_MIXER3  0x63           /* SRCMULTI SPDIF Low to mixer 
input volume control. */
+#define PLAYBACK_VOLUME_MIXER4  0x64           /* SRCMULTI SPDIF High to mixer 
input volume control. */
+#define PLAYBACK_VOLUME_MIXER5  0x65           /* SRCMULTI I2S Low to mixer 
input volume control. */
+#define PLAYBACK_VOLUME_MIXER6  0x66           /* SRCMULTI I2S High to mixer 
input volume control. */
+#define PLAYBACK_VOLUME_MIXER7  0x67           /* P16V Low to SRCMULTI SPDIF 
mixer input volume control. */
+#define PLAYBACK_VOLUME_MIXER8  0x68           /* P16V High to SRCMULTI SPDIF 
mixer input volume control. */
+#define PLAYBACK_VOLUME_MIXER9  0x69           /* P16V Low to SRCMULTI I2S 
mixer input volume control. */
+                                               /* 0xXXXX3030 = PCM0 Volume 
(Front).
+                                                * 0x3030XXXX = PCM1 Volume 
(Center)
+                                                */
+#define PLAYBACK_VOLUME_MIXER10  0x6a          /* P16V High to SRCMULTI I2S 
mixer input volume control. */
+                                               /* 0x3030XXXX = PCM3 Volume 
(Rear). */
+#define PLAYBACK_VOLUME_MIXER11  0x6b          /* E10K2 Low to SRC48 mixer 
input volume control. */
+#define PLAYBACK_VOLUME_MIXER12 0x6c           /* E10K2 High to SRC48 mixer 
input volume control. */
+
+#define SRC48_ENABLE            0x6d            /* SRC48 input audio enable */
+                                               /* SRC48 converts samples rates 
44.1, 48, 96, 192 to 48 khz. */
+                                               /* [23:16] The corresponding 
P16V channel to SRC48 enabled if == 1.
+                                                * [31:24] The corresponding 
E10K2 channel to SRC48 enabled.
+                                                */
+#define SRCMULTI_ENABLE         0x6e            /* SRCMulti input audio 
enable. Default 0xffffffff */
+                                               /* SRCMulti converts 48khz 
samples rates to 44.1, 48, 96, 192 to 48. */
+                                               /* [7:0] The corresponding P16V 
channel to SRCMulti_I2S enabled if == 1.
+                                                * [15:8] The corresponding 
E10K2 channel to SRCMulti I2S enabled.
+                                                * [23:16] The corresponding 
P16V channel to SRCMulti SPDIF enabled.
+                                                * [31:24] The corresponding 
E10K2 channel to SRCMulti SPDIF enabled.
+                                                */
+                                               /* Bypass P16V 0xff00ff00 
+                                                * Bitmap. 0 = Off, 1 = On.
+                                                * P16V playback outputs:
+                                                * 0xXXXXXXX1 = PCM0 Left. 
(Front)
+                                                * 0xXXXXXXX2 = PCM0 Right.
+                                                * 0xXXXXXXX4 = PCM1 Left. 
(Center/LFE)
+                                                * 0xXXXXXXX8 = PCM1 Right.
+                                                * 0xXXXXXX1X = PCM2 Left. 
(Unknown)
+                                                * 0xXXXXXX2X = PCM2 Right.
+                                                * 0xXXXXXX4X = PCM3 Left. 
(Rear)
+                                                * 0xXXXXXX8X = PCM3 Right.
+                                                */
+#define AUDIO_OUT_ENABLE        0x6f            /* Default: 000100FF */
+                                               /* [3:0] Does something, but 
not documented. Probably capture enable.
+                                                * [7:4] Playback channels 
enable. not documented.
+                                                * [16] AC97 output enable if 
== 1
+                                                * [30] 0 = SRCMulti_I2S input 
from fxengine 0x68-0x6f.
+                                                *      1 = SRCMulti_I2S input 
from SRC48 output.
+                                                * [31] 0 = SRCMulti_SPDIF 
input from fxengine 0x60-0x67.
+                                                *      1 = SRCMulti_SPDIF 
input from SRC48 output.
+                                                */
+                                               /* 0xffffffff -> C00100FF */
+                                               /* 0 -> Not playback sound, irq 
still running */
+                                               /* 0xXXXXXX10 = PCM0 Left/Right 
On. (Front)
+                                                * 0xXXXXXX20 = PCM1 Left/Right 
On. (Center/LFE)
+                                                * 0xXXXXXX40 = PCM2 Left/Right 
On. (Unknown)
+                                                * 0xXXXXXX80 = PCM3 Left/Right 
On. (Rear)
+                                                */
+#define PLAYBACK_SPDIF_SELECT     0x70          /* Default: 12030F00 */
+                                               /* 0xffffffff -> 3FF30FFF */
+                                               /* 0x00000001 pauses stream/irq 
fail. */
+                                               /* All other bits do not effect 
playback */
+#define PLAYBACK_SPDIF_SRC_SELECT 0x71          /* Default: 0000E4E4 */
+                                               /* 0xffffffff -> F33FFFFF */
+                                               /* All bits do not effect 
playback */
+#define PLAYBACK_SPDIF_USER_DATA0 0x72         /* SPDIF out user data 0 */
+#define PLAYBACK_SPDIF_USER_DATA1 0x73         /* SPDIF out user data 1 */
+/* 0x74-0x75 unknown */
+#define CAPTURE_SPDIF_CONTROL  0x76            /* SPDIF in control setting */
+#define CAPTURE_SPDIF_STATUS   0x77            /* SPDIF in status */
+#define CAPURE_SPDIF_USER_DATA0 0x78           /* SPDIF in user data 0 */
+#define CAPURE_SPDIF_USER_DATA1 0x79           /* SPDIF in user data 1 */
+#define CAPURE_SPDIF_USER_DATA2 0x7a           /* SPDIF in user data 2 */
+
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to