Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[~andy/linux] / include / media / msp3400.h

diff --git a/include/media/msp3400.h b/include/media/msp3400.h
index 0be61a021d45c9bf967f95c384903a374dbb3fdb..90cf22ada8b4a4a0d2f33b13968883ad365290c6 100644 (file)
--- a/include/media/msp3400.h
+++ b/include/media/msp3400.h
@@ -54,13 +54,13 @@
    =======
 
    So to specify a complete routing scheme for the msp3400 you will have to
    =======
 
    So to specify a complete routing scheme for the msp3400 you will have to

-   specify in the 'input' field of the v4l2_routing struct:
+   specify in the 'input' arg of the s_routing function:

 
    1) which tuner input to use
    2) which SCART input to use
    3) which DSP input to use for each DSP output
 
 
    1) which tuner input to use
    2) which SCART input to use
    3) which DSP input to use for each DSP output
 

-   And in the 'output' field of the v4l2_routing struct you specify:
+   And in the 'output' arg of the s_routing function you specify:

 
    1) which SCART input to use for each SCART output
 
 
    1) which SCART input to use for each SCART output
 


@@ -80,16 +80,16 @@
  */
 
 /* SCART input to DSP selection */
  */
 
 /* SCART input to DSP selection */

-#define MSP_IN_SCART_1         0  /* Pin SC1_IN */
-#define MSP_IN_SCART_2         1  /* Pin SC2_IN */
-#define MSP_IN_SCART_3         2  /* Pin SC3_IN */
-#define MSP_IN_SCART_4         3  /* Pin SC4_IN */
+#define MSP_IN_SCART1                  0  /* Pin SC1_IN */
+#define MSP_IN_SCART2                  1  /* Pin SC2_IN */
+#define MSP_IN_SCART3                  2  /* Pin SC3_IN */
+#define MSP_IN_SCART4                  3  /* Pin SC4_IN */

 #define MSP_IN_MONO            6  /* Pin MONO_IN */
 #define MSP_IN_MUTE            7  /* Mute DSP input */
 #define MSP_SCART_TO_DSP(in)   (in)
 /* Tuner input to demodulator and DSP selection */
 #define MSP_IN_MONO            6  /* Pin MONO_IN */
 #define MSP_IN_MUTE            7  /* Mute DSP input */
 #define MSP_SCART_TO_DSP(in)   (in)
 /* Tuner input to demodulator and DSP selection */

-#define MSP_IN_TUNER_1                 0  /* Analog Sound IF input pin ANA_IN1 */
-#define MSP_IN_TUNER_2         1  /* Analog Sound IF input pin ANA_IN2 */
+#define MSP_IN_TUNER1          0  /* Analog Sound IF input pin ANA_IN1 */
+#define MSP_IN_TUNER2          1  /* Analog Sound IF input pin ANA_IN2 */

 #define MSP_TUNER_TO_DSP(in)   ((in) << 3)
 
 /* The msp has up to 5 DSP outputs, each output can independently select
 #define MSP_TUNER_TO_DSP(in)   ((in) << 3)
 
 /* The msp has up to 5 DSP outputs, each output can independently select


@@ -109,14 +109,14 @@
    DSP. This is currently not implemented. Also not implemented is the
    multi-channel capable I2S3 input of the 44x0G. If someone can demonstrate
    a need for one of those features then additional support can be added. */
    DSP. This is currently not implemented. Also not implemented is the
    multi-channel capable I2S3 input of the 44x0G. If someone can demonstrate
    a need for one of those features then additional support can be added. */

-#define MSP_DSP_OUT_TUNER      0  /* Tuner output */
-#define MSP_DSP_OUT_SCART      2  /* SCART output */
-#define MSP_DSP_OUT_I2S1       5  /* I2S1 output */
-#define MSP_DSP_OUT_I2S2       6  /* I2S2 output */
-#define MSP_DSP_OUT_I2S3       7  /* I2S3 output */
-#define MSP_DSP_OUT_MAIN_AVC   11 /* MAIN AVC processed output */
-#define MSP_DSP_OUT_MAIN       12 /* MAIN output */
-#define MSP_DSP_OUT_AUX        13 /* AUX output */
+#define MSP_DSP_IN_TUNER       0  /* Tuner DSP input */
+#define MSP_DSP_IN_SCART       2  /* SCART DSP input */
+#define MSP_DSP_IN_I2S1        5  /* I2S1 DSP input */
+#define MSP_DSP_IN_I2S2        6  /* I2S2 DSP input */
+#define MSP_DSP_IN_I2S3        7  /* I2S3 DSP input */
+#define MSP_DSP_IN_MAIN_AVC    11 /* MAIN AVC processed DSP input */
+#define MSP_DSP_IN_MAIN        12 /* MAIN DSP input */
+#define MSP_DSP_IN_AUX                 13 /* AUX DSP input */

 #define MSP_DSP_TO_MAIN(in)    ((in) << 4)
 #define MSP_DSP_TO_AUX(in)     ((in) << 8)
 #define MSP_DSP_TO_SCART1(in)  ((in) << 12)
 #define MSP_DSP_TO_MAIN(in)    ((in) << 4)
 #define MSP_DSP_TO_AUX(in)     ((in) << 8)
 #define MSP_DSP_TO_SCART1(in)  ((in) << 12)


@@ -125,16 +125,16 @@
 
 /* Output SCART select: the SCART outputs can select which input
    to use. */
 
 /* Output SCART select: the SCART outputs can select which input
    to use. */

-#define MSP_OUT_SCART1                 0  /* SCART1 input, bypassing the DSP */
-#define MSP_OUT_SCART2                 1  /* SCART2 input, bypassing the DSP */
-#define MSP_OUT_SCART3                 2  /* SCART3 input, bypassing the DSP */
-#define MSP_OUT_SCART4                 3  /* SCART4 input, bypassing the DSP */
-#define MSP_OUT_SCART1_DA      4  /* DSP SCART1 output */
-#define MSP_OUT_SCART2_DA      5  /* DSP SCART2 output */
-#define MSP_OUT_MONO           6  /* MONO input, bypassing the DSP */
-#define MSP_OUT_MUTE           7  /* MUTE output */
-#define MSP_OUT_TO_SCART1(in)          (in)
-#define MSP_OUT_TO_SCART2(in)          ((in) << 4)
+#define MSP_SC_IN_SCART1       0  /* SCART1 input, bypassing the DSP */
+#define MSP_SC_IN_SCART2       1  /* SCART2 input, bypassing the DSP */
+#define MSP_SC_IN_SCART3       2  /* SCART3 input, bypassing the DSP */
+#define MSP_SC_IN_SCART4       3  /* SCART4 input, bypassing the DSP */
+#define MSP_SC_IN_DSP_SCART1   4  /* DSP SCART1 input */
+#define MSP_SC_IN_DSP_SCART2   5  /* DSP SCART2 input */
+#define MSP_SC_IN_MONO                 6  /* MONO input, bypassing the DSP */
+#define MSP_SC_IN_MUTE                 7  /* MUTE output */
+#define MSP_SC_TO_SCART1(in)   (in)
+#define MSP_SC_TO_SCART2(in)   ((in) << 4)

 
 /* Shortcut macros */
 #define MSP_INPUT(sc, t, main_aux_src, sc_i2s_src) \
 
 /* Shortcut macros */
 #define MSP_INPUT(sc, t, main_aux_src, sc_i2s_src) \


@@ -145,14 +145,14 @@
         MSP_DSP_TO_SCART1(sc_i2s_src) | \
         MSP_DSP_TO_SCART2(sc_i2s_src) | \
         MSP_DSP_TO_I2S(sc_i2s_src))
         MSP_DSP_TO_SCART1(sc_i2s_src) | \
         MSP_DSP_TO_SCART2(sc_i2s_src) | \
         MSP_DSP_TO_I2S(sc_i2s_src))

-#define MSP_INPUT_DEFAULT MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1, \
-                                   MSP_DSP_OUT_TUNER, MSP_DSP_OUT_TUNER)
+#define MSP_INPUT_DEFAULT MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1, \
+                                   MSP_DSP_IN_TUNER, MSP_DSP_IN_TUNER)

 #define MSP_OUTPUT(sc) \
 #define MSP_OUTPUT(sc) \

-       (MSP_OUT_TO_SCART1(sc) | \
-        MSP_OUT_TO_SCART2(sc))
+       (MSP_SC_TO_SCART1(sc) | \
+        MSP_SC_TO_SCART2(sc))

 /* This equals the RESET position of the msp3400 ACB register */
 /* This equals the RESET position of the msp3400 ACB register */

-#define MSP_OUTPUT_DEFAULT (MSP_OUT_TO_SCART1(MSP_OUT_SCART3) | \
-                           MSP_OUT_TO_SCART2(MSP_OUT_SCART1_DA))
+#define MSP_OUTPUT_DEFAULT (MSP_SC_TO_SCART1(MSP_SC_IN_SCART3) | \
+                           MSP_SC_TO_SCART2(MSP_SC_IN_DSP_SCART1))

 
 /* Tuner inputs vs. msp version */
 /* Chip      TUNER_1   TUNER_2
 
 /* Tuner inputs vs. msp version */
 /* Chip      TUNER_1   TUNER_2