Changeset 455

Timestamp:

Jun 28, 2009, 11:56:27 AM (16 years ago)

Author:

Paul Smedley

Message:

Add support for CS553x audio cards (untested)

Location:

GPL/trunk

Files:

• alsa-kernel/include/sound/config.h (modified) (1 diff)
• alsa-kernel/pci/cs5530.c (added)
• alsa-kernel/pci/cs5535audio (added)
• alsa-kernel/pci/cs5535audio/cs5535audio.c (added)
• alsa-kernel/pci/cs5535audio/cs5535audio.h (added)
• alsa-kernel/pci/cs5535audio/cs5535audio_olpc.c (added)
• alsa-kernel/pci/cs5535audio/cs5535audio_olpc.err (added)
• alsa-kernel/pci/cs5535audio/cs5535audio_pcm.c (added)
• alsa-kernel/pci/cs5535audio/cs5535audio_pm.c (added)
• alsa-kernel/pci/cs5535audio/makefile.os2 (added)
• alsa-kernel/pci/makefile.os2 (modified) (3 diffs)
• drv32/makefile.os2 (modified) (1 diff)
• include/unicard.h (modified) (2 diffs)
• lib32/initcall.h (modified) (1 diff)
• lib32/ossidc.cpp (modified) (1 diff)

GPL/trunk/alsa-kernel/include/sound/config.h

@@ -63 +63 @@
 #include <linux/lockdep.h>
 #include <linux/smp_lock.h>
+#include <linux/dma-mapping.h>
 #include "compat_22.h"
 

GPL/trunk/alsa-kernel/pci/makefile.os2

@@ -17 +17 @@
 FILE2    = es1968.obj intel8x0.obj maestro3.obj via82xx.obj 
 FILE3    = fm801.obj atiixp.obj cmipci.obj als4000.obj bt87x.obj
-FILE4    = ak4531_codec.obj 
+FILE4    = ak4531_codec.obj cs5530.obj
 FILE5    = 
 FILE6    = 
@@ -62 +62 @@
     @echo BUILDING cs46xx
     @cd cs46xx
+    @wmake $(NMAKEOPTS)
+    @cd ..
+    @echo BUILDING cs5535audio
+    @cd cs5535audio
     @wmake $(NMAKEOPTS)
     @cd ..
@@ -117 +121 @@
     @wmake $(NMAKEOPTS) clean
     @cd ..
+    @echo CLEANING cs5535audio
+    @cd cs5535audio
+    @wmake $(NMAKEOPTS) clean
+    @cd ..
     @echo CLEANING emu10k1
     @cd emu10k1

GPL/trunk/drv32/makefile.os2

@@ -69 +69 @@
 FILES    = $(FILEFIRST) $(FILE0) $(FILE1) $(FILE2) $(FILE3) $(FILE4) $(FILE5) $(FILE6) $(FILE7) $(FILE8) $(FILE9) $(FILE10)
 
-LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\drivers.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib  $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\emu10k1.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib 
+LIBS     = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\drivers.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib  $(ALSA_LIB)\ca0106.lib $(ALSA_LIB)\hda.lib $(ALSA_LIB)\sequencer.lib $(ALSA_LIB)\opl3.lib $(ALSA_LIB)\mpu401.lib $(ALSA_LIB)\synth.lib $(ALSA_LIB)\cs46xx.lib $(ALSA_LIB)\cs5535audio.lib $(ALSA_LIB)\emu10k1.lib $(ALSA_LIB)\ymfpci.lib $(ALSA_LIB)\ali5451.lib $(ALSA_LIB)\trident.lib $(ALSA_LIB)\nm256.lib $(ALSA_LIB)\sb.lib $(ALSA_LIB)\core_oss.lib 
 WMAPNAME = $(OBJDIR)\$(TARGET).wmap
 # $(ALSA_LIB)\au88xx.lib 

GPL/trunk/include/unicard.h

@@ -48 +48 @@
 #define CARD_BT87X      18
 #define CARD_AZX        19
+#define CARD_VORTEX     20 // unsupported
+#define CARD_CS5535     21
 
-#define CARD_VORTEX     20 // unsupported
-
-#define CARDS_NUM       20
+#define CARDS_NUM       21
 
 #define CARD_STRING_SBLIVE      "SBLIVE"
@@ -74 +74 @@
 #define CARD_STRING_BT87X       "BT87X"
 #define CARD_STRING_AZX         "AZX"
+#define CARD_STRING_CS5535      "CS5535"
 
 #define CARD_MAX_LEN            16

GPL/trunk/lib32/initcall.h

@@ -62 +62 @@
 extern_module_init(alsa_card_cs46xx_init)
 extern_module_exit(alsa_card_cs46xx_exit)
+extern_module_init(alsa_card_cs5535audio_init)
+extern_module_exit(alsa_card_cs5535audio_exit)
 extern_module_init(alsa_card_cmipci_init)
 extern_module_exit(alsa_card_cmipci_exit)

GPL/trunk/lib32/ossidc.cpp

@@ -202 +202 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_cs46xx_exit);
     }
+    if((ForceCard == CARD_NONE || ForceCard == CARD_CS5535) &&
+       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_cs5535audio_init) == 0)
+    {
+        fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_cs5535audio_exit);
+    }
     if((ForceCard == CARD_NONE || ForceCard == CARD_ESS1938) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_es1938_init) == 0)