Changeset 310 for GPL

Timestamp:

Mar 24, 2008, 4:45:54 AM (18 years ago)

Author:

Paul Smedley

Message:

Reinstate building of cmipci for C-Media audio cards

Location:

GPL/branches/uniaud-2.0

Files:

• alsa-kernel/pci/cmipci.c (modified) (3 diffs)
• alsa-kernel/pci/makefile.os2 (modified) (1 diff)
• lib32/ossidc.cpp (modified) (2 diffs)

GPL/branches/uniaud-2.0/alsa-kernel/pci/cmipci.c

@@ -57 +57 @@
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable switches */
 static long mpu_port[SNDRV_CARDS];
+#ifndef TARGET_OS2
 static long fm_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
 static int soft_ac3[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)]=1};
+#else
+static long fm_port[SNDRV_CARDS] = {0x388, -1,-1,-1,-1,-1,-1,-1};
+static int soft_ac3[SNDRV_CARDS] = {0,1,1,1,1,1,1,1};
+#endif
 #ifdef SUPPORT_JOYSTICK
 static int joystick_port[SNDRV_CARDS];
@@ -2406 +2411 @@
 }
 
+#ifndef TARGET_OS2
 #define DEFINE_SWITCH_ARG(sname, xreg, xmask, xmask_on, xis_byte, xac3) \
 static struct cmipci_switch_args cmipci_switch_arg_##sname = { \
@@ -2414 +2420 @@
   .ac3_sensitive = xac3, \
 }
+#else
+#define DEFINE_SWITCH_ARG(sname, xreg, xmask, xmask_on, xis_byte, xac3) \
+    static struct cmipci_switch_args cmipci_switch_arg_##sname = { \
+    xreg, \
+    xmask, \
+    xmask_on, \
+    xis_byte, \
+    xac3, \
+    }
+#endif
         
 #define DEFINE_BIT_SWITCH_ARG(sname, xreg, xmask, xis_byte, xac3) \

GPL/branches/uniaud-2.0/alsa-kernel/pci/makefile.os2

@@ -34 +34 @@
 FILE1    = pci_iomap_compat.obj ens1370.obj ens1371.obj cs4281.obj  es1938.obj
 FILE2    = es1968.obj intel8x0.obj maestro3.obj via82xx.obj 
-FILE3    = fm801.obj atiixp.obj 
-#FILE4    = als4000.obj cmipci.obj
+FILE3    = fm801.obj atiixp.obj cmipci.obj
+#FILE4    = als4000.obj 
 FILE5    = 
 FILE6    = 

GPL/branches/uniaud-2.0/lib32/ossidc.cpp

@@ -172 +172 @@
     }
 #endif
-#if 0
     if((ForceCard == CARD_NONE || ForceCard == CARD_CMEDIA) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_cmipci_init) == 0)
@@ -178 +177 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_cmipci_exit);
     }
+#if 0
     if((ForceCard == CARD_NONE || ForceCard == CARD_ALS4000) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_als4000_init) == 0)