diff options
author | Scott Alfter <salfter@ssai.us> | 2007-04-02 13:22:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-27 14:45:25 -0400 |
commit | 1ebba670edac28d4ea37579453417ced71fd9128 (patch) | |
tree | 5d81e9d3798008081a19722df1ed07172ded9fda | |
parent | 4b9d4e7dba102c8ab5ef651e538e9d0c79c80cab (diff) |
V4L/DVB (5497): Additional card support for bttv driver
SSAI (www.ssai.us) makes several Bt878-based capture cards that get used in our
surveillance, conferencing, and medical imaging systems. The attached
relatively small patch adds support for these cards, which fall into two broad
* boards with one or more Bt878s, one or more composite inputs, and no S-video
or tuner inputs
* boards with one Bt878, one composite input, one S-video input, and no tuner
input
Signed-off-by: Scott Alfter <salfter@ssai.us>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | Documentation/video4linux/CARDLIST.bttv | 2 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 25 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 2 |
3 files changed, 29 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv index fc2fe9bc6713..b60639130a51 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv | |||
@@ -143,3 +143,5 @@ | |||
143 | 142 -> Sabrent TV-FM (bttv version) | 143 | 142 -> Sabrent TV-FM (bttv version) |
144 | 143 -> Hauppauge ImpactVCB (bt878) [0070:13eb] | 144 | 143 -> Hauppauge ImpactVCB (bt878) [0070:13eb] |
145 | 144 -> MagicTV | 145 | 144 -> MagicTV |
146 | 145 -> SSAI Security Video Interface [4149:5353] | ||
147 | 146 -> SSAI Ultrasound Video Interface [414a:5353] | ||
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 1ee0fe39237b..6b31e50fb951 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -291,6 +291,9 @@ static struct CARD { | |||
291 | 291 | ||
292 | { 0x15409511, BTTV_BOARD_ACORP_Y878F, "Acorp Y878F" }, | 292 | { 0x15409511, BTTV_BOARD_ACORP_Y878F, "Acorp Y878F" }, |
293 | 293 | ||
294 | { 0x53534149, BTTV_BOARD_SSAI_SECURITY, "SSAI Security Video Interface" }, | ||
295 | { 0x5353414a, BTTV_BOARD_SSAI_ULTRASOUND, "SSAI Ultrasound Video Interface" }, | ||
296 | |||
294 | /* likely broken, vendor id doesn't match the other magic views ... | 297 | /* likely broken, vendor id doesn't match the other magic views ... |
295 | * { 0xa0fca04f, BTTV_BOARD_MAGICTVIEW063, "Guillemot Maxi TV Video 3" }, */ | 298 | * { 0xa0fca04f, BTTV_BOARD_MAGICTVIEW063, "Guillemot Maxi TV Video 3" }, */ |
296 | 299 | ||
@@ -2907,6 +2910,28 @@ struct tvcard bttv_tvcards[] = { | |||
2907 | .has_radio = 1, | 2910 | .has_radio = 1, |
2908 | .has_remote = 1, | 2911 | .has_remote = 1, |
2909 | }, | 2912 | }, |
2913 | [BTTV_BOARD_SSAI_SECURITY] = { | ||
2914 | .name = "SSAI Security Video Interface", | ||
2915 | .video_inputs = 4, | ||
2916 | .audio_inputs = 0, | ||
2917 | .tuner = -1, | ||
2918 | .svhs = -1, | ||
2919 | .muxsel = { 0, 1, 2, 3 }, | ||
2920 | .tuner_type = -1, | ||
2921 | .tuner_addr = ADDR_UNSET, | ||
2922 | .radio_addr = ADDR_UNSET, | ||
2923 | }, | ||
2924 | [BTTV_BOARD_SSAI_ULTRASOUND] = { | ||
2925 | .name = "SSAI Ultrasound Video Interface", | ||
2926 | .video_inputs = 2, | ||
2927 | .audio_inputs = 0, | ||
2928 | .tuner = -1, | ||
2929 | .svhs = 1, | ||
2930 | .muxsel = { 2, 0, 1, 3 }, | ||
2931 | .tuner_type = -1, | ||
2932 | .tuner_addr = ADDR_UNSET, | ||
2933 | .radio_addr = ADDR_UNSET, | ||
2934 | }, | ||
2910 | }; | 2935 | }; |
2911 | 2936 | ||
2912 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); | 2937 | static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); |
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index 78f0eb039183..f821ba69db99 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h | |||
@@ -168,6 +168,8 @@ | |||
168 | #define BTTV_BOARD_SABRENT_TVFM 0x8e | 168 | #define BTTV_BOARD_SABRENT_TVFM 0x8e |
169 | #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f | 169 | #define BTTV_BOARD_HAUPPAUGE_IMPACTVCB 0x8f |
170 | #define BTTV_BOARD_MACHTV_MAGICTV 0x90 | 170 | #define BTTV_BOARD_MACHTV_MAGICTV 0x90 |
171 | #define BTTV_BOARD_SSAI_SECURITY 0x91 | ||
172 | #define BTTV_BOARD_SSAI_ULTRASOUND 0x92 | ||
171 | 173 | ||
172 | /* more card-specific defines */ | 174 | /* more card-specific defines */ |
173 | #define PT2254_L_CHANNEL 0x10 | 175 | #define PT2254_L_CHANNEL 0x10 |