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

Commit 9b6ba57b authored by Jiri Slaby's avatar Jiri Slaby Committed by Mauro Carvalho Chehab
Browse files

[media] DVB: dib0700, move Nova-TD Stick to a separate set 



To properly support the three LEDs which are on the stick, we need
a special handling in the ->frontend_attach function. Thus let's have
a separate ->frontend_attach instead of ifs in the common one.

The hadnling itself will be added in further patches.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Acked-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarPatrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 68dc8bc5

drivers/media/dvb/dvb-usb/dib0700_devices.c

+52 −5
Original line number Diff line number Diff line
@@ -3892,7 +3892,58 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
			}

		},



		.num_device_descs = 6,

		.num_device_descs = 1,

		.devices = {

			{   "Hauppauge Nova-TD Stick (52009)",

				{ &dib0700_usb_id_table[35], NULL },

				{ NULL },

			},

		},



		.rc.core = {

			.rc_interval      = DEFAULT_RC_INTERVAL,

			.rc_codes         = RC_MAP_DIB0700_RC5_TABLE,

			.module_name	  = "dib0700",

			.rc_query         = dib0700_rc_query_old_firmware,

			.allowed_protos   = RC_TYPE_RC5 |

					    RC_TYPE_RC6 |

					    RC_TYPE_NEC,

			.change_protocol = dib0700_change_protocol,

		},

	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,



		.num_adapters = 2,

		.adapter = {

			{

			.num_frontends = 1,

			.fe = {{

				.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,

				.pid_filter_count = 32,

				.pid_filter       = stk70x0p_pid_filter,

				.pid_filter_ctrl  = stk70x0p_pid_filter_ctrl,

				.frontend_attach  = stk7070pd_frontend_attach0,

				.tuner_attach     = dib7070p_tuner_attach,



				DIB0700_DEFAULT_STREAMING_CONFIG(0x02),

			}},

				.size_of_priv     = sizeof(struct dib0700_adapter_state),

			}, {

			.num_frontends = 1,

			.fe = {{

				.caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,

				.pid_filter_count = 32,

				.pid_filter       = stk70x0p_pid_filter,

				.pid_filter_ctrl  = stk70x0p_pid_filter_ctrl,

				.frontend_attach  = stk7070pd_frontend_attach1,

				.tuner_attach     = dib7070p_tuner_attach,



				DIB0700_DEFAULT_STREAMING_CONFIG(0x03),

			}},

				.size_of_priv     = sizeof(struct dib0700_adapter_state),

			}

		},



		.num_device_descs = 5,

		.devices = {

			{   "DiBcom STK7070PD reference design",

				{ &dib0700_usb_id_table[17], NULL },
@@ -3902,10 +3953,6 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
				{ &dib0700_usb_id_table[18], NULL },

				{ NULL },

			},

			{   "Hauppauge Nova-TD Stick (52009)",

				{ &dib0700_usb_id_table[35], NULL },

				{ NULL },

			},

			{   "Hauppauge Nova-TD-500 (84xxx)",

				{ &dib0700_usb_id_table[36], NULL },

				{ NULL },