linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / media / video / msp3400.h

diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400.h
similarity index 74%
rename from drivers/media/video/msp3400-driver.h
rename to drivers/media/video/msp3400.h
index 4e45104..a9ac57d 100644 (file)
--- a/drivers/media/video/msp3400-driver.h
+++ b/drivers/media/video/msp3400.h
@@ -1,10 +1,8 @@
 /*
  */
 
-#ifndef MSP3400_DRIVER_H
-#define MSP3400_DRIVER_H
-
-#include <media/msp3400.h>
+#ifndef MSP3400_H
+#define MSP3400_H
 
 /* ---------------------------------------------------------------------- */
 
@@ -22,14 +20,15 @@
 #define MSP_MODE_BTSC        8
 #define MSP_MODE_EXTERN      9
 
-#define SCART_IN1     0
-#define SCART_IN2     1
-#define SCART_IN3     2
-#define SCART_IN4     3
-#define SCART_IN1_DA  4
-#define SCART_IN2_DA  5
-#define SCART_MONO    6
-#define SCART_MUTE    7
+#define SCART_MASK    0
+#define SCART_IN1     1
+#define SCART_IN2     2
+#define SCART_IN1_DA  3
+#define SCART_IN2_DA  4
+#define SCART_IN3     5
+#define SCART_IN4     6
+#define SCART_MONO    7
+#define SCART_MUTE    8
 
 #define SCART_DSP_IN  0
 #define SCART1_OUT    1
@@ -54,10 +53,8 @@ struct msp_state {
        u8 has_radio;
        u8 has_headphones;
        u8 has_ntsc_jp_d_k3;
-       u8 has_scart2;
-       u8 has_scart3;
        u8 has_scart4;
-       u8 has_scart2_out;
+       u8 has_scart23_in_scart2_out;
        u8 has_scart2_out_volume;
        u8 has_i2s_conf;
        u8 has_subwoofer;
@@ -76,7 +73,7 @@ struct msp_state {
        int i2s_mode;
        int main, second;       /* sound carrier */
        int input;
-       struct v4l2_routing routing;
+       int source;             /* see msp34xxg_set_source */
 
        /* v4l2 */
        int audmode;
@@ -85,7 +82,6 @@ struct msp_state {
        int volume, muted;
        int balance, loudness;
        int bass, treble;
-       int scan_in_progress;
 
        /* thread */
        struct task_struct   *kthread;
@@ -101,17 +97,21 @@ int msp_read_dem(struct i2c_client *client, int addr);
 int msp_read_dsp(struct i2c_client *client, int addr);
 int msp_reset(struct i2c_client *client);
 void msp_set_scart(struct i2c_client *client, int in, int out);
+void msp_set_mute(struct i2c_client *client);
 void msp_set_audio(struct i2c_client *client);
+int msp_modus(struct i2c_client *client);
 int msp_sleep(struct msp_state *state, int timeout);
 
 /* msp3400-kthreads.c */
 const char *msp_standard_std_name(int std);
-void msp_set_audmode(struct i2c_client *client);
-int msp_detect_stereo(struct i2c_client *client);
+void msp3400c_setcarrier(struct i2c_client *client, int cdo1, int cdo2);
+void msp3400c_setmode(struct i2c_client *client, int type);
+void msp3400c_setstereo(struct i2c_client *client, int mode);
+int autodetect_stereo(struct i2c_client *client);
 int msp3400c_thread(void *data);
 int msp3410d_thread(void *data);
 int msp34xxg_thread(void *data);
-void msp3400c_set_mode(struct i2c_client *client, int mode);
-void msp3400c_set_carrier(struct i2c_client *client, int cdo1, int cdo2);
+void msp34xxg_detect_stereo(struct i2c_client *client);
+void msp34xxg_set_audmode(struct i2c_client *client, int audmode);
 
-#endif /* MSP3400_DRIVER_H */
+#endif /* MSP3400_H */