Changeset 464 for GPL/trunk/alsa-kernel/pci/emu10k1

Timestamp:

Oct 8, 2009, 10:35:00 AM (16 years ago)

Author:

Paul Smedley

Message:

Update ALSA kernel to 1.0.21 level

Location:

GPL/trunk/alsa-kernel/pci/emu10k1

Files:

• emu10k1.c (modified) (1 diff)
• emu10k1x.c (modified) (2 diffs)
• emupcm.c (modified) (1 diff)
• p16v.c (modified) (1 diff)

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1.c

@@ -84 +84 @@
  */
 static struct pci_device_id snd_emu10k1_ids[] = {
-        { 0x1102, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },    /* 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 */
+        { PCI_VDEVICE(CREATIVE, 0x0002), 0 },   /* EMU10K1 */
+        { PCI_VDEVICE(CREATIVE, 0x0004), 1 },   /* Audigy */
+        { PCI_VDEVICE(CREATIVE, 0x0008), 1 },   /* Audigy 2 Value SB0400 */
         { 0, }
 };

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c

@@ -859 +859 @@
 
         pcm->info_flags = 0;
-        pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
         switch(device) {
         case 0:
@@ -1613 +1612 @@
 // PCI IDs
 static struct pci_device_id snd_emu10k1x_ids[] = {
-        { 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },    /* Dell OEM version (EMU10K1) */
+        { PCI_VDEVICE(CREATIVE, 0x0006), 0 },   /* Dell OEM version (EMU10K1) */
         { 0, }
 };

GPL/trunk/alsa-kernel/pci/emu10k1/emupcm.c

@@ -1737 +1737 @@
         .period_bytes_min =     1024,
         .period_bytes_max =     (128*1024),
-        .periods_min =          1,
+        .periods_min =          2,
         .periods_max =          1024,
         .fifo_size =            0,

GPL/trunk/alsa-kernel/pci/emu10k1/p16v.c

@@ -645 +645 @@
         int capture=1;
   
-        /* snd_printk("KERN_DEBUG snd_p16v_pcm called. device=%d\n", device); */
+        /* snd_printk(KERN_DEBUG "snd_p16v_pcm called. device=%d\n", device); */
         emu->p16v_device_offset = device;
         if (rpcm)