diff options
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/tuner.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 210b75510..dd901a65f 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,5 +1,5 @@ -/* $Id: tuner.h,v 1.40 2005/07/03 00:22:14 nsh Exp $ +/* $Id: tuner.h,v 1.41 2005/07/05 17:37:35 nsh Exp $ * tuner.h - definition for different tuners @@ -154,7 +154,7 @@ #define I2C_ADDR_TDA8290 0x4b #define I2C_ADDR_TDA8275 0x61 -enum tuner_admin_state { +enum tuner_mode { T_UNINITIALIZED = 0, T_RADIO = 1 << V4L2_TUNER_RADIO, T_ANALOG_TV = 1 << V4L2_TUNER_ANALOG_TV, @@ -162,24 +162,26 @@ enum tuner_admin_state { T_STANDBY = 1 << 31 }; -struct tuner_addr { - enum tuner_admin_state state; - unsigned int type; +struct tuner_setup { unsigned short addr; + unsigned int type; + unsigned int mode_mask; }; struct tuner { /* device */ struct i2c_client i2c; - /* state + config */ - unsigned int admin_status; unsigned int type; /* chip type */ + + enum tuner_mode mode; + unsigned int mode_mask; /* Combination of allowable modes */ + unsigned int freq; /* keep track of the current settings */ + unsigned int audmode; v4l2_std_id std; - int using_v4l2; - - enum v4l2_tuner_type mode; + + int using_v4l2; /* used by MT2032 */ unsigned int xogc; @@ -189,9 +191,6 @@ struct tuner { unsigned char i2c_easy_mode[2]; unsigned char i2c_set_freq[8]; - /* used to keep track of audmode */ - unsigned int audmode; - /* function ptrs */ void (*tv_freq)(struct i2c_client *c, unsigned int freq); void (*radio_freq)(struct i2c_client *c, unsigned int freq); |