Skip to contentSkip to conversation

PATCH 2.4.4: nm256 audio use ac97_codec (alternative)

PATCH Jeff Garzik 1 participant 1 message May 3, 2001

lore
Share & tools
lore
#0 lore raw

Attached is a patch against 2.4.4 which updates nm256_audio driver to use the newer, and maintained, ac97 codec driver.

I'm interested in feedback and testing on this patch -- it includes additional changes to the ac97_codec driver which may fix some problems with certain nm256 AC97 chipsets.

Note this patch includes changes found in the 'ac' tree, notably Marcus' update to the new PCI API.

Note this patch is labelled "alternate" because the previous patch will go out Alan if testing proves it is ok. This patch still needs a bit of work to be perfect for a select few ac97 codecs...

Signature · 3 lines
Jeff Garzik      | Game called on account of naked chick
Building 1024    |
MandrakeSoft     |
drivers/sound/Makefile +1 -1
diff -urN linux-2.4.4/drivers/sound/Makefile linux-nm-ac97/drivers/sound/Makefile
@@ -54,7 +54,7 @@
 obj-$(CONFIG_SOUND_MSNDCLAS)	+= msnd.o msnd_classic.o
 obj-$(CONFIG_SOUND_MSNDPIN)	+= msnd.o msnd_pinnacle.o
 obj-$(CONFIG_SOUND_VWSND)	+= vwsnd.o
-obj-$(CONFIG_SOUND_NM256)	+= nm256_audio.o ac97.o
+obj-$(CONFIG_SOUND_NM256)	+= nm256_audio.o ac97_codec.o
 obj-$(CONFIG_SOUND_ICH)		+= i810_audio.o ac97_codec.o
 obj-$(CONFIG_SOUND_SONICVIBES)	+= sonicvibes.o
 obj-$(CONFIG_SOUND_CMPCI)	+= cmpci.o
drivers/sound/ac97_codec.c +308 -275

902 lines not on this page · raw message

drivers/sound/nm256.h +1 -5
diff -urN linux-2.4.4/drivers/sound/nm256.h linux-nm-ac97/drivers/sound/nm256.h
@@ -1,7 +1,6 @@
 #ifndef _NM256_H_
 #define _NM256_H_
 
-#include "ac97.h"
 
 /* The revisions that we currently handle.  */
 enum nm256rev {
@@ -18,7 +17,7 @@
     /* Revision number */
     enum nm256rev rev;
 
-    struct ac97_hwint mdev;
+    struct ac97_codec ac97;
 
     /* Our audio device numbers. */
     int dev[2];
@@ -32,9 +31,6 @@
        these are the actual device numbers. */
     int dev_for_play;
     int dev_for_record;
-
-    /* The mixer device. */
-    int mixer_oss_dev;
 
     /* 
      * Can only be opened once for each operation.  These aren't set
drivers/sound/nm256_audio.c +146 -135

453 lines not on this page · raw message

include/linux/ac97_codec.h +31 -29

92 lines not on this page · raw message