diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-04-17 19:21:31 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-04-17 19:21:31 +0200 |
| commit | 21a8c2c3ec37a8d79151fd37849cf41877514fbf (patch) | |
| tree | 4c3dcb0f072ea0aebda651b88abd0463ec7482e8 /linux/drivers/media/dvb/dvb-usb | |
| parent | afdbbc48eaea9b0d9a539643a88aa5a74a63dde3 (diff) | |
| download | mediapointer-dvb-s2-21a8c2c3ec37a8d79151fd37849cf41877514fbf.tar.gz mediapointer-dvb-s2-21a8c2c3ec37a8d79151fd37849cf41877514fbf.tar.bz2 | |
MT2060: Code cleanups, adding to new build-mechanism
From: Patrick Boettcher <pb@linuxtv.org>
Some minor code cleanups and added the MT2060 to new v4l-dvb-build-system, preliminarily under dvb/frontends.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/Kconfig | 5 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dibusb-common.c | 14 |
2 files changed, 12 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/Kconfig b/linux/drivers/media/dvb/dvb-usb/Kconfig index d3df12039..ed8129f2f 100644 --- a/linux/drivers/media/dvb/dvb-usb/Kconfig +++ b/linux/drivers/media/dvb/dvb-usb/Kconfig @@ -25,6 +25,7 @@ config DVB_USB_A800 tristate "AVerMedia AverTV DVB-T USB 2.0 (A800)" depends on DVB_USB select DVB_DIB3000MC + select DVB_TUNER_MT2060 help Say Y here to support the AVerMedia AverTV DVB-T USB 2.0 (A800) receiver. @@ -32,6 +33,7 @@ config DVB_USB_DIBUSB_MB tristate "DiBcom USB DVB-T devices (based on the DiB3000M-B) (see help for device list)" depends on DVB_USB select DVB_DIB3000MB + select DVB_TUNER_MT2060 help Support for USB 1.1 and 2.0 DVB-T receivers based on reference designs made by DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-B demodulator. @@ -64,6 +66,7 @@ config DVB_USB_DIBUSB_MC tristate "DiBcom USB DVB-T devices (based on the DiB3000M-C/P) (see help for device list)" depends on DVB_USB select DVB_DIB3000MC + select DVB_TUNER_MT2060 help Support for 2.0 DVB-T receivers based on reference designs made by DiBcom (<http://www.dibcom.fr>) equipped with a DiB3000M-C/P demodulator. @@ -79,6 +82,7 @@ config DVB_USB_UMT_010 tristate "HanfTek UMT-010 DVB-T USB2.0 support" depends on DVB_USB select DVB_DIB3000MC + select DVB_TUNER_MT2060 help Say Y here to support the HanfTek UMT-010 USB2.0 stick-sized DVB-T receiver. @@ -134,6 +138,7 @@ config DVB_USB_NOVA_T_USB2 tristate "Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 support" depends on DVB_USB select DVB_DIB3000MC + select DVB_TUNER_MT2060 help Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver. diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c index 88062b219..0111f3216 100644 --- a/linux/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/linux/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -235,7 +235,7 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d) { int ret; u8 a,b; - u16 if1=1220; + u16 if1 = 1220; if (d->tuner_pass_ctrl) { struct dibusb_state *st = d->priv; @@ -243,17 +243,17 @@ int dibusb_dib3000mc_tuner_attach (struct dvb_usb_device *d) // First IF calibration for Liteon Sticks if (d->udev->descriptor.idVendor == USB_VID_LITEON && d->udev->descriptor.idProduct == USB_PID_LITEON_DVB_T_WARM) { + dibusb_read_eeprom_byte(d,0x7E,&a); dibusb_read_eeprom_byte(d,0x7F,&b); - if (a == 0xFF && b == 0xFF) { + + if (a == 0xFF && b == 0xFF) if1 = 1220; - } else - if (a == 0x00) { + else if (a == 0x00) if1 = 1220+b; - } else - if (a == 0x80) { + else if (a == 0x80) if1 = 1220-b; - } else { + else { warn("LITE-ON DVB-T Tuner : Strange IF1 calibration :%2X %2X\n",(int)a,(int)b); if1 = 1220; } |