Changeset 256 for GPL/branches/alsa-resync1/alsa-kernel/pci

Timestamp:

Oct 14, 2007, 6:23:32 AM (18 years ago)

Author:

Brendan Oakley

Message:

Re-merged to 0.9.5 a load of stuff that was previously missed

Location:

GPL/branches/alsa-resync1/alsa-kernel/pci

Files:

• ac97/diff.cmd (deleted)
• ac97/diff1.cmd (deleted)
• au88x0/Makefile (deleted)
• cs46xx/dsp_spos_scb_lib.c (modified) (2 diffs)
• cs46xx/imgs/CVS (deleted)
• emu10k1/emu10k1.c (modified) (1 diff)
• fm801.c (modified) (2 diffs)
• ice1712/hoontech.c (modified) (1 diff)
• ice1712/hoontech.h (modified) (1 diff)
• intel8x0.c (modified) (1 diff)
• rme9652/hdsp.c (modified) (3 diffs)
• trident/trident_main.c (modified) (2 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/cs46xx/dsp_spos_scb_lib.c

@@ -792 +792 @@
                 {
                         /* E */ 0x8000,0x8000,
-                        /* F */ 0xffff,0xffff
+                        /* F */ 0x8000,0x8000
                 }
         };
@@ -1358 +1358 @@
                 }
 
-                if (pcm_channel_id != DSP_IEC958_CHANNEL ||
-                    !(ins->spdif_status_out & DSP_SPDIF_STATUS_AC3_MODE))
-                        cs46xx_dsp_set_src_sample_rate(chip,src_scb,sample_rate);
+                /* cs46xx_dsp_set_src_sample_rate(chip,src_scb,sample_rate); */
 
                 ins->nsrc_scb ++;

GPL/branches/alsa-resync1/alsa-kernel/pci/emu10k1/emu10k1.c

@@ -101 +101 @@
 static struct pci_device_id snd_emu10k1_ids[] = {
     { 0x1102, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },        /* EMU10K1 */
+        { 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },    /* Dell OEM version (EMU10K1) */
     { 0x1102, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },        /* Audigy */
     { 0x1102, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },    /* Audigy 2 Value SB0400 */

GPL/branches/alsa-resync1/alsa-kernel/pci/fm801.c

@@ -565 +565 @@
                                  SNDRV_PCM_INFO_PAUSE |
                                  SNDRV_PCM_INFO_MMAP_VALID),
-        /*.formats =           */ SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-        /*.rates =             */ SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
-        /*.rate_min =          */ 5500,
-        /*.rate_max =          */ 48000,
-        /*.channels_min =      */       1,
-        /*.channels_max =      */       2,
-        /*.buffer_bytes_max =  */ (128*1024),
-        /*.period_bytes_min =  */ 64,
-        /*.period_bytes_max =  */ (128*1024),
-        /*.periods_min =       */       1,
-        /*.periods_max =       */       1024,
-        /*.fifo_size =         */ 0,
+        .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
+        .rate_min =             5500,
+        .rate_max =             48000,
+        .channels_min =         1,
+        .channels_max =         2,
+        .buffer_bytes_max =     (128*1024),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (128*1024),
+        .periods_min =          1,
+        .periods_max =          1024,
+        .fifo_size =            0,
 };
 
@@ -585 +585 @@
                                  SNDRV_PCM_INFO_PAUSE |
                                  SNDRV_PCM_INFO_MMAP_VALID),
-        /*.formats =           */ SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-        /*.rates =             */ SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
-        /*.rate_min =          */ 5500,
-        /*.rate_max =          */ 48000,
-        /*.channels_min =      */       1,
-        /*.channels_max =      */       2,
-        /*.buffer_bytes_max =  */ (128*1024),
-        /*.period_bytes_min =  */ 64,
-        /*.period_bytes_max =  */ (128*1024),
-        /*.periods_min =       */       1,
-        /*.periods_max =       */       1024,
-        /*.fifo_size =         */ 0,
+        .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_KNOT | SNDRV_PCM_RATE_8000_48000,
+        .rate_min =             5500,
+        .rate_max =             48000,
+        .channels_min =         1,
+        .channels_max =         2,
+        .buffer_bytes_max =     (128*1024),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (128*1024),
+        .periods_min =          1,
+        .periods_max =          1024,
+        .fifo_size =            0,
 };
 

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/hoontech.c

@@ -219 +219 @@
                 snd_ice1712_hoontech_init,
         },
+        {
+                ICE1712_SUBDEVICE_STDSP24_MEDIA7_1,
+                "Hoontech STA DSP24 Media 7.1",
+                snd_ice1712_hoontech_init,
+        },
         { } /* terminator */
 };

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/hoontech.h

@@ -25 +25 @@
  */      
 
-#define  HOONTECH_DEVICE_DESC          "{Hoontech SoundTrack DSP 24},"
+#define  HOONTECH_DEVICE_DESC \
+        "{Hoontech SoundTrack DSP 24}," \
+        "{Hoontech SoundTrack DSP 24 Value}," \
+        "{Hoontech SoundTrack DSP 24 Media 7.1}," \
 
-#define ICE1712_SUBDEVICE_STDSP24       0x12141217      /* Hoontech SoundTrack Audio DSP 24 */
+#define ICE1712_SUBDEVICE_STDSP24               0x12141217      /* Hoontech SoundTrack Audio DSP 24 */
+#define ICE1712_SUBDEVICE_STDSP24_MEDIA7_1      0x16141217      /* Hoontech ST Audio DSP24 Media 7.1 */
 
 extern struct snd_ice1712_card_info snd_ice1712_hoontech_cards[];

GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c

@@ -1160 +1160 @@
     struct intel8x0 *chip = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime = substream->runtime;
+        static unsigned int i, rates[] = {
+                /* ATTENTION: these values depend on the definition in pcm.h! */
+                5512, 8000, 11025, 16000, 22050, 32000, 44100, 480000
+        };
     int err;
 

GPL/branches/alsa-resync1/alsa-kernel/pci/rme9652/hdsp.c

@@ -26 +26 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
@@ -3231 +3232 @@
         channel_buf = hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);
         snd_assert(channel_buf != NULL, return -EIO);
-        copy_from_user(channel_buf + pos * 4, src, count * 4);
+        if (copy_from_user(channel_buf + pos * 4, src, count * 4))
+                return -EFAULT;
         return count;
 }
@@ -3245 +3247 @@
         channel_buf = hdsp_channel_buffer_location (hdsp, substream->pstr->stream, channel);
         snd_assert(channel_buf != NULL, return -EIO);
-        copy_to_user(dst, channel_buf + pos * 4, count * 4);
+        if (copy_to_user(dst, channel_buf + pos * 4, count * 4))
+                return -EFAULT;
         return count;
 }

GPL/branches/alsa-resync1/alsa-kernel/pci/trident/trident_main.c

@@ -1779 +1779 @@
 };
 
-
 static snd_pcm_hardware_t snd_trident_spdif_7018 =
 {
-    /*  .info =              */   (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                                   SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                   SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START |
-                                   SNDRV_PCM_INFO_PAUSE /* | SNDRV_PCM_INFO_RESUME */),
-                                   /*   .formats =           */   SNDRV_PCM_FMTBIT_S16_LE,
-                                   /*   .rates =             */   SNDRV_PCM_RATE_48000,
-                                   /*   .rate_min =          */   48000,
-                                   /*   .rate_max =          */   48000,
-                                   /*   .channels_min =      */   2,
-                                   /*   .channels_max =      */   2,
-                                   /*   .buffer_bytes_max =  */   (128*1024),
-                                   /*   .period_bytes_min =  */   64,
-                                   /*   .period_bytes_max =  */   (128*1024),
-                                   /*   .periods_min =       */   1,
-                                   /*   .periods_max =       */   1024,
-                                   /*   .fifo_size =         */   0,
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_SYNC_START |
+                                 SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME),
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_48000,
+        .rate_min =             48000,
+        .rate_max =             48000,
+        .channels_min =         2,
+        .channels_max =         2,
+        .buffer_bytes_max =     (128*1024),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (128*1024),
+        .periods_min =          1,
+        .periods_max =          1024,
+        .fifo_size =            0,
 };
+
 static void snd_trident_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
@@ -2885 +2885 @@
         .name =         "PCM Chorus Playback Volume",
         .access =       SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+        .count =        32,
         .info =         snd_trident_pcm_cvol_control_info,
         .get =          snd_trident_pcm_cvol_control_get,