diff options
author | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2007-04-27 11:31:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-27 14:43:40 -0400 |
commit | cfeb88398f004a0e85ee011fd89a01f5d3bf3c81 (patch) | |
tree | a2df3639bc592b16cdf9a48f8fc39a465f9f9a07 /include | |
parent | b8bc76d88fa7a1e4cd679fac3adfc5afeb2b3427 (diff) |
V4L/DVB (5323): Updated support for tuner callbacks
This change supplies a more generic version of the tuner callback.
The tuner struct now has a function pointer
int (*tuner_callback) (void *dev, int command, int arg)
additionally to a int config parameter.
both can be set through the TUNER_SET_TYPE_ADDR client call.
Note that the meaning of the parameters depend on the tuner type.
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/media/tuner.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h index fe567129b22b..a41ac41113ac 100644 --- a/include/media/tuner.h +++ b/include/media/tuner.h | |||
@@ -173,15 +173,12 @@ enum tuner_mode { | |||
173 | when the tuner is set to TV mode. | 173 | when the tuner is set to TV mode. |
174 | */ | 174 | */ |
175 | 175 | ||
176 | /* allows to access the GPIOs of the host (pci bridge) */ | ||
177 | typedef void (*tuner_gpio_func_t) (void *dev, int bit_no,int value); | ||
178 | |||
179 | struct tuner_setup { | 176 | struct tuner_setup { |
180 | unsigned short addr; /* I2C address */ | 177 | unsigned short addr; /* I2C address */ |
181 | unsigned int type; /* Tuner type */ | 178 | unsigned int type; /* Tuner type */ |
182 | unsigned int mode_mask; /* Allowed tuner modes */ | 179 | unsigned int mode_mask; /* Allowed tuner modes */ |
183 | unsigned int config; /* configuraion for more complex tuners */ | 180 | unsigned int config; /* configuraion for more complex tuners */ |
184 | tuner_gpio_func_t gpio_func; | 181 | int (*tuner_callback) (void *dev, int command,int arg); |
185 | }; | 182 | }; |
186 | 183 | ||
187 | struct tuner { | 184 | struct tuner { |
@@ -215,8 +212,9 @@ struct tuner { | |||
215 | unsigned char tda827x_addr; | 212 | unsigned char tda827x_addr; |
216 | unsigned char tda827x_ver; | 213 | unsigned char tda827x_ver; |
217 | unsigned int sgIF; | 214 | unsigned int sgIF; |
215 | |||
218 | unsigned int config; | 216 | unsigned int config; |
219 | tuner_gpio_func_t gpio_func; | 217 | int (*tuner_callback) (void *dev, int command,int arg); |
220 | 218 | ||
221 | /* function ptrs */ | 219 | /* function ptrs */ |
222 | void (*set_tv_freq)(struct i2c_client *c, unsigned int freq); | 220 | void (*set_tv_freq)(struct i2c_client *c, unsigned int freq); |