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

Timestamp:

May 20, 2007, 1:00:05 AM (18 years ago)

Author:

Brendan Oakley

Message:

More merges to beta12, and fixes. Now compiles, though link phase fails.

Location:

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

Files:

• es1968.c (modified) (2 diffs)
• maestro3.c (modified) (3 diffs)
• trident/trident_main.c (modified) (1 diff)
• trident/trident_memory.c (modified) (1 diff)
• trident/trident_synth.c (modified) (1 diff)
• ymfpci/ymfpci_main.c (modified) (1 diff)

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

@@ -97 +97 @@
 #define __SND_OSS_COMPAT__
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/mpu401.h>
@@ -1911 +1917 @@
     es->count += diff;
 
-    if (es->count > es->frag_size) {
+        while (es->count > es->frag_size) {
         spin_unlock(&chip->substream_lock);
         snd_pcm_period_elapsed(subs);

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

@@ -33 +33 @@
 
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
@@ -42 +49 @@
 MODULE_AUTHOR("Zach Brown <zab@zabbo.net>, Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("ESS Maestro3 PCI");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{ESS,Maestro3 PCI},"
@@ -2804 +2812 @@
     chip->suspend_mem = vmalloc(sizeof(u16) * (REV_B_CODE_MEMORY_LENGTH + REV_B_DATA_MEMORY_LENGTH));
     if (chip->suspend_mem == NULL)
-        snd_printk("can't allocate apm buffer\n");
+                snd_printk(KERN_WARNING "can't allocate apm buffer\n");
+        else
+                snd_card_set_pm_callback(card, m3_suspend, m3_resume, chip);
 #endif
 

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

@@ -28 +28 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
+#define __NO_VERSION__
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/trident.h>
+#include <sound/asoundef.h>
 
 static int snd_trident_pcm_mixer_build(struct snd_trident *trident, struct snd_trident_voice* voice, snd_pcm_substream_t *substream);

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

@@ -24 +24 @@
  */
 
+#define __NO_VERSION__
 #include <sound/driver.h>
+#include <asm/io.h>
 #include <linux/pci.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/trident.h>
 

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

@@ -20 +20 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
+#include <sound/core.h>
 #include <sound/trident.h>
 #include <sound/seq_device.h>

GPL/branches/alsa-resync1/alsa-kernel/pci/ymfpci/ymfpci_main.c

@@ -25 +25 @@
  */
 
+#define __NO_VERSION__
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/info.h>
 #include <sound/ymfpci.h>
+#include <sound/asoundef.h>
+#include <sound/mpu401.h>
+#ifdef TARGET_OS2
 #include <sound/timer.h>
+#endif /* TARGET_OS2 */
 
 /*