diff options
author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2009-03-11 02:00:47 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:25 -0400 |
commit | f1add5b5ec2a6efaa0f5648d0dc2c56d83a3ecf8 (patch) | |
tree | 2d44c29f61576e3b6ac88219a726415d9edd3a3b /drivers/media/video/au0828/au0828.h | |
parent | 4ff5ed44f84aed6727ec226853a1c6b03c36db5e (diff) |
V4L/DVB (11070): au0828: Rework the way the analog video binding occurs
Rework the way boards are managed so that we can change the board description
based on the Hauppauge eeprom (modeled after cx88-cards.c).
Also, make sure that we don't load the analog stack if there are no analog
inputs defined in the board profile.
Thanks to Michael Krufky <mkrufky@linuxtv.org> for providing information on
the various ways different Hauppauge boards can be configured.
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/au0828/au0828.h')
-rw-r--r-- | drivers/media/video/au0828/au0828.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h index 3b8e3e913475..2f48ec2136bf 100644 --- a/drivers/media/video/au0828/au0828.h +++ b/drivers/media/video/au0828/au0828.h | |||
@@ -83,6 +83,8 @@ struct au0828_input { | |||
83 | 83 | ||
84 | struct au0828_board { | 84 | struct au0828_board { |
85 | char *name; | 85 | char *name; |
86 | unsigned int tuner_type; | ||
87 | unsigned char tuner_addr; | ||
86 | struct au0828_input input[AU0828_MAX_INPUT]; | 88 | struct au0828_input input[AU0828_MAX_INPUT]; |
87 | 89 | ||
88 | }; | 90 | }; |
@@ -105,7 +107,7 @@ enum au0828_stream_state { | |||
105 | STREAM_ON | 107 | STREAM_ON |
106 | }; | 108 | }; |
107 | 109 | ||
108 | #define AUVI_INPUT(nr) (&au0828_boards[dev->board].input[nr]) | 110 | #define AUVI_INPUT(nr) (dev->board.input[nr]) |
109 | 111 | ||
110 | /* device state */ | 112 | /* device state */ |
111 | enum au0828_dev_state { | 113 | enum au0828_dev_state { |
@@ -179,7 +181,8 @@ struct au0828_dmaqueue { | |||
179 | struct au0828_dev { | 181 | struct au0828_dev { |
180 | struct mutex mutex; | 182 | struct mutex mutex; |
181 | struct usb_device *usbdev; | 183 | struct usb_device *usbdev; |
182 | int board; | 184 | int boardnr; |
185 | struct au0828_board board; | ||
183 | u8 ctrlmsg[64]; | 186 | u8 ctrlmsg[64]; |
184 | 187 | ||
185 | /* I2C */ | 188 | /* I2C */ |