aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/dib0700_devices.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dib0700_devices.c')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c325
1 files changed, 293 insertions, 32 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index e7093826e975..6477fc66cc23 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -13,6 +13,7 @@
13#include "dib7000p.h" 13#include "dib7000p.h"
14#include "mt2060.h" 14#include "mt2060.h"
15#include "mt2266.h" 15#include "mt2266.h"
16#include "tuner-xc2028.h"
16#include "dib0070.h" 17#include "dib0070.h"
17 18
18static int force_lna_activation; 19static int force_lna_activation;
@@ -297,10 +298,156 @@ static int stk7700d_tuner_attach(struct dvb_usb_adapter *adap)
297 &stk7700d_mt2266_config[adap->id]) == NULL ? -ENODEV : 0;; 298 &stk7700d_mt2266_config[adap->id]) == NULL ? -ENODEV : 0;;
298} 299}
299 300
301/* STK7700-PH: Digital/Analog Hybrid Tuner, e.h. Cinergy HT USB HE */
302struct dibx000_agc_config xc3028_agc_config = {
303 BAND_VHF | BAND_UHF, /* band_caps */
304
305 /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=0,
306 * P_agc_inv_pwm1=0, P_agc_inv_pwm2=0, P_agc_inh_dc_rv_est=0,
307 * P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=2, P_agc_write=0 */
308 (0 << 15) | (0 << 14) | (0 << 11) | (0 << 10) | (0 << 9) | (0 << 8) |
309 (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0), /* setup */
310
311 712, /* inv_gain */
312 21, /* time_stabiliz */
313
314 0, /* alpha_level */
315 118, /* thlock */
316
317 0, /* wbd_inv */
318 2867, /* wbd_ref */
319 0, /* wbd_sel */
320 2, /* wbd_alpha */
321
322 0, /* agc1_max */
323 0, /* agc1_min */
324 39718, /* agc2_max */
325 9930, /* agc2_min */
326 0, /* agc1_pt1 */
327 0, /* agc1_pt2 */
328 0, /* agc1_pt3 */
329 0, /* agc1_slope1 */
330 0, /* agc1_slope2 */
331 0, /* agc2_pt1 */
332 128, /* agc2_pt2 */
333 29, /* agc2_slope1 */
334 29, /* agc2_slope2 */
335
336 17, /* alpha_mant */
337 27, /* alpha_exp */
338 23, /* beta_mant */
339 51, /* beta_exp */
340
341 1, /* perform_agc_softsplit */
342};
343
344/* PLL Configuration for COFDM BW_MHz = 8.00 with external clock = 30.00 */
345struct dibx000_bandwidth_config xc3028_bw_config = {
346 60000, 30000, /* internal, sampling */
347 1, 8, 3, 1, 0, /* pll_cfg: prediv, ratio, range, reset, bypass */
348 0, 0, 1, 1, 0, /* misc: refdiv, bypclk_div, IO_CLK_en_core, ADClkSrc,
349 modulo */
350 (3 << 14) | (1 << 12) | (524 << 0), /* sad_cfg: refsel, sel, freq_15k */
351 (1 << 25) | 5816102, /* ifreq = 5.200000 MHz */
352 20452225, /* timf */
353 30000000, /* xtal_hz */
354};
355
356static struct dib7000p_config stk7700ph_dib7700_xc3028_config = {
357 .output_mpeg2_in_188_bytes = 1,
358 .tuner_is_baseband = 1,
359
360 .agc_config_count = 1,
361 .agc = &xc3028_agc_config,
362 .bw = &xc3028_bw_config,
363
364 .gpio_dir = DIB7000P_GPIO_DEFAULT_DIRECTIONS,
365 .gpio_val = DIB7000P_GPIO_DEFAULT_VALUES,
366 .gpio_pwm_pos = DIB7000P_GPIO_DEFAULT_PWM_POS,
367};
368
369static int stk7700ph_xc3028_callback(void *ptr, int command, int arg)
370{
371 struct dvb_usb_adapter *adap = ptr;
372
373 switch (command) {
374 case XC2028_TUNER_RESET:
375 /* Send the tuner in then out of reset */
376 dib7000p_set_gpio(adap->fe, 8, 0, 0); msleep(10);
377 dib7000p_set_gpio(adap->fe, 8, 0, 1);
378 break;
379 case XC2028_RESET_CLK:
380 break;
381 default:
382 err("%s: unknown command %d, arg %d\n", __func__,
383 command, arg);
384 return -EINVAL;
385 }
386 return 0;
387}
388
389static struct xc2028_ctrl stk7700ph_xc3028_ctrl = {
390 .fname = XC2028_DEFAULT_FIRMWARE,
391 .max_len = 64,
392 .demod = XC3028_FE_DIBCOM52,
393};
394
395static struct xc2028_config stk7700ph_xc3028_config = {
396 .i2c_addr = 0x61,
397 .callback = stk7700ph_xc3028_callback,
398 .ctrl = &stk7700ph_xc3028_ctrl,
399};
400
401static int stk7700ph_frontend_attach(struct dvb_usb_adapter *adap)
402{
403 struct usb_device_descriptor *desc = &adap->dev->udev->descriptor;
404
405 if (desc->idVendor == USB_VID_PINNACLE &&
406 desc->idProduct == USB_PID_PINNACLE_EXPRESSCARD_320CX)
407 dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 0);
408 else
409 dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 1);
410 msleep(20);
411 dib0700_set_gpio(adap->dev, GPIO9, GPIO_OUT, 1);
412 dib0700_set_gpio(adap->dev, GPIO4, GPIO_OUT, 1);
413 dib0700_set_gpio(adap->dev, GPIO7, GPIO_OUT, 1);
414 dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 0);
415 msleep(10);
416 dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 1);
417 msleep(20);
418 dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
419 msleep(10);
420
421 dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,
422 &stk7700ph_dib7700_xc3028_config);
423
424 adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x80,
425 &stk7700ph_dib7700_xc3028_config);
426
427 return adap->fe == NULL ? -ENODEV : 0;
428}
429
430static int stk7700ph_tuner_attach(struct dvb_usb_adapter *adap)
431{
432 struct i2c_adapter *tun_i2c;
433
434 tun_i2c = dib7000p_get_i2c_master(adap->fe,
435 DIBX000_I2C_INTERFACE_TUNER, 1);
436
437 stk7700ph_xc3028_config.i2c_adap = tun_i2c;
438 stk7700ph_xc3028_config.video_dev = adap;
439
440 return dvb_attach(xc2028_attach, adap->fe, &stk7700ph_xc3028_config)
441 == NULL ? -ENODEV : 0;
442}
443
300#define DEFAULT_RC_INTERVAL 150 444#define DEFAULT_RC_INTERVAL 150
301 445
302static u8 rc_request[] = { REQUEST_POLL_RC, 0 }; 446static u8 rc_request[] = { REQUEST_POLL_RC, 0 };
303 447
448/* Number of keypresses to ignore before start repeating */
449#define RC_REPEAT_DELAY 2
450
304static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state) 451static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
305{ 452{
306 u8 key[4]; 453 u8 key[4];
@@ -314,18 +461,67 @@ static int dib0700_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
314 err("RC Query Failed"); 461 err("RC Query Failed");
315 return -1; 462 return -1;
316 } 463 }
464
465 /* losing half of KEY_0 events from Philipps rc5 remotes.. */
317 if (key[0]==0 && key[1]==0 && key[2]==0 && key[3]==0) return 0; 466 if (key[0]==0 && key[1]==0 && key[2]==0 && key[3]==0) return 0;
318 if (key[3-1]!=st->rc_toggle) { 467
468 /* info("%d: %2X %2X %2X %2X",dvb_usb_dib0700_ir_proto,(int)key[3-2],(int)key[3-3],(int)key[3-1],(int)key[3]); */
469
470 dib0700_rc_setup(d); /* reset ir sensor data to prevent false events */
471
472 switch (dvb_usb_dib0700_ir_proto) {
473 case 0: {
474 /* NEC protocol sends repeat code as 0 0 0 FF */
475 if ((key[3-2] == 0x00) && (key[3-3] == 0x00) &&
476 (key[3] == 0xFF)) {
477 st->rc_counter++;
478 if (st->rc_counter > RC_REPEAT_DELAY) {
479 *event = d->last_event;
480 *state = REMOTE_KEY_PRESSED;
481 st->rc_counter = RC_REPEAT_DELAY;
482 }
483 return 0;
484 }
319 for (i=0;i<d->props.rc_key_map_size; i++) { 485 for (i=0;i<d->props.rc_key_map_size; i++) {
320 if (keymap[i].custom == key[3-2] && keymap[i].data == key[3-3]) { 486 if (keymap[i].custom == key[3-2] && keymap[i].data == key[3-3]) {
487 st->rc_counter = 0;
488 *event = keymap[i].event;
489 *state = REMOTE_KEY_PRESSED;
490 d->last_event = keymap[i].event;
491 return 0;
492 }
493 }
494 break;
495 }
496 default: {
497 /* RC-5 protocol changes toggle bit on new keypress */
498 for (i = 0; i < d->props.rc_key_map_size; i++) {
499 if (keymap[i].custom == key[3-2] && keymap[i].data == key[3-3]) {
500 if (d->last_event == keymap[i].event &&
501 key[3-1] == st->rc_toggle) {
502 st->rc_counter++;
503 /* prevents unwanted double hits */
504 if (st->rc_counter > RC_REPEAT_DELAY) {
505 *event = d->last_event;
506 *state = REMOTE_KEY_PRESSED;
507 st->rc_counter = RC_REPEAT_DELAY;
508 }
509
510 return 0;
511 }
512 st->rc_counter = 0;
321 *event = keymap[i].event; 513 *event = keymap[i].event;
322 *state = REMOTE_KEY_PRESSED; 514 *state = REMOTE_KEY_PRESSED;
323 st->rc_toggle=key[3-1]; 515 st->rc_toggle = key[3-1];
516 d->last_event = keymap[i].event;
324 return 0; 517 return 0;
325 } 518 }
326 } 519 }
327 err("Unknown remote controller key : %2X %2X",(int)key[3-2],(int)key[3-3]); 520 break;
328 } 521 }
522 }
523 err("Unknown remote controller key: %2X %2X %2X %2X", (int) key[3-2], (int) key[3-3], (int) key[3-1], (int) key[3]);
524 d->last_event = 0;
329 return 0; 525 return 0;
330} 526}
331 527
@@ -794,6 +990,10 @@ static struct dib7000p_config dib7070p_dib7000p_config = {
794/* STK7070P */ 990/* STK7070P */
795static int stk7070p_frontend_attach(struct dvb_usb_adapter *adap) 991static int stk7070p_frontend_attach(struct dvb_usb_adapter *adap)
796{ 992{
993 if (adap->dev->udev->descriptor.idVendor == USB_VID_PINNACLE &&
994 adap->dev->udev->descriptor.idProduct == USB_PID_PINNACLE_PCTV72E)
995 dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 0);
996 else
797 dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 1); 997 dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 1);
798 msleep(10); 998 msleep(10);
799 dib0700_set_gpio(adap->dev, GPIO9, GPIO_OUT, 1); 999 dib0700_set_gpio(adap->dev, GPIO9, GPIO_OUT, 1);
@@ -808,9 +1008,11 @@ static int stk7070p_frontend_attach(struct dvb_usb_adapter *adap)
808 msleep(10); 1008 msleep(10);
809 dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1); 1009 dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
810 1010
811 dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18, &dib7070p_dib7000p_config); 1011 dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18,
1012 &dib7070p_dib7000p_config);
812 1013
813 adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x80, &dib7070p_dib7000p_config); 1014 adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x80,
1015 &dib7070p_dib7000p_config);
814 return adap->fe == NULL ? -ENODEV : 0; 1016 return adap->fe == NULL ? -ENODEV : 0;
815} 1017}
816 1018
@@ -878,34 +1080,43 @@ static int stk7070pd_frontend_attach1(struct dvb_usb_adapter *adap)
878/* DVB-USB and USB stuff follows */ 1080/* DVB-USB and USB stuff follows */
879struct usb_device_id dib0700_usb_id_table[] = { 1081struct usb_device_id dib0700_usb_id_table[] = {
880/* 0 */ { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P) }, 1082/* 0 */ { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P) },
881 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P_PC) }, 1083 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700P_PC) },
882 1084 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500) },
883 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500) }, 1085 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_2) },
884 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_500_2) }, 1086 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK) },
885 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK) },
886/* 5 */ { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR) }, 1087/* 5 */ { USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR) },
887 { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_VIDEOMATE_U500) }, 1088 { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_VIDEOMATE_U500) },
888 { USB_DEVICE(USB_VID_UNIWILL, USB_PID_UNIWILL_STK7700P) }, 1089 { USB_DEVICE(USB_VID_UNIWILL, USB_PID_UNIWILL_STK7700P) },
889 { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_STK7700P) }, 1090 { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_STK7700P) },
890 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_2) }, 1091 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_2) },
891/* 10 */{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_2) }, 1092/* 10 */{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_VOLAR_2) },
892 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV2000E) }, 1093 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV2000E) },
893 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY) }, 1094 { USB_DEVICE(USB_VID_TERRATEC,
894 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK) }, 1095 USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY) },
895 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700D) }, 1096 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_TD_STICK) },
1097 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7700D) },
896/* 15 */{ USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7070P) }, 1098/* 15 */{ USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7070P) },
897 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV_DVB_T_FLASH) }, 1099 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV_DVB_T_FLASH) },
898 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7070PD) }, 1100 { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_STK7070PD) },
899 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T) }, 1101 { USB_DEVICE(USB_VID_PINNACLE,
900 { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_VIDEOMATE_U500_PC) }, 1102 USB_PID_PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T) },
1103 { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_VIDEOMATE_U500_PC) },
901/* 20 */{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_EXPRESS) }, 1104/* 20 */{ USB_DEVICE(USB_VID_AVERMEDIA, USB_PID_AVERMEDIA_EXPRESS) },
902 { USB_DEVICE(USB_VID_GIGABYTE, USB_PID_GIGABYTE_U7000) }, 1105 { USB_DEVICE(USB_VID_GIGABYTE, USB_PID_GIGABYTE_U7000) },
903 { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14BR) }, 1106 { USB_DEVICE(USB_VID_ULTIMA_ELECTRONIC, USB_PID_ARTEC_T14BR) },
904 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000) }, 1107 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3000) },
905 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100) }, 1108 { USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100) },
906/* 25 */ { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_3) }, 1109/* 25 */{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_3) },
907 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_MYTV_T) }, 1110 { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_MYTV_T) },
908 { 0 } /* Terminating entry */ 1111 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_HT_USB_XE) },
1112 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_EXPRESSCARD_320CX) },
1113 { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV72E) },
1114/* 30 */{ USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_PCTV73E) },
1115 { USB_DEVICE(USB_VID_YUAN, USB_PID_YUAN_EC372S) },
1116 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_HT_EXPRESS) },
1117 { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_T_XXS) },
1118 { USB_DEVICE(USB_VID_LEADTEK, USB_PID_WINFAST_DTV_DONGLE_STK7700P_2) },
1119 { 0 } /* Terminating entry */
909}; 1120};
910MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); 1121MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
911 1122
@@ -969,7 +1180,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
969 { NULL }, 1180 { NULL },
970 }, 1181 },
971 { "Leadtek Winfast DTV Dongle (STK7700P based)", 1182 { "Leadtek Winfast DTV Dongle (STK7700P based)",
972 { &dib0700_usb_id_table[8], NULL }, 1183 { &dib0700_usb_id_table[8], &dib0700_usb_id_table[34] },
973 { NULL }, 1184 { NULL },
974 }, 1185 },
975 { "AVerMedia AVerTV DVB-T Express", 1186 { "AVerMedia AVerTV DVB-T Express",
@@ -1069,12 +1280,16 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1069 }, 1280 },
1070 }, 1281 },
1071 1282
1072 .num_device_descs = 1, 1283 .num_device_descs = 2,
1073 .devices = { 1284 .devices = {
1074 { "ASUS My Cinema U3000 Mini DVBT Tuner", 1285 { "ASUS My Cinema U3000 Mini DVBT Tuner",
1075 { &dib0700_usb_id_table[23], NULL }, 1286 { &dib0700_usb_id_table[23], NULL },
1076 { NULL }, 1287 { NULL },
1077 }, 1288 },
1289 { "Yuan EC372S",
1290 { &dib0700_usb_id_table[31], NULL },
1291 { NULL },
1292 }
1078 } 1293 }
1079 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, 1294 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
1080 1295
@@ -1090,7 +1305,7 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1090 }, 1305 },
1091 }, 1306 },
1092 1307
1093 .num_device_descs = 6, 1308 .num_device_descs = 9,
1094 .devices = { 1309 .devices = {
1095 { "DiBcom STK7070P reference design", 1310 { "DiBcom STK7070P reference design",
1096 { &dib0700_usb_id_table[15], NULL }, 1311 { &dib0700_usb_id_table[15], NULL },
@@ -1116,6 +1331,18 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1116 { &dib0700_usb_id_table[26], NULL }, 1331 { &dib0700_usb_id_table[26], NULL },
1117 { NULL }, 1332 { NULL },
1118 }, 1333 },
1334 { "Pinnacle PCTV 72e",
1335 { &dib0700_usb_id_table[29], NULL },
1336 { NULL },
1337 },
1338 { "Pinnacle PCTV 73e",
1339 { &dib0700_usb_id_table[30], NULL },
1340 { NULL },
1341 },
1342 { "Terratec Cinergy T USB XXS",
1343 { &dib0700_usb_id_table[33], NULL },
1344 { NULL },
1345 },
1119 }, 1346 },
1120 1347
1121 .rc_interval = DEFAULT_RC_INTERVAL, 1348 .rc_interval = DEFAULT_RC_INTERVAL,
@@ -1155,6 +1382,40 @@ struct dvb_usb_device_properties dib0700_devices[] = {
1155 { NULL }, 1382 { NULL },
1156 } 1383 }
1157 } 1384 }
1385 }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
1386
1387 .num_adapters = 1,
1388 .adapter = {
1389 {
1390 .frontend_attach = stk7700ph_frontend_attach,
1391 .tuner_attach = stk7700ph_tuner_attach,
1392
1393 DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
1394
1395 .size_of_priv = sizeof(struct
1396 dib0700_adapter_state),
1397 },
1398 },
1399
1400 .num_device_descs = 3,
1401 .devices = {
1402 { "Terratec Cinergy HT USB XE",
1403 { &dib0700_usb_id_table[27], NULL },
1404 { NULL },
1405 },
1406 { "Pinnacle Expresscard 320cx",
1407 { &dib0700_usb_id_table[28], NULL },
1408 { NULL },
1409 },
1410 { "Terratec Cinergy HT Express",
1411 { &dib0700_usb_id_table[32], NULL },
1412 { NULL },
1413 },
1414 },
1415 .rc_interval = DEFAULT_RC_INTERVAL,
1416 .rc_key_map = dib0700_rc_keys,
1417 .rc_key_map_size = ARRAY_SIZE(dib0700_rc_keys),
1418 .rc_query = dib0700_rc_query
1158 }, 1419 },
1159}; 1420};
1160 1421
generated by cgit v1.2.2 (git 2.25.0) at 2026-01-08 23:15:56 -0500