diff options
| author | Hans Verkuil <devnull@localhost> | 2006-01-08 12:18:00 +0000 |
|---|---|---|
| committer | Hans Verkuil <devnull@localhost> | 2006-01-08 12:18:00 +0000 |
| commit | 6f81a0b73f54877119c581f646a123334bc3a5f9 (patch) | |
| tree | 4ddf2d5ac9ddee357d8cefaa9945eacfc6d04e9d /linux/drivers/media/video/msp3400.h | |
| parent | 73c5fb6887d21bdbe4c5aec07f132e0010a554da (diff) | |
| download | mediapointer-dvb-s2-6f81a0b73f54877119c581f646a123334bc3a5f9.tar.gz mediapointer-dvb-s2-6f81a0b73f54877119c581f646a123334bc3a5f9.tar.bz2 | |
msp3400: use v4l2_std_id and determine chip capabilities.
- Replace old norm by the v4l2_std_id values.
- Add code to correctly detect the various capabilities of the
various msp chips. It's not yet used, that's going to be the next step.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/msp3400.h')
| -rw-r--r-- | linux/drivers/media/video/msp3400.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/linux/drivers/media/video/msp3400.h b/linux/drivers/media/video/msp3400.h index 5291ef919..44e94e52d 100644 --- a/linux/drivers/media/video/msp3400.h +++ b/linux/drivers/media/video/msp3400.h @@ -1,5 +1,5 @@ /* - * $Id: msp3400.h,v 1.5 2006/01/02 18:22:39 hverkuil Exp $ + * $Id: msp3400.h,v 1.6 2006/01/08 12:18:00 hverkuil Exp $ */ #ifndef MSP3400_H @@ -58,10 +58,21 @@ extern int stereo_threshold; struct msp_state { int rev1, rev2; - + int has_nicam; + int has_radio; + int has_headphones; + int has_ntsc_jp_d_k3; + int has_scart4; + int has_scart23_in_scart2_out; + int has_subwoofer; + int has_sound_processing; + int has_virtual_dolby_surround; + int has_dolby_pro_logic; + + int radio; int opmode; int mode; - int norm; + v4l2_std_id std; int stereo; int nicam_on; int acb; @@ -90,11 +101,6 @@ struct msp_state { int watch_stereo:1; }; -#define VIDEO_MODE_RADIO 16 /* norm magic for radio mode */ - -#define HAVE_NICAM(state) (((state->rev2 >> 8) & 0xff) != 0) -#define HAVE_RADIO(state) ((state->rev1 & 0x0f) >= 'G'-'@') - /* msp3400-driver.c */ int msp_write_dem(struct i2c_client *client, int addr, int val); int msp_write_dsp(struct i2c_client *client, int addr, int val); @@ -104,8 +110,7 @@ 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 norm); -int msp_standard(int norm); +int msp_modus(struct i2c_client *client); int msp_sleep(struct msp_state *state, int timeout); /* msp3400-kthreads.c */ |