Signed-off-by: Albert Comerma <albert.comerma@xxxxxxxxx>
Albert
diff -crB v4l-dvb-orig/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c v4l-cyn/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c
*** v4l-dvb-orig/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c 2008-03-18 18:49:45.000000000 +0100
--- v4l-cyn/linux/drivers/media/dvb/dvb-usb/dib0700_devices.c 2008-03-18 21:03:31.000000000 +0100
***************
*** 13,18 ****
--- 13,19 ----
#include "dib7000p.h"
#include "mt2060.h"
#include "mt2266.h"
+ #include "tuner-xc2028.h"
#include "dib0070.h"
static int force_lna_activation;
***************
*** 297,302 ****
--- 298,452 ----
&stk7700d_mt2266_config[adap->id]) == NULL ? -ENODEV : 0;;
}
+ /* STK7700-PH: Digital/Analog Hybrid Tuner, e.h. Cinergy HT USB HE */
+ struct dibx000_agc_config xc3028_agc_config = {
+ BAND_VHF | BAND_UHF, // band_caps
+
+ /* P_agc_use_sd_mod1=0, P_agc_use_sd_mod2=0, P_agc_freq_pwm_div=0, P_agc_inv_pwm1=0, P_agc_inv_pwm2=0,
+ * * P_agc_inh_dc_rv_est=0, P_agc_time_est=3, P_agc_freeze=0, P_agc_nb_est=2, P_agc_write=0 */
+ (0 << 15) | (0 << 14) | (0 << 11) | (0 << 10) | (0 << 9) | (0 << 8) | (3 << 5) | (0 << 4) | (2 << 1) | (0 << 0), // setup
+
+ 712, // inv_gain
+ 21, // time_stabiliz
+
+ 0, // alpha_level
+ 118, // thlock
+
+ 0, // wbd_inv
+ 2867, // wbd_ref
+ 0, // wbd_sel
+ 2, // wbd_alpha
+
+ 0, // agc1_max
+ 0, // agc1_min
+ 39718, // agc2_max
+ 9930, // agc2_min
+ 0, // agc1_pt1
+ 0, // agc1_pt2
+ 0, // agc1_pt3
+ 0, // agc1_slope1
+ 0, // agc1_slope2
+ 0, // agc2_pt1
+ 128, // agc2_pt2
+ 29, // agc2_slope1
+ 29, // agc2_slope2
+
+ 17, // alpha_mant
+ 27, // alpha_exp
+ 23, // beta_mant
+ 51, // beta_exp
+
+ 1, // perform_agc_softsplit
+ };
+
+ /* PLL Configuration for COFDM BW_MHz = 8.000000 With external clock = 30.000000 */
+ struct dibx000_bandwidth_config xc3028_bw_config = {
+ 60000, 30000, // internal, sampling
+ 1, 8, 3, 1, 0, // pll_cfg: prediv, ratio, range, reset, bypass
+ 0, 0, 1, 1, 0, // misc: refdiv, bypclk_div, IO_CLK_en_core, ADClkSrc, modulo
+ (3 << 14) | (1 << 12) | (524 << 0), // sad_cfg: refsel, sel, freq_15k
+ (1 << 25) | 5816102, // ifreq = 5.200000 MHz
+ 20452225, // timf
+ 30000000, // xtal_hz
+ };
+
+ struct dibx000_bandwidth_config xc3028_bw_config_12mhz = {
+ 60000, 30000, // internal, sampling
+ 1, 20, 3, 1, 0, // pll_cfg: prediv, ratio, range, reset, bypass
+ 0, 0, 1, 1, 0, // misc: refdiv, bypclk_div, IO_CLK_en_core, ADClkSrc, modulo
+ (3 << 14) | (1 << 12) | (524 << 0), // sad_cfg: refsel, sel, freq_15k
+ (1 << 25) | 5816102, // ifreq = 5.200000 MHz
+ 20452225, // timf
+ };
+
+ static struct dib7000p_config stk7700ph_dib7700_xc3028_config = {
+ .output_mpeg2_in_188_bytes = 1,
+ .tuner_is_baseband = 1,
+
+ .agc_config_count = 1,
+ .agc = &xc3028_agc_config,
+ .bw = &xc3028_bw_config,
+
+ .gpio_dir = DIB7000P_GPIO_DEFAULT_DIRECTIONS,
+ .gpio_val = DIB7000P_GPIO_DEFAULT_VALUES,
+ .gpio_pwm_pos = DIB7000P_GPIO_DEFAULT_PWM_POS,
+ };
+
+ static int stk7700ph_xc3028_callback(void *ptr, int command, int arg)
+ {
+ struct dvb_usb_adapter *adap = ptr;
+
+ switch (command) {
+ case XC2028_TUNER_RESET:
+ /* Send the tuner in then out of reset */
+ err("%s: XC2028_TUNER_RESET %d\n", __FUNCTION__, arg);
+ dib7000p_set_gpio(adap->fe, 8, 0, 0); msleep(10);
+ dib7000p_set_gpio(adap->fe, 8, 0, 1);
+ break;
+ case XC2028_RESET_CLK:
+ err("%s: XC2028_RESET_CLK %d\n", __FUNCTION__, arg);
+ break;
+ default:
+ err("%s: unknown command %d, arg %d\n", __FUNCTION__,
+ command, arg);
+ return -EINVAL;
+ }
+ return 0;
+ }
+
+ static struct xc2028_ctrl stk7700ph_xc3028_ctrl = {
+ .fname = XC2028_DEFAULT_FIRMWARE,
+ .max_len = 64,
+ };
+
+ static struct xc2028_config stk7700ph_xc3028_config = {
+ .i2c_addr = 0x61,
+ .callback = stk7700ph_xc3028_callback,
+ .ctrl = &stk7700ph_xc3028_ctrl,
+ };
+
+ static int stk7700ph_frontend_attach(struct dvb_usb_adapter *adap)
+ {
+ /* this is at the moment just a copy of stk7700p_frontend_attach */
+ dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 0);
+ dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 0); msleep(50);
+
+ if (adap->dev->udev->descriptor.idVendor == USB_VID_PINNACLE &&
+ adap->dev->udev->descriptor.idProduct == USB_PID_PINNACLE_EXPRESSCARD_320CX) {
+ msleep(10);
+ }
+ else {
+ dib0700_set_gpio(adap->dev, GPIO6, GPIO_OUT, 1); msleep(10);
+ }
+ dib0700_set_gpio(adap->dev, GPIO9, GPIO_OUT, 1);
+
+ dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 0); msleep(10);
+ dib0700_ctrl_clock(adap->dev, 72, 1);
+ dib0700_set_gpio(adap->dev, GPIO10, GPIO_OUT, 1); msleep(100);
+
+ dib0700_set_gpio(adap->dev, GPIO0, GPIO_OUT, 1);
+
+ dib7000p_i2c_enumeration(&adap->dev->i2c_adap, 1, 18, &stk7700ph_dib7700_xc3028_config);
+
+ adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x80,
+ &stk7700ph_dib7700_xc3028_config);
+
+ return adap->fe == NULL ? -ENODEV : 0;
+ }
+
+ static int stk7700ph_tuner_attach(struct dvb_usb_adapter *adap)
+ {
+ struct i2c_adapter *tun_i2c;
+
+ tun_i2c = dib7000p_get_i2c_master(adap->fe, DIBX000_I2C_INTERFACE_TUNER, 1);
+
+ stk7700ph_xc3028_config.i2c_adap = tun_i2c;
+ stk7700ph_xc3028_config.video_dev = adap;
+
+ return dvb_attach(xc2028_attach, adap->fe, &stk7700ph_xc3028_config) == NULL ?
+ -ENODEV : 0;
+ }
+
#define DEFAULT_RC_INTERVAL 150
static u8 rc_request[] = { REQUEST_POLL_RC, 0 };
***************
*** 905,910 ****
--- 1055,1062 ----
{ USB_DEVICE(USB_VID_ASUS, USB_PID_ASUS_U3100) },
/* 25 */ { USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_NOVA_T_STICK_3) },
{ USB_DEVICE(USB_VID_HAUPPAUGE, USB_PID_HAUPPAUGE_MYTV_T) },
+ { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_CINERGY_HT_USB_XE) },
+ { USB_DEVICE(USB_VID_PINNACLE, USB_PID_PINNACLE_EXPRESSCARD_320CX) },
{ 0 } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table);
***************
*** 1155,1161 ****
{ NULL },
}
}
! },
};
int dib0700_device_count = ARRAY_SIZE(dib0700_devices);
--- 1307,1343 ----
{ NULL },
}
}
! }, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
!
! .num_adapters = 1,
! .adapter = {
! {
! .frontend_attach = stk7700ph_frontend_attach,
! .tuner_attach = stk7700ph_tuner_attach,
!
! DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
!
! .size_of_priv = sizeof(struct dib0700_adapter_state),
! },
! },
!
! .num_device_descs = 2,
! .devices = {
! { "Terratec Cinergy HT USB XE",
! { &dib0700_usb_id_table[27], NULL },
! { NULL },
! },
! {
! "Pinnacle Expresscard 320cx",
! { &dib0700_usb_id_table[28], NULL },
! { NULL },
! },
! },
! .rc_interval = DEFAULT_RC_INTERVAL,
! .rc_key_map = dib0700_rc_keys,
! .rc_key_map_size = ARRAY_SIZE(dib0700_rc_keys),
! .rc_query = dib0700_rc_query
! },
};
int dib0700_device_count = ARRAY_SIZE(dib0700_devices);
diff -crB v4l-dvb-orig/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h v4l-cyn/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
*** v4l-dvb-orig/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2008-03-18 18:49:45.000000000 +0100
--- v4l-cyn/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2008-03-18 20:51:47.000000000 +0100
***************
*** 46,52 ****
#define USB_VID_ULTIMA_ELECTRONIC 0x05d8
#define USB_VID_UNIWILL 0x1584
#define USB_VID_WIDEVIEW 0x14aa
- /* dom : pour gigabyte u7000 */
#define USB_VID_GIGABYTE 0x1044
--- 46,51 ----
***************
*** 135,140 ****
--- 134,141 ----
#define USB_PID_AVERMEDIA_VOLAR 0xa807
#define USB_PID_AVERMEDIA_VOLAR_2 0xb808
#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY 0x005a
+ #define USB_PID_TERRATEC_CINERGY_HT_USB_XE 0x0058
+ #define USB_PID_PINNACLE_EXPRESSCARD_320CX 0x022e
#define USB_PID_PINNACLE_PCTV2000E 0x022c
#define USB_PID_PINNACLE_PCTV_DVB_T_FLASH 0x0228
#define USB_PID_PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T 0x0229
***************
*** 183,189 ****
#define USB_PID_OPERA1_WARM 0x3829
#define USB_PID_LIFEVIEW_TV_WALKER_TWIN_COLD 0x0514
#define USB_PID_LIFEVIEW_TV_WALKER_TWIN_WARM 0x0513
- /* dom pour gigabyte u7000 */
#define USB_PID_GIGABYTE_U7000 0x7001
#define USB_PID_ASUS_U3000 0x171f
#define USB_PID_ASUS_U3100 0x173f
--- 184,189 ----
_______________________________________________ linux-dvb mailing list linux-dvb@xxxxxxxxxxx http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
