Skip to content

L
linux
Commit 89eeda67 authored by Stefan Ringel's avatar Stefan Ringel Committed by Mauro Carvalho Chehab
Browse files
Options

V4L/DVB: tm6000: remove hack.c hack.h, switch to zl10353 module 

"hack"  module were a temporary file with some zl10353 magic. This is not needed anymore.
Just remove it.

[mchehab@redhat.com: CodingStyle fixes]
Signed-off-by: default avatarStefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 49e5e03c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 457 deletions
drivers/staging/tm6000/Makefile
View file @ 89eeda67
...@@ -5,8 +5,7 @@ tm6000-objs := tm6000-cards.o \ ...@@ -5,8 +5,7 @@ tm6000-objs := tm6000-cards.o \
tm6000-stds.o tm6000-stds.o
ifeq ($(CONFIG_VIDEO_TM6000_DVB),y) ifeq ($(CONFIG_VIDEO_TM6000_DVB),y)
tm6000-objs += tm6000-dvb.o \ tm6000-objs += tm6000-dvb.o
hack.o
endif endif
obj-$(CONFIG_VIDEO_TM6000) += tm6000.o obj-$(CONFIG_VIDEO_TM6000) += tm6000.o
......
drivers/staging/tm6000/hack.c deleted 100644 → 0
View file @ 49e5e03c
/*
hack.h - hackish code that needs to be improved (or removed) at a
later point
Copyright (C) 2007 Michel Ludwig <michel.ludwig@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 2
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "hack.h"
#include "tm6000.h"
#include <linux/usb.h>
static inline int tm6000_snd_control_msg(struct tm6000_core *dev, __u8 request, __u16 value, __u16 index, void *data, __u16 size)
{
return tm6000_read_write_usb (dev, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, request, value, index, data, size);
}
static int pseudo_zl10353_pll(struct tm6000_core *tm6000_dev, struct dvb_frontend_parameters *p)
{
u8 *data = kzalloc(50*sizeof(u8), GFP_KERNEL);
printk(KERN_ALERT "should set frequency %u\n", p->frequency);
printk(KERN_ALERT "and bandwith %u\n", p->u.ofdm.bandwidth);
if(tm6000_dev->dvb->frontend->ops.tuner_ops.set_params) {
tm6000_dev->dvb->frontend->ops.tuner_ops.set_params(tm6000_dev->dvb->frontend, p);
}
else {
printk(KERN_ALERT "pseudo zl10353: couldn't set tuner parameters\n");
}
// init ZL10353
/* data[0] = 0x0b;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x501e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x80;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x551e, 0x00, data, 0x1);
msleep(100);
data[0] = 0x01;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0xea1e, 0x00, data, 0x1);
msleep(100);
data[0] = 0x00;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0xea1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x1c;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x561e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x40;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x5e1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x36;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x641e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x67;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x651e, 0x00, data, 0x1);
msleep(15);
data[0] = 0xe5;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x661e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x19;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x6c1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0xe9;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x6d1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x44;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x511e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x46;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x521e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x15;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x531e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x0f;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x541e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x75;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x5c1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x01;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x701e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x00;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x701e, 0x00, data, 0x1);
msleep(15);
msleep(50);
switch(p->u.ofdm.bandwidth) {
case BANDWIDTH_8_MHZ:
data[0] = 0x00;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x701e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x36;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x641e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x67;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x651e, 0x00, data, 0x1);
msleep(15);
data[0] = 0xe5;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x661e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x19;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x6c1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0xe9;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x6d1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x44;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x511e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x46;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x521e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x15;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x531e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x0f;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x541e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x75;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x5c1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x01;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x701e, 0x00, data, 0x1);
msleep(15);
break;
default:
printk(KERN_ALERT "tm6000: bandwidth not supported\n");
case BANDWIDTH_7_MHZ:
data[0] = 0x00;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x701e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x35;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x641e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x5a;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x651e, 0x00, data, 0x1);
msleep(15);
data[0] = 0xe9;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x661e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x19;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x6c1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0xe9;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x6d1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x44;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x511e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x46;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x521e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x15;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x531e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x0f;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x541e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x86;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x5c1e, 0x00, data, 0x1);
msleep(15);
data[0] = 0x01;
ret = tm6000_snd_control_msg(tm6000_dev, 0x10, 0x701e, 0x00, data, 0x1);
msleep(15);
break;
}
*/
switch(p->u.ofdm.bandwidth) {
case BANDWIDTH_8_MHZ:
data[0] = 0x03;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x501e,0,data,1);
msleep(40);
data[0] = 0x44;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x511e,0,data,1);
msleep(40);
data[0] = 0x40;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x551e,0,data,1);
msleep(40);
data[0] = 0x46;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x521e,0,data,1);
msleep(40);
data[0] = 0x15;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x531e,0,data,1);
msleep(40);
data[0] = 0x0f;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x541e,0,data,1);
msleep(40);
data[0] = 0x80;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x551e,0,data,1);
msleep(40);
data[0] = 0x01;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0xea1e,0,data,1);
msleep(40);
data[0] = 0x00;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0xea1e,0,data,1);
msleep(40);
data[0] = 0x8b;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x631e,0,data,1);
msleep(40);
data[0] = 0x75;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0xcc1e,0,data,1);
msleep(40);
data[0] = 0xe6; //0x19;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x6c1e,0,data,1);
msleep(40);
data[0] = 0x09; //0xf7;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x6d1e,0,data,1);
msleep(40);
data[0] = 0x67;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x651e,0,data,1);
msleep(40);
data[0] = 0xe5;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x661e,0,data,1);
msleep(40);
data[0] = 0x75;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x5c1e,0,data,1);
msleep(40);
data[0] = 0x17;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x5f1e,0,data,1);
msleep(40);
data[0] = 0x40;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x5e1e,0,data,1);
msleep(40);
data[0] = 0x01;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x701e,0,data,1);
msleep(40);
break;
case BANDWIDTH_7_MHZ:
data[0] = 0x03;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x501e,0,data,1);
msleep(40);
data[0] = 0x44;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x511e,0,data,1);
msleep(40);
data[0] = 0x40;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x551e,0,data,1);
msleep(40);
data[0] = 0x46;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x521e,0,data,1);
msleep(40);
data[0] = 0x15;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x531e,0,data,1);
msleep(40);
data[0] = 0x0f;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x541e,0,data,1);
msleep(40);
data[0] = 0x80;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x551e,0,data,1);
msleep(40);
data[0] = 0x01;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0xea1e,0,data,1);
msleep(40);
data[0] = 0x00;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0xea1e,0,data,1);
msleep(40);
data[0] = 0x83;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x631e,0,data,1);
msleep(40);
data[0] = 0xa3;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0xcc1e,0,data,1);
msleep(40);
data[0] = 0xe6; //0x19;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x6c1e,0,data,1);
msleep(40);
data[0] = 0x09; //0xf7;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x6d1e,0,data,1);
msleep(40);
data[0] = 0x5a;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x651e,0,data,1);
msleep(40);
data[0] = 0xe9;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x661e,0,data,1);
msleep(40);
data[0] = 0x86;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x5c1e,0,data,1);
msleep(40);
data[0] = 0x17;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x5f1e,0,data,1);
msleep(40);
data[0] = 0x40;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x5e1e,0,data,1);
msleep(40);
data[0] = 0x01;
tm6000_read_write_usb(tm6000_dev,0x40,0x10,0x701e,0,data,1);
msleep(40);
break;
default:
printk(KERN_ALERT "tm6000: bandwidth not supported\n");
}
tm6000_read_write_usb(tm6000_dev,0xc0,0x10,0x051f,0,data,2);
printk(KERN_INFO "buf %#x %#x \n", data[0], data[1]);
msleep(40);
tm6000_read_write_usb(tm6000_dev,0xc0,0x10,0x051f,0,data,2);
printk(KERN_INFO "buf %#x %#x \n", data[0], data[1]);
msleep(40);
tm6000_read_write_usb(tm6000_dev,0xc0,0x10,0x051f,0,data,2);
printk(KERN_INFO "buf %#x %#x \n", data[0], data[1]);
msleep(40);
tm6000_read_write_usb(tm6000_dev,0xc0,0x10,0x051f,0,data,2);
printk(KERN_INFO "buf %#x %#x \n", data[0], data[1]);
msleep(40);
tm6000_read_write_usb(tm6000_dev,0xc0,0x10,0x051f,0,data,2);
printk(KERN_INFO "buf %#x %#x \n", data[0], data[1]);
msleep(40);
tm6000_read_write_usb(tm6000_dev,0xc0,0x10,0x0f1f,0,data,2);
printk(KERN_INFO "buf %#x %#x \n", data[0], data[1]);
msleep(40);
tm6000_read_write_usb(tm6000_dev,0xc0,0x10,0x091f,0,data,2);
printk(KERN_INFO "buf %#x %#x \n", data[0], data[1]);
msleep(40);
tm6000_read_write_usb(tm6000_dev,0xc0,0x10,0x0b1f,0,data,2);
printk(KERN_INFO "buf %#x %#x \n", data[0], data[1]);
msleep(40);
kfree(data);
return 0;
};
int pseudo_zl10353_set_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{
struct tm6000_core *tm6000_dev = fe->dvb->priv;
u32 status;
if(p != NULL) {
// mutex_lock(&tm6000_dev->mutex);
pseudo_zl10353_pll(tm6000_dev, p);
// mutex_unlock(&tm6000_dev->mutex);
}
if(tm6000_dev->dvb->frontend->ops.read_status) {
tm6000_dev->dvb->frontend->ops.read_status(tm6000_dev->dvb->frontend, &status);
printk(KERN_ALERT "demodulator status: FE_HAS_CARRIER %i \n", (status & FE_HAS_CARRIER));
printk(KERN_ALERT "demodulator status: FE_HAS_VITERBI %i \n", (status & FE_HAS_VITERBI));
printk(KERN_ALERT "demodulator status: FE_HAS_LOCK %i \n", (status & FE_HAS_LOCK));
printk(KERN_ALERT "demodulator status: FE_HAS_SYNC %i \n", (status & FE_HAS_SYNC));
printk(KERN_ALERT "demodulator status: FE_HAS_SIGNAL %i \n", (status & FE_HAS_SIGNAL));
}
else {
printk(KERN_ALERT "pseudo zl10353: couldn't read demodulator status\n");
}
return 0;
}
int pseudo_zl10353_read_status(struct dvb_frontend *fe, fe_status_t *status)
{
*status = FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK | FE_HAS_SIGNAL;
return 0;
}
struct dvb_frontend* pseudo_zl10353_attach(struct tm6000_core *dev,
const struct zl10353_config *config,
struct i2c_adapter *i2c)
{
struct tm6000_dvb *dvb = dev->dvb;
dvb->frontend = dvb_attach(zl10353_attach, config, i2c);
if(!dvb->frontend) {
printk(KERN_ERR "Error during zl10353_attach!\n");
return NULL;
}
/* override some functions with our implementations */
dvb->frontend->ops.set_frontend = pseudo_zl10353_set_frontend;
dvb->frontend->ops.read_status = pseudo_zl10353_read_status;
dvb->frontend->frontend_priv = dev;
return dvb->frontend;
}
drivers/staging/tm6000/hack.h deleted 100644 → 0
View file @ 49e5e03c
/*
hack.h - hackish code that needs to be improved (or removed) at a
later point
Copyright (C) 2007 Michel Ludwig <michel.ludwig@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation version 2
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef HACK_H
#define HACK_H
#include <linux/i2c.h>
#include "zl10353.h"
#include "dvb_frontend.h"
struct tm6000_core;
int pseudo_zl103530_init(struct dvb_frontend *fe);
int pseudo_zl10353_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p);
int pseudo_zl10353_read_status(struct dvb_frontend *fe, fe_status_t *status);
int pseudo_zl10353_read_signal_strength(struct dvb_frontend* fe, u16* strength);
int pseudo_zl10353_read_snr(struct dvb_frontend *fe, u16 *snr);
struct dvb_frontend* pseudo_zl10353_attach(struct tm6000_core *dev,
const struct zl10353_config *config,
struct i2c_adapter *i2c);
#endif
drivers/staging/tm6000/tm6000-dvb.c
View file @ 89eeda67
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#include "tm6000.h" #include "tm6000.h"
#include "tm6000-regs.h" #include "tm6000-regs.h"
#include "hack.h"
#include "zl10353.h" #include "zl10353.h"
#include <media/tuner.h> #include <media/tuner.h>
...@@ -222,8 +220,7 @@ int tm6000_dvb_attach_frontend(struct tm6000_core *dev) ...@@ -222,8 +220,7 @@ int tm6000_dvb_attach_frontend(struct tm6000_core *dev)
.disable_i2c_gate_ctrl = 1, .disable_i2c_gate_ctrl = 1,
}; };
dvb->frontend = pseudo_zl10353_attach(dev, &config, dvb->frontend = dvb_attach(zl10353_attach, &config,
/* dvb->frontend = dvb_attach (zl10353_attach, &config, */
&dev->i2c_adap); &dev->i2c_adap);
} }
else { else {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7