Changeset 111 for GPL/trunk/alsa-kernel

Timestamp:

May 24, 2007, 6:37:10 AM (18 years ago)

Author:

Brendan Oakley

Message:

Paul's improvements to Makefiles and hda support

Location:

GPL/trunk/alsa-kernel

Files:

• core/misc.c (modified) (4 diffs)
• makefile.os2 (modified) (1 diff)
• pci/emu10k1/emu10k1_main.c (modified) (1 diff)
• pci/emu10k1/tina2.h (added)
• pci/hda/patch_analog.c (modified) (2 diffs)
• pci/hda/patch_conexant.c (added)
• pci/hda/patch_via.c (added)

GPL/trunk/alsa-kernel/core/misc.c

@@ -21 +21 @@
 
 #include <sound/driver.h>
-#include <sound/firmware.h>
+#include <linux/firmware.h>
 int snd_task_name(struct task_struct *task, char *name, size_t size)
 {
@@ -541 +541 @@
 }
 
+#if 0
 void flush_workqueue(struct workqueue_struct *wq)
 {
@@ -561 +562 @@
         }
 }
+#endif 
 
 void destroy_workqueue(struct workqueue_struct *wq)
 {
+#if 0
     flush_workqueue(wq);
-#if 0
         kill_proc(wq->task_pid, SIGKILL, 1);
         if (wq->task_pid >= 0)
@@ -686 +688 @@
 }
 
-int request_firmware(const struct firmware **fw, const char *name)
+int request_firmware(const struct firmware **fw, const char *name,
+                     struct device *device)
 {
         struct firmware *firmware;

GPL/trunk/alsa-kernel/makefile.os2

@@ -60 +60 @@
     @cd drivers
     @wmake $(NMAKEOPTS) clean
-    @cd .. 
+    @cd ..
     @echo CLEANING isa
     @cd isa

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

@@ -39 +39 @@
 #include <sound/core.h>
 #include <sound/emu10k1.h>
-#include <sound/firmware.h>
+#include <linux/firmware.h>
 #include "p16v.h"
 #include "tina2.h"

GPL/trunk/alsa-kernel/pci/hda/patch_analog.c

@@ -2619 +2619 @@
         if (is_rev2(codec))
                 snd_printk(KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n");
-
+//paul
+                snd_printk(KERN_INFO "patch_analog: Vendor Id: 0x%x\n", codec->vendor_id);
+                snd_printk(KERN_INFO "patch_analog: Subsystem Id: 0x%x\n", codec->subsystem_id);
+                snd_printk(KERN_INFO "patch_analog: Revision Id: 0x%x\n", codec->revision_id);
+                snd_printk(KERN_INFO "patch_analog: Model Name: %s\n", codec->bus->modelname);
+//endpaul
         board_config = snd_hda_check_board_config(codec, AD1988_MODEL_LAST,
                                                   ad1988_models, NULL);
@@ -2638 +2643 @@
                 }
         }
-
+//paul
+        snd_printk(KERN_INFO "patch_analog: board_config: %d\n", board_config);
+        board_config = AD1988_3STACK_DIG;
+        snd_printk(KERN_INFO "patch_analog: kludged board_config: %d\n", board_config);
+//endpaul
         switch (board_config) {
         case AD1988_6STACK: