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

Timestamp:

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

Author:

Paul Smedley

Message:

Reinstate building of cmipci for C-Media audio cards

File:

• GPL/branches/uniaud-2.0/alsa-kernel/pci/cmipci.c (modified) (3 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) \