Skip to content

L
linux-davinci
Commit dd5f322f authored by Mike Isely's avatar Mike Isely Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB (11199): pvrusb2: Convert all device definitions to use new sub-device declarations 

Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 23334a22
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 45 deletions
drivers/media/video/pvrusb2/pvrusb2-devattr.c
View file @ dd5f322f
...@@ -46,10 +46,10 @@ pvr2_device_desc structures. ...@@ -46,10 +46,10 @@ pvr2_device_desc structures.
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
/* Hauppauge PVR-USB2 Model 29xxx */ /* Hauppauge PVR-USB2 Model 29xxx */
static const char *pvr2_client_29xxx[] = { static const struct pvr2_device_client_desc pvr2_cli_29xxx[] = {
"msp3400", { .module_id = PVR2_CLIENT_ID_SAA7115 },
"saa7115", { .module_id = PVR2_CLIENT_ID_MSP3400 },
"tuner", { .module_id = PVR2_CLIENT_ID_TUNER },
}; };
static const char *pvr2_fw1_names_29xxx[] = { static const char *pvr2_fw1_names_29xxx[] = {
...@@ -59,8 +59,8 @@ static const char *pvr2_fw1_names_29xxx[] = { ...@@ -59,8 +59,8 @@ static const char *pvr2_fw1_names_29xxx[] = {
static const struct pvr2_device_desc pvr2_device_29xxx = { static const struct pvr2_device_desc pvr2_device_29xxx = {
.description = "WinTV PVR USB2 Model Category 29xxx", .description = "WinTV PVR USB2 Model Category 29xxx",
.shortname = "29xxx", .shortname = "29xxx",
.client_modules.lst = pvr2_client_29xxx, .client_table.lst = pvr2_cli_29xxx,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_29xxx), .client_table.cnt = ARRAY_SIZE(pvr2_cli_29xxx),
.fx2_firmware.lst = pvr2_fw1_names_29xxx, .fx2_firmware.lst = pvr2_fw1_names_29xxx,
.fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_29xxx), .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_29xxx),
.flag_has_hauppauge_rom = !0, .flag_has_hauppauge_rom = !0,
...@@ -77,10 +77,10 @@ static const struct pvr2_device_desc pvr2_device_29xxx = { ...@@ -77,10 +77,10 @@ static const struct pvr2_device_desc pvr2_device_29xxx = {
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
/* Hauppauge PVR-USB2 Model 24xxx */ /* Hauppauge PVR-USB2 Model 24xxx */
static const char *pvr2_client_24xxx[] = { static const struct pvr2_device_client_desc pvr2_cli_24xxx[] = {
"cx25840", { .module_id = PVR2_CLIENT_ID_CX25840 },
"tuner", { .module_id = PVR2_CLIENT_ID_TUNER },
"wm8775", { .module_id = PVR2_CLIENT_ID_WM8775 },
}; };
static const char *pvr2_fw1_names_24xxx[] = { static const char *pvr2_fw1_names_24xxx[] = {
...@@ -90,8 +90,8 @@ static const char *pvr2_fw1_names_24xxx[] = { ...@@ -90,8 +90,8 @@ static const char *pvr2_fw1_names_24xxx[] = {
static const struct pvr2_device_desc pvr2_device_24xxx = { static const struct pvr2_device_desc pvr2_device_24xxx = {
.description = "WinTV PVR USB2 Model Category 24xxx", .description = "WinTV PVR USB2 Model Category 24xxx",
.shortname = "24xxx", .shortname = "24xxx",
.client_modules.lst = pvr2_client_24xxx, .client_table.lst = pvr2_cli_24xxx,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_24xxx), .client_table.cnt = ARRAY_SIZE(pvr2_cli_24xxx),
.fx2_firmware.lst = pvr2_fw1_names_24xxx, .fx2_firmware.lst = pvr2_fw1_names_24xxx,
.fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_24xxx), .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_24xxx),
.flag_has_cx25840 = !0, .flag_has_cx25840 = !0,
...@@ -111,16 +111,16 @@ static const struct pvr2_device_desc pvr2_device_24xxx = { ...@@ -111,16 +111,16 @@ static const struct pvr2_device_desc pvr2_device_24xxx = {
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
/* GOTVIEW USB2.0 DVD2 */ /* GOTVIEW USB2.0 DVD2 */
static const char *pvr2_client_gotview_2[] = { static const struct pvr2_device_client_desc pvr2_cli_gotview_2[] = {
"cx25840", { .module_id = PVR2_CLIENT_ID_CX25840 },
"tuner", { .module_id = PVR2_CLIENT_ID_TUNER },
}; };
static const struct pvr2_device_desc pvr2_device_gotview_2 = { static const struct pvr2_device_desc pvr2_device_gotview_2 = {
.description = "Gotview USB 2.0 DVD 2", .description = "Gotview USB 2.0 DVD 2",
.shortname = "gv2", .shortname = "gv2",
.client_modules.lst = pvr2_client_gotview_2, .client_table.lst = pvr2_cli_gotview_2,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_gotview_2), .client_table.cnt = ARRAY_SIZE(pvr2_cli_gotview_2),
.flag_has_cx25840 = !0, .flag_has_cx25840 = !0,
.default_tuner_type = TUNER_PHILIPS_FM1216ME_MK3, .default_tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
.flag_has_analogtuner = !0, .flag_has_analogtuner = !0,
...@@ -140,8 +140,8 @@ static const struct pvr2_device_desc pvr2_device_gotview_2 = { ...@@ -140,8 +140,8 @@ static const struct pvr2_device_desc pvr2_device_gotview_2 = {
static const struct pvr2_device_desc pvr2_device_gotview_2d = { static const struct pvr2_device_desc pvr2_device_gotview_2d = {
.description = "Gotview USB 2.0 DVD Deluxe", .description = "Gotview USB 2.0 DVD Deluxe",
.shortname = "gv2d", .shortname = "gv2d",
.client_modules.lst = pvr2_client_gotview_2, .client_table.lst = pvr2_cli_gotview_2,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_gotview_2), .client_table.cnt = ARRAY_SIZE(pvr2_cli_gotview_2),
.flag_has_cx25840 = !0, .flag_has_cx25840 = !0,
.default_tuner_type = TUNER_PHILIPS_FM1216ME_MK3, .default_tuner_type = TUNER_PHILIPS_FM1216ME_MK3,
.flag_has_analogtuner = !0, .flag_has_analogtuner = !0,
...@@ -187,17 +187,17 @@ static struct pvr2_dvb_props pvr2_onair_creator_fe_props = { ...@@ -187,17 +187,17 @@ static struct pvr2_dvb_props pvr2_onair_creator_fe_props = {
}; };
#endif #endif
static const char *pvr2_client_onair_creator[] = { static const struct pvr2_device_client_desc pvr2_cli_onair_creator[] = {
"saa7115", { .module_id = PVR2_CLIENT_ID_SAA7115 },
"tuner", { .module_id = PVR2_CLIENT_ID_CS53L32A },
"cs53l32a", { .module_id = PVR2_CLIENT_ID_TUNER },
}; };
static const struct pvr2_device_desc pvr2_device_onair_creator = { static const struct pvr2_device_desc pvr2_device_onair_creator = {
.description = "OnAir Creator Hybrid USB tuner", .description = "OnAir Creator Hybrid USB tuner",
.shortname = "oac", .shortname = "oac",
.client_modules.lst = pvr2_client_onair_creator, .client_table.lst = pvr2_cli_onair_creator,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_creator), .client_table.cnt = ARRAY_SIZE(pvr2_cli_onair_creator),
.default_tuner_type = TUNER_LG_TDVS_H06XF, .default_tuner_type = TUNER_LG_TDVS_H06XF,
.flag_has_analogtuner = !0, .flag_has_analogtuner = !0,
.flag_has_composite = !0, .flag_has_composite = !0,
...@@ -247,17 +247,17 @@ static struct pvr2_dvb_props pvr2_onair_usb2_fe_props = { ...@@ -247,17 +247,17 @@ static struct pvr2_dvb_props pvr2_onair_usb2_fe_props = {
}; };
#endif #endif
static const char *pvr2_client_onair_usb2[] = { static const struct pvr2_device_client_desc pvr2_cli_onair_usb2[] = {
"saa7115", { .module_id = PVR2_CLIENT_ID_SAA7115 },
"tuner", { .module_id = PVR2_CLIENT_ID_CS53L32A },
"cs53l32a", { .module_id = PVR2_CLIENT_ID_TUNER },
}; };
static const struct pvr2_device_desc pvr2_device_onair_usb2 = { static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
.description = "OnAir USB2 Hybrid USB tuner", .description = "OnAir USB2 Hybrid USB tuner",
.shortname = "oa2", .shortname = "oa2",
.client_modules.lst = pvr2_client_onair_usb2, .client_table.lst = pvr2_cli_onair_usb2,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_usb2), .client_table.cnt = ARRAY_SIZE(pvr2_cli_onair_usb2),
.default_tuner_type = TUNER_PHILIPS_FCV1236D, .default_tuner_type = TUNER_PHILIPS_FCV1236D,
.flag_has_analogtuner = !0, .flag_has_analogtuner = !0,
.flag_has_composite = !0, .flag_has_composite = !0,
...@@ -320,9 +320,10 @@ static struct pvr2_dvb_props pvr2_73xxx_dvb_props = { ...@@ -320,9 +320,10 @@ static struct pvr2_dvb_props pvr2_73xxx_dvb_props = {
}; };
#endif #endif
static const char *pvr2_client_73xxx[] = { static const struct pvr2_device_client_desc pvr2_cli_73xxx[] = {
"cx25840", { .module_id = PVR2_CLIENT_ID_CX25840 },
"tuner", { .module_id = PVR2_CLIENT_ID_TUNER,
.i2c_address_list = "\x42"},
}; };
static const char *pvr2_fw1_names_73xxx[] = { static const char *pvr2_fw1_names_73xxx[] = {
...@@ -332,8 +333,8 @@ static const char *pvr2_fw1_names_73xxx[] = { ...@@ -332,8 +333,8 @@ static const char *pvr2_fw1_names_73xxx[] = {
static const struct pvr2_device_desc pvr2_device_73xxx = { static const struct pvr2_device_desc pvr2_device_73xxx = {
.description = "WinTV HVR-1900 Model Category 73xxx", .description = "WinTV HVR-1900 Model Category 73xxx",
.shortname = "73xxx", .shortname = "73xxx",
.client_modules.lst = pvr2_client_73xxx, .client_table.lst = pvr2_cli_73xxx,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_73xxx), .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx),
.fx2_firmware.lst = pvr2_fw1_names_73xxx, .fx2_firmware.lst = pvr2_fw1_names_73xxx,
.fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx), .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx),
.flag_has_cx25840 = !0, .flag_has_cx25840 = !0,
...@@ -429,11 +430,6 @@ static struct pvr2_dvb_props pvr2_751xx_dvb_props = { ...@@ -429,11 +430,6 @@ static struct pvr2_dvb_props pvr2_751xx_dvb_props = {
}; };
#endif #endif
static const char *pvr2_client_75xxx[] = {
"cx25840",
"tuner",
};
static const char *pvr2_fw1_names_75xxx[] = { static const char *pvr2_fw1_names_75xxx[] = {
"v4l-pvrusb2-73xxx-01.fw", "v4l-pvrusb2-73xxx-01.fw",
}; };
...@@ -441,8 +437,8 @@ static const char *pvr2_fw1_names_75xxx[] = { ...@@ -441,8 +437,8 @@ static const char *pvr2_fw1_names_75xxx[] = {
static const struct pvr2_device_desc pvr2_device_750xx = { static const struct pvr2_device_desc pvr2_device_750xx = {
.description = "WinTV HVR-1950 Model Category 750xx", .description = "WinTV HVR-1950 Model Category 750xx",
.shortname = "750xx", .shortname = "750xx",
.client_modules.lst = pvr2_client_75xxx, .client_table.lst = pvr2_cli_73xxx,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx), .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx),
.fx2_firmware.lst = pvr2_fw1_names_75xxx, .fx2_firmware.lst = pvr2_fw1_names_75xxx,
.fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_75xxx), .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_75xxx),
.flag_has_cx25840 = !0, .flag_has_cx25840 = !0,
...@@ -463,8 +459,8 @@ static const struct pvr2_device_desc pvr2_device_750xx = { ...@@ -463,8 +459,8 @@ static const struct pvr2_device_desc pvr2_device_750xx = {
static const struct pvr2_device_desc pvr2_device_751xx = { static const struct pvr2_device_desc pvr2_device_751xx = {
.description = "WinTV HVR-1950 Model Category 751xx", .description = "WinTV HVR-1950 Model Category 751xx",
.shortname = "751xx", .shortname = "751xx",
.client_modules.lst = pvr2_client_75xxx, .client_table.lst = pvr2_cli_73xxx,
.client_modules.cnt = ARRAY_SIZE(pvr2_client_75xxx), .client_table.cnt = ARRAY_SIZE(pvr2_cli_73xxx),
.fx2_firmware.lst = pvr2_fw1_names_75xxx, .fx2_firmware.lst = pvr2_fw1_names_75xxx,
.fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_75xxx), .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_75xxx),
.flag_has_cx25840 = !0, .flag_has_cx25840 = !0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment