Changeset 598 for GPL/trunk/alsa-kernel/include/sound/initval.h

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/initval.h (modified) (8 diffs)

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

@@ -22 +22 @@
  */
 
-#ifdef TARGET_OS2
 #ifndef MODULE_GENERIC_STRING
 #ifdef MODULE
@@ -33 +32 @@
 #endif
 
-#define MODULE_CLASSES(val)
-#define MODULE_DEVICES(val)
-#define MODULE_PARM_SYNTAX(id, val)
+#ifdef TARGET_OS2
+#define MODULE_CLASSES(val) 
+#define MODULE_DEVICES(val) 
+#define MODULE_PARM_SYNTAX(id, val) 
 #define module_param_array(name, type, nump, perm)
 #define module_param(name, type, perm)
@@ -52 +52 @@
 #define module_param(name, type, perm) \
         MODULE_PARM(name, SNDRV_MODULE_TYPE_##type)
+
 #endif
 
-#ifndef TARGET_OS2
-#define SNDRV_AUTO_PORT         1
-#else
 #define SNDRV_AUTO_PORT         0xffff
-#endif
 #define SNDRV_AUTO_IRQ          0xffff
 #define SNDRV_AUTO_DMA          0xffff
@@ -78 +75 @@
 #define SNDRV_DEFAULT_ENABLE    { 1,1,1,1,1,1,1,1 }
 #define SNDRV_DEFAULT_ENABLE_PNP        SNDRV_DEFAULT_ENABLE
-#ifdef CONFIG_PNP
-#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
-#else
-#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
-#endif
 #define SNDRV_DEFAULT_PORT      { REPEAT_SNDRV(-1) }
 #define SNDRV_DEFAULT_IRQ       { REPEAT_SNDRV(SNDRV_AUTO_IRQ) }
@@ -91 +83 @@
 #define SNDDRV_DEFAULT_PCM_SUBSTREAMS {REPEAT_SNDRV(8)};
 #define SNDDRV_DEFAULT_MIDI_DEVS      {REPEAT_SNDRV(4)};
+#else
+#define SNDRV_DEFAULT_IDX       { [0 ... (SNDRV_CARDS-1)] = -1 }
+#define SNDRV_DEFAULT_STR       { [0 ... (SNDRV_CARDS-1)] = NULL }
+#define SNDRV_DEFAULT_ENABLE    { 1, [1 ... (SNDRV_CARDS-1)] = 0 }
+#define SNDRV_DEFAULT_ENABLE_PNP { [0 ... (SNDRV_CARDS-1)] = 1 }
+#define SNDRV_DEFAULT_PORT      { SNDRV_AUTO_PORT, [1 ... (SNDRV_CARDS-1)] = -1 }
+#define SNDRV_DEFAULT_IRQ       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_IRQ }
+#define SNDRV_DEFAULT_DMA       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA }
+#define SNDRV_DEFAULT_DMA_SIZE  { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE }
+#define SNDRV_DEFAULT_PTR       SNDRV_DEFAULT_STR
+#endif
+
+#ifdef CONFIG_PNP
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
+#else
+#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
+#endif
 
 #define SNDRV_BOOLEAN_TRUE_DESC "allows:{{0,Disabled},{1,Enabled}},default:1,dialog:check"
@@ -110 +119 @@
 #define SNDRV_PORT12_DESC       SNDRV_ENABLED ",allows:{{0,0x3fff}},base:16"
 #define SNDRV_PORT_DESC         SNDRV_ENABLED ",allows:{{0,0xffff}},base:16"
-#else
-#define SNDRV_DEFAULT_IDX       { [0 ... (SNDRV_CARDS-1)] = -1 }
-#define SNDRV_DEFAULT_STR       { [0 ... (SNDRV_CARDS-1)] = NULL }
-#define SNDRV_DEFAULT_ENABLE    { 1, [1 ... (SNDRV_CARDS-1)] = 0 }
-#define SNDRV_DEFAULT_ENABLE_PNP { [0 ... (SNDRV_CARDS-1)] = 1 }
-#ifdef CONFIG_PNP
-#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE_PNP
-#else
-#define SNDRV_DEFAULT_ENABLE_ISAPNP SNDRV_DEFAULT_ENABLE
-#endif
-#define SNDRV_DEFAULT_PORT      { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_PORT }
-#define SNDRV_DEFAULT_IRQ       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_IRQ }
-#define SNDRV_DEFAULT_DMA       { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA }
-#define SNDRV_DEFAULT_DMA_SIZE  { [0 ... (SNDRV_CARDS-1)] = SNDRV_AUTO_DMA_SIZE }
-#define SNDRV_DEFAULT_PTR       SNDRV_DEFAULT_STR
-#endif
 
 #ifdef SNDRV_LEGACY_FIND_FREE_IRQ
@@ -164 +157 @@
 #endif
 
-#ifdef TARGET_OS2
 #if defined(SNDRV_GET_ID) && !defined(MODULE)
 #include <linux/ctype.h>
@@ -190 +182 @@
 }
 #endif
-#endif
 
-#endif /* __SOUND_INITVAL_H */
-
+#endif                          /* __INITVAL_H */