Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
V4L/DVB (7889): cx18: improve HVR-1600 detection.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
authored by Hans Verkuil and committed by Mauro Carvalho Chehab 1d081601 6b13cf16
+3
-2
drivers/media/video/cx18/cx18-cards.c
+3
-2
drivers/media/video/cx18/cx18-cards.c
···
87
static const struct cx18_card cx18_card_hvr1600_samsung = {
88
.type = CX18_CARD_HVR_1600_SAMSUNG,
89
.name = "Hauppauge HVR-1600 (Preproduction)",
90
-
.comment = "DVB & VBI are not yet supported\n",
91
.v4l2_capabilities = CX18_CAP_ENCODER,
92
.hw_audio_ctrl = CX18_HW_CX23418,
93
.hw_muxer = CX18_HW_CS5345,
94
-
.hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | CX18_HW_CS5345,
95
.video_inputs = {
96
{ CX18_CARD_INPUT_VID_TUNER, 0, CX23418_COMPOSITE7 },
97
{ CX18_CARD_INPUT_SVIDEO1, 1, CX23418_SVIDEO1 },
···
87
static const struct cx18_card cx18_card_hvr1600_samsung = {
88
.type = CX18_CARD_HVR_1600_SAMSUNG,
89
.name = "Hauppauge HVR-1600 (Preproduction)",
90
+
.comment = "VBI is not yet supported\n",
91
.v4l2_capabilities = CX18_CAP_ENCODER,
92
.hw_audio_ctrl = CX18_HW_CX23418,
93
.hw_muxer = CX18_HW_CS5345,
94
+
.hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER |
95
+
CX18_HW_CS5345 | CX18_HW_DVB,
96
.video_inputs = {
97
{ CX18_CARD_INPUT_VID_TUNER, 0, CX23418_COMPOSITE7 },
98
{ CX18_CARD_INPUT_SVIDEO1, 1, CX23418_SVIDEO1 },
+4
-4
drivers/media/video/cx18/cx18-driver.c
+4
-4
drivers/media/video/cx18/cx18-driver.c
···
210
211
/* Many thanks to Steven Toth from Hauppauge for providing the
212
model numbers */
213
switch (tv.model) {
214
-
case 74000 ... 74099:
215
cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);
216
-
break;
217
-
case 74700 ... 74799:
218
-
cx->card = cx18_get_card(CX18_CARD_HVR_1600_SAMSUNG);
219
break;
220
case 0:
221
CX18_ERR("Invalid EEPROM\n");
···
210
211
/* Many thanks to Steven Toth from Hauppauge for providing the
212
model numbers */
213
+
/* Note: the Samsung memory models cannot be reliably determined
214
+
from the model number. Use the cardtype module option if you
215
+
have one of these preproduction models. */
216
switch (tv.model) {
217
+
case 74000 ... 74999:
218
cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);
219
break;
220
case 0:
221
CX18_ERR("Invalid EEPROM\n");