summaryrefslogtreecommitdiff
path: root/drivers/media/video/em28xx/em28xx.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-17 21:40:45 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:09:41 -0300
commit102a0b0879a01a413ed5f667f7db9c2085ca8474 (patch)
treedf057cd2bd569bd9fdeb586927f635d67f2ce6a6 /drivers/media/video/em28xx/em28xx.h
parent3421b7787a2cf41ac5edce9b5766bddd1e1d9986 (diff)
V4L/DVB (7604): em28xx-dvb: Fix analog mode
The analog entries are wrong. Fix it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx.h')
-rw-r--r--drivers/media/video/em28xx/em28xx.h22
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index e5fd2dc77355..91dce95cd19c 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -225,19 +225,10 @@ enum em28xx_decoder {
EM28XX_SAA7114
};
-#define MAX_GPIO 2
-struct gpio_ctl {
- /* Register to be set */
- unsigned char reg;
- /* Initial/final value */
+struct em28xx_reg_seq {
+ int reg;
unsigned char val;
- /* reset value - if set, it will do:
- val1 - val2 - val1
- */
- unsigned char rst;
- /* Sleep times
- */
- unsigned int t1, t2, t3;
+ int sleep;
};
struct em28xx_board {
@@ -255,9 +246,6 @@ struct em28xx_board {
unsigned int max_range_640_480:1;
unsigned int has_dvb:1;
- struct gpio_ctl analog_gpio[MAX_GPIO];
- struct gpio_ctl digital_gpio[MAX_GPIO];
-
enum em28xx_decoder decoder;
struct em28xx_input input[MAX_EM28XX_INPUT];
@@ -343,8 +331,8 @@ struct em28xx {
unsigned int max_range_640_480:1;
unsigned int has_dvb:1;
- struct gpio_ctl *analog_gpio;
- struct gpio_ctl *digital_gpio;
+ /* GPIO sequences for tuner callback */
+ struct em28xx_reg_seq *analog_gpio, *digital_gpio;
int video_inputs; /* number of video inputs */
struct list_head devlist;