Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d081601 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7889): cx18: improve HVR-1600 detection. 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 6b13cf16

drivers/media/video/cx18/cx18-cards.c

+3 −2
Original line number Diff line number Diff line
@@ -87,11 +87,12 @@ static const struct cx18_card cx18_card_hvr1600_esmt = { 
static const struct cx18_card cx18_card_hvr1600_samsung = {

	.type = CX18_CARD_HVR_1600_SAMSUNG,

	.name = "Hauppauge HVR-1600 (Preproduction)",

	.comment = "DVB & VBI are not yet supported\n",

	.comment = "VBI is not yet supported\n",

	.v4l2_capabilities = CX18_CAP_ENCODER,

	.hw_audio_ctrl = CX18_HW_CX23418,

	.hw_muxer = CX18_HW_CS5345,

	.hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | CX18_HW_CS5345,

	.hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER |

		  CX18_HW_CS5345 | CX18_HW_DVB,

	.video_inputs = {

		{ CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },

		{ CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },

drivers/media/video/cx18/cx18-driver.c

+4 −4
Original line number Diff line number Diff line
@@ -210,13 +210,13 @@ static void cx18_process_eeprom(struct cx18 *cx) 


	/* Many thanks to Steven Toth from Hauppauge for providing the

	   model numbers */

	/* Note: the Samsung memory models cannot be reliably determined

	   from the model number. Use the cardtype module option if you

	   have one of these preproduction models. */

	switch (tv.model) {

	case 74000 ... 74099:

	case 74000 ... 74999:

		cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT);

		break;

	case 74700 ... 74799:

		cx->card = cx18_get_card(CX18_CARD_HVR_1600_SAMSUNG);

		break;

	case 0:

		CX18_ERR("Invalid EEPROM\n");

		return;