Skip to content

L
linux
Commit a8ce6c87 authored by Michael Hunold's avatar Michael Hunold Committed by Linus Torvalds
Browse files
Options

[PATCH] DVB: rework debugging in av7110 

- [DVB] av7110: switch from stupid DEB_xx() debug macros to saner dprintk() style debugging
- [DVB] av7110: fix dvb-ttpci ca write() polling
- [DVB] budget: switch from stupid DEB_xx() debug macros to saner dprintk() style debugging
Signed-off-by: default avatarMichael Hunold <hunold@linuxtv.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 297f778c
Hide whitespace changes
Inline Side-by-side
Showing with 222 additions and 246 deletions
drivers/media/dvb/ttpci/av7110.c
View file @ a8ce6c87
...@@ -67,7 +67,8 @@ ...@@ -67,7 +67,8 @@
#include "av7110_ca.h" #include "av7110_ca.h"
#include "av7110_ipack.h" #include "av7110_ipack.h"
static int av7110_debug; int av7110_debug;
static int vidmode=CVBS_RGB_OUT; static int vidmode=CVBS_RGB_OUT;
static int pids_off; static int pids_off;
static int adac=DVB_ADAC_TI; static int adac=DVB_ADAC_TI;
...@@ -110,7 +111,7 @@ static void init_av7110_av(struct av7110 *av7110) ...@@ -110,7 +111,7 @@ static void init_av7110_av(struct av7110 *av7110)
av7110->has_analog_tuner = 0; av7110->has_analog_tuner = 0;
av7110->current_input = 0; av7110->current_input = 0;
if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) { if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) {
printk ("av7110(%d): Crystal audio DAC detected\n", printk ("dvb-ttpci: Crystal audio DAC @ card %d detected\n",
av7110->dvb_adapter->num); av7110->dvb_adapter->num);
av7110->adac_type = DVB_ADAC_CRYSTAL; av7110->adac_type = DVB_ADAC_CRYSTAL;
i2c_writereg(av7110, 0x20, 0x01, 0xd2); i2c_writereg(av7110, 0x20, 0x01, 0xd2);
...@@ -125,13 +126,13 @@ static void init_av7110_av(struct av7110 *av7110) ...@@ -125,13 +126,13 @@ static void init_av7110_av(struct av7110 *av7110)
/* done. */ /* done. */
} }
else if (dev->pci->subsystem_vendor == 0x110a) { else if (dev->pci->subsystem_vendor == 0x110a) {
printk("av7110(%d): DVB-C w/o analog module detected\n", printk("dvb-ttpci: DVB-C w/o analog module @ card %d detected\n",
av7110->dvb_adapter->num); av7110->dvb_adapter->num);
av7110->adac_type = DVB_ADAC_NONE; av7110->adac_type = DVB_ADAC_NONE;
} }
else { else {
av7110->adac_type = adac; av7110->adac_type = adac;
printk("av7110(%d): adac type set to %d\n", printk("dvb-ttpci: adac type set to %d @ card %d\n",
av7110->dvb_adapter->num, av7110->adac_type); av7110->dvb_adapter->num, av7110->adac_type);
} }
...@@ -150,7 +151,7 @@ static void init_av7110_av(struct av7110 *av7110) ...@@ -150,7 +151,7 @@ static void init_av7110_av(struct av7110 *av7110)
static void recover_arm(struct av7110 *av7110) static void recover_arm(struct av7110 *av7110)
{ {
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n",av7110);
av7110_bootarm(av7110); av7110_bootarm(av7110);
msleep(100); msleep(100);
...@@ -160,7 +161,7 @@ static void recover_arm(struct av7110 *av7110) ...@@ -160,7 +161,7 @@ static void recover_arm(struct av7110 *av7110)
static void arm_error(struct av7110 *av7110) static void arm_error(struct av7110 *av7110)
{ {
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n",av7110);
av7110->arm_errors++; av7110->arm_errors++;
av7110->arm_ready=0; av7110->arm_ready=0;
...@@ -173,7 +174,7 @@ static int arm_thread(void *data) ...@@ -173,7 +174,7 @@ static int arm_thread(void *data)
u16 newloops = 0; u16 newloops = 0;
int timeout; int timeout;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n",av7110);
lock_kernel (); lock_kernel ();
daemonize ("arm_mon"); daemonize ("arm_mon");
...@@ -199,7 +200,7 @@ static int arm_thread(void *data) ...@@ -199,7 +200,7 @@ static int arm_thread(void *data)
up(&av7110->dcomlock); up(&av7110->dcomlock);
if (newloops==av7110->arm_loops) { if (newloops==av7110->arm_loops) {
printk(KERN_ERR "av7110%d: ARM crashed!\n", printk(KERN_ERR "dvb-ttpci: ARM crashed @ card %d\n",
av7110->dvb_adapter->num); av7110->dvb_adapter->num);
arm_error(av7110); arm_error(av7110);
...@@ -231,7 +232,7 @@ void av7110_setup_irc_config (struct av7110 *av7110, u32 ir_config) ...@@ -231,7 +232,7 @@ void av7110_setup_irc_config (struct av7110 *av7110, u32 ir_config)
{ {
static struct av7110 *last; static struct av7110 *last;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n",av7110);
if (!av7110) if (!av7110)
av7110 = last; av7110 = last;
...@@ -248,13 +249,13 @@ static void (*irc_handler)(u32); ...@@ -248,13 +249,13 @@ static void (*irc_handler)(u32);
void av7110_register_irc_handler(void (*func)(u32)) void av7110_register_irc_handler(void (*func)(u32))
{ {
DEB_EE(("registering %p\n", func)); dprintk(4, "registering %p\n", func);
irc_handler = func; irc_handler = func;
} }
void av7110_unregister_irc_handler(void (*func)(u32)) void av7110_unregister_irc_handler(void (*func)(u32))
{ {
DEB_EE(("unregistering %p\n", func)); dprintk(4, "unregistering %p\n", func);
irc_handler = NULL; irc_handler = NULL;
} }
...@@ -268,7 +269,7 @@ DECLARE_TASKLET(irtask,run_handlers,0); ...@@ -268,7 +269,7 @@ DECLARE_TASKLET(irtask,run_handlers,0);
void IR_handle(struct av7110 *av7110, u32 ircom) void IR_handle(struct av7110 *av7110, u32 ircom)
{ {
DEB_S(("av7110: ircommand = %08x\n", ircom)); dprintk(4, "ircommand = %08x\n", ircom);
irtask.data = (unsigned long) ircom; irtask.data = (unsigned long) ircom;
tasklet_schedule(&irtask); tasklet_schedule(&irtask);
} }
...@@ -283,8 +284,6 @@ static inline int DvbDmxFilterCallback(u8 * buffer1, size_t buffer1_len, ...@@ -283,8 +284,6 @@ static inline int DvbDmxFilterCallback(u8 * buffer1, size_t buffer1_len,
enum dmx_success success, enum dmx_success success,
struct av7110 *av7110) struct av7110 *av7110)
{ {
DEB_INT(("av7110: %p\n",av7110));
if (!dvbdmxfilter->feed->demux->dmx.frontend) if (!dvbdmxfilter->feed->demux->dmx.frontend)
return 0; return 0;
if (dvbdmxfilter->feed->demux->dmx.frontend->source==DMX_MEMORY_FE) if (dvbdmxfilter->feed->demux->dmx.frontend->source==DMX_MEMORY_FE)
...@@ -344,7 +343,7 @@ static void debiirq (unsigned long data) ...@@ -344,7 +343,7 @@ static void debiirq (unsigned long data)
int type=av7110->debitype; int type=av7110->debitype;
int handle=(type>>8)&0x1f; int handle=(type>>8)&0x1f;
// DEB_EE(("av7110: %p\n",av7110)); // dprintk(4, "%p\n",av7110);
print_time("debi"); print_time("debi");
saa7146_write(av7110->dev, IER, saa7146_write(av7110->dev, IER,
...@@ -476,10 +475,8 @@ static void gpioirq (unsigned long data) ...@@ -476,10 +475,8 @@ static void gpioirq (unsigned long data)
u32 rxbuf, txbuf; u32 rxbuf, txbuf;
int len; int len;
//printk("GPIO0 irq\n");
if (av7110->debitype !=-1) if (av7110->debitype !=-1)
printk("GPIO0 irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n", printk("dvb-ttpci: GPIO0 irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n",
jiffies, saa7146_read(av7110->dev, PSR), jiffies, saa7146_read(av7110->dev, PSR),
saa7146_read(av7110->dev, SSR)); saa7146_read(av7110->dev, SSR));
...@@ -497,10 +494,10 @@ static void gpioirq (unsigned long data) ...@@ -497,10 +494,10 @@ static void gpioirq (unsigned long data)
txbuf=irdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2); txbuf=irdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
len = (av7110->debilen + 3) & ~3; len = (av7110->debilen + 3) & ~3;
// DEB_D(("GPIO0 irq %d %d\n", av7110->debitype, av7110->debilen)); // dprintk(8, "GPIO0 irq %d %d\n", av7110->debitype, av7110->debilen);
print_time("gpio"); print_time("gpio");
// DEB_D(("GPIO0 irq %02x\n", av7110->debitype&0xff)); // dprintk(8, "GPIO0 irq %02x\n", av7110->debitype&0xff);
switch (av7110->debitype&0xff) { switch (av7110->debitype&0xff) {
case DATA_TS_PLAY: case DATA_TS_PLAY:
...@@ -519,10 +516,10 @@ static void gpioirq (unsigned long data) ...@@ -519,10 +516,10 @@ static void gpioirq (unsigned long data)
iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2); iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
av7110->video_size.h = h_ar & 0xfff; av7110->video_size.h = h_ar & 0xfff;
DEB_D(("GPIO0 irq: DATA_MPEG_VIDEO_EVENT: w/h/ar = %u/%u/%u\n", dprintk(8, "GPIO0 irq: DATA_MPEG_VIDEO_EVENT: w/h/ar = %u/%u/%u\n",
av7110->video_size.w, av7110->video_size.w,
av7110->video_size.h, av7110->video_size.h,
av7110->video_size.aspect_ratio)); av7110->video_size.aspect_ratio);
event.type = VIDEO_EVENT_SIZE_CHANGED; event.type = VIDEO_EVENT_SIZE_CHANGED;
event.u.size.w = av7110->video_size.w; event.u.size.w = av7110->video_size.w;
...@@ -610,7 +607,7 @@ static void gpioirq (unsigned long data) ...@@ -610,7 +607,7 @@ static void gpioirq (unsigned long data)
iwdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2); iwdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
break; break;
} }
DEB_D(("GPIO0 PES_PLAY len=%04x\n", len)); dprintk(8, "GPIO0 PES_PLAY len=%04x\n", len);
iwdebi(av7110, DEBINOSWAP, TX_LEN, len, 2); iwdebi(av7110, DEBINOSWAP, TX_LEN, len, 2);
iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, len, 2); iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, len, 2);
saa7146_wait_for_debi_done(av7110->dev); saa7146_wait_for_debi_done(av7110->dev);
...@@ -688,7 +685,7 @@ static void gpioirq (unsigned long data) ...@@ -688,7 +685,7 @@ static void gpioirq (unsigned long data)
break; break;
default: default:
printk("gpioirq unknown type=%d len=%d\n", printk("dvb-ttpci: gpioirq unknown type=%d len=%d\n",
av7110->debitype, av7110->debilen); av7110->debitype, av7110->debilen);
break; break;
} }
...@@ -705,7 +702,7 @@ static int dvb_osd_ioctl(struct inode *inode, struct file *file, ...@@ -705,7 +702,7 @@ static int dvb_osd_ioctl(struct inode *inode, struct file *file,
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
if (cmd == OSD_SEND_CMD) if (cmd == OSD_SEND_CMD)
return av7110_osd_cmd(av7110, (osd_cmd_t *) parg); return av7110_osd_cmd(av7110, (osd_cmd_t *) parg);
...@@ -736,7 +733,7 @@ static struct dvb_device dvbdev_osd = { ...@@ -736,7 +733,7 @@ static struct dvb_device dvbdev_osd = {
static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
u16 subpid, u16 pcrpid) u16 subpid, u16 pcrpid)
{ {
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
if (vpid == 0x1fff || apid == 0x1fff || if (vpid == 0x1fff || apid == 0x1fff ||
ttpid == 0x1fff || subpid == 0x1fff || pcrpid == 0x1fff) { ttpid == 0x1fff || subpid == 0x1fff || pcrpid == 0x1fff) {
...@@ -754,7 +751,7 @@ static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, ...@@ -754,7 +751,7 @@ static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
void ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, void ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
u16 subpid, u16 pcrpid) u16 subpid, u16 pcrpid)
{ {
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
if (down_interruptible(&av7110->pid_mutex)) if (down_interruptible(&av7110->pid_mutex))
return; return;
...@@ -793,7 +790,7 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter) ...@@ -793,7 +790,7 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
// u16 mode=0x0320; // u16 mode=0x0320;
u16 mode=0xb96a; u16 mode=0xb96a;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
if (dvbdmxfilter->type == DMX_TYPE_SEC) { if (dvbdmxfilter->type == DMX_TYPE_SEC) {
if (hw_sections) { if (hw_sections) {
...@@ -817,7 +814,7 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter) ...@@ -817,7 +814,7 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
ret = av7110_fw_request(av7110, buf, 20, &handle, 1); ret = av7110_fw_request(av7110, buf, 20, &handle, 1);
if (ret < 0) { if (ret < 0) {
printk("StartHWFilter error\n"); dprintk(1, "StartHWFilter error\n");
return ret; return ret;
} }
...@@ -835,13 +832,11 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter) ...@@ -835,13 +832,11 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
int ret; int ret;
u16 handle; u16 handle;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
handle = dvbdmxfilter->hw_handle; handle = dvbdmxfilter->hw_handle;
if (handle > 32) { if (handle > 32) {
DEB_S(("dvb: StopHWFilter tried to stop invalid filter %d.\n", dprintk(1, "StopHWFilter tried to stop invalid filter %d, filter type = %d\n", handle, dvbdmxfilter->type);
handle));
DEB_S(("dvb: filter type = %d\n", dvbdmxfilter->type));
return 0; return 0;
} }
...@@ -852,10 +847,10 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter) ...@@ -852,10 +847,10 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
buf[2] = handle; buf[2] = handle;
ret = av7110_fw_request(av7110, buf, 3, answ, 2); ret = av7110_fw_request(av7110, buf, 3, answ, 2);
if (ret) if (ret)
printk("StopHWFilter error\n"); dprintk(1, "StopHWFilter error\n");
if (answ[1] != handle) { if (answ[1] != handle) {
DEB_S(("dvb: filter %d shutdown error :%d\n", handle, answ[1])); dprintk(2, "filter %d shutdown error :%d\n", handle, answ[1]);
ret = -1; ret = -1;
} }
return ret; return ret;
...@@ -869,7 +864,7 @@ static void dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed) ...@@ -869,7 +864,7 @@ static void dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
u16 *pid = dvbdmx->pids, npids[5]; u16 *pid = dvbdmx->pids, npids[5];
int i; int i;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
npids[0] = npids[1] = npids[2] = npids[3] = npids[4] = 0xffff; npids[0] = npids[1] = npids[2] = npids[3] = npids[4] = 0xffff;
i = dvbdmxfeed->pes_type; i = dvbdmxfeed->pes_type;
...@@ -902,7 +897,7 @@ static void dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed) ...@@ -902,7 +897,7 @@ static void dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)
u16 *pid = dvbdmx->pids, npids[5]; u16 *pid = dvbdmx->pids, npids[5];
int i; int i;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
if (dvbdmxfeed->pes_type <= 1) { if (dvbdmxfeed->pes_type <= 1) {
av7110_av_stop(av7110, dvbdmxfeed->pes_type ? RP_VIDEO : RP_AUDIO); av7110_av_stop(av7110, dvbdmxfeed->pes_type ? RP_VIDEO : RP_AUDIO);
...@@ -935,7 +930,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed) ...@@ -935,7 +930,7 @@ static int av7110_start_feed(struct dvb_demux_feed *feed)
struct dvb_demux *demux = feed->demux; struct dvb_demux *demux = feed->demux;
struct av7110 *av7110 = (struct av7110 *) demux->priv; struct av7110 *av7110 = (struct av7110 *) demux->priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
if (!demux->dmx.frontend) if (!demux->dmx.frontend)
return -EINVAL; return -EINVAL;
...@@ -993,7 +988,7 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) ...@@ -993,7 +988,7 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed)
struct dvb_demux *demux = feed->demux; struct dvb_demux *demux = feed->demux;
struct av7110 *av7110 = (struct av7110 *) demux->priv; struct av7110 *av7110 = (struct av7110 *) demux->priv;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
if (feed->type == DMX_TYPE_TS) { if (feed->type == DMX_TYPE_TS) {
if (feed->ts_type & TS_DECODER) { if (feed->ts_type & TS_DECODER) {
...@@ -1035,7 +1030,7 @@ static void restart_feeds(struct av7110 *av7110) ...@@ -1035,7 +1030,7 @@ static void restart_feeds(struct av7110 *av7110)
int mode; int mode;
int i; int i;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
mode = av7110->playing; mode = av7110->playing;
av7110->playing = 0; av7110->playing = 0;
...@@ -1068,7 +1063,7 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num, ...@@ -1068,7 +1063,7 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
BUG(); BUG();
av7110 = (struct av7110 *) dvbdemux->priv; av7110 = (struct av7110 *) dvbdemux->priv;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
if (num != 0) if (num != 0)
return -EINVAL; return -EINVAL;
...@@ -1078,14 +1073,14 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num, ...@@ -1078,14 +1073,14 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
printk(KERN_ERR "%s: av7110_fw_request error\n", __FUNCTION__); printk(KERN_ERR "%s: av7110_fw_request error\n", __FUNCTION__);
return -EIO; return -EIO;
} }
DEB_EE(("av7110: fwstc = %04hx %04hx %04hx %04hx\n", dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n",
fwstc[0], fwstc[1], fwstc[2], fwstc[3])); fwstc[0], fwstc[1], fwstc[2], fwstc[3]);
*stc = (((uint64_t) ((fwstc[3] & 0x8000) >> 15)) << 32) | *stc = (((uint64_t) ((fwstc[3] & 0x8000) >> 15)) << 32) |
(((uint64_t) fwstc[1]) << 16) | ((uint64_t) fwstc[0]); (((uint64_t) fwstc[1]) << 16) | ((uint64_t) fwstc[0]);
*base = 1; *base = 1;
DEB_EE(("av7110: stc = %lu\n", (unsigned long)*stc)); dprintk(4, "stc = %lu\n", (unsigned long)*stc);
return 0; return 0;
} }
...@@ -1099,7 +1094,7 @@ static int av7110_diseqc_ioctl(struct dvb_frontend *fe, unsigned int cmd, void * ...@@ -1099,7 +1094,7 @@ static int av7110_diseqc_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *
{ {
struct av7110 *av7110 = fe->before_after_data; struct av7110 *av7110 = fe->before_after_data;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
switch (cmd) { switch (cmd) {
case FE_SET_TONE: case FE_SET_TONE:
...@@ -1138,7 +1133,7 @@ static void av7110_before_after_tune (fe_status_t s, void *data) ...@@ -1138,7 +1133,7 @@ static void av7110_before_after_tune (fe_status_t s, void *data)
{ {
struct av7110 *av7110 = data; struct av7110 *av7110 = data;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
av7110->fe_synced = (s & FE_HAS_LOCK) ? 1 : 0; av7110->fe_synced = (s & FE_HAS_LOCK) ? 1 : 0;
...@@ -1168,7 +1163,7 @@ static int av7110_register(struct av7110 *av7110) ...@@ -1168,7 +1163,7 @@ static int av7110_register(struct av7110 *av7110)
int ret, i; int ret, i;
struct dvb_demux *dvbdemux=&av7110->demux; struct dvb_demux *dvbdemux=&av7110->demux;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
if (av7110->registered) if (av7110->registered)
return -1; return -1;
...@@ -1243,7 +1238,7 @@ static void dvb_unregister(struct av7110 *av7110) ...@@ -1243,7 +1238,7 @@ static void dvb_unregister(struct av7110 *av7110)
{ {
struct dvb_demux *dvbdemux=&av7110->demux; struct dvb_demux *dvbdemux=&av7110->demux;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
if (!av7110->registered) if (!av7110->registered)
return; return;
...@@ -1397,7 +1392,7 @@ static int get_firmware(struct av7110* av7110) ...@@ -1397,7 +1392,7 @@ static int get_firmware(struct av7110* av7110)
/* check if the firmware is available */ /* check if the firmware is available */
av7110->bin_fw = (unsigned char*) vmalloc(fw->size); av7110->bin_fw = (unsigned char*) vmalloc(fw->size);
if (NULL == av7110->bin_fw) { if (NULL == av7110->bin_fw) {
DEB_D(("out of memory\n")); dprintk(1, "out of memory\n");
release_firmware(fw); release_firmware(fw);
return -ENOMEM; return -ENOMEM;
} }
...@@ -1440,14 +1435,14 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d ...@@ -1440,14 +1435,14 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
struct av7110 *av7110 = NULL; struct av7110 *av7110 = NULL;
int ret = 0; int ret = 0;
DEB_EE(("dev: %p\n", dev)); dprintk(4, "dev: %p\n", dev);
/* prepare the av7110 device struct */ /* prepare the av7110 device struct */
if (!(av7110 = kmalloc (sizeof (struct av7110), GFP_KERNEL))) { if (!(av7110 = kmalloc (sizeof (struct av7110), GFP_KERNEL))) {
printk ("%s: out of memory!\n", __FUNCTION__); dprintk(1, "out of memory\n");
return -ENOMEM; return -ENOMEM;
} }
DEB_EE(("av7110: %p\n", av7110));
memset(av7110, 0, sizeof(struct av7110)); memset(av7110, 0, sizeof(struct av7110));
av7110->card_name = (char*)pci_ext->ext_priv; av7110->card_name = (char*)pci_ext->ext_priv;
...@@ -1547,11 +1542,11 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d ...@@ -1547,11 +1542,11 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
} }
if (FW_VERSION(av7110->arm_app)<0x2501) if (FW_VERSION(av7110->arm_app)<0x2501)
printk ("av7110: Warning, firmware version 0x%04x is too old. " printk ("dvb-ttpci: Warning, firmware version 0x%04x is too old. "
"System might be unstable!\n", FW_VERSION(av7110->arm_app)); "System might be unstable!\n", FW_VERSION(av7110->arm_app));
if (kernel_thread(arm_thread, (void *) av7110, 0) < 0) { if (kernel_thread(arm_thread, (void *) av7110, 0) < 0) {
printk(KERN_ERR "av7110(%d): faile to start arm_mon kernel thread\n", printk("dvb-ttpci: failed to start arm_mon kernel thread @ card %d\n",
av7110->dvb_adapter->num); av7110->dvb_adapter->num);
goto err2; goto err2;
} }
...@@ -1572,7 +1567,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d ...@@ -1572,7 +1567,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
if (ret) if (ret)
goto err3; goto err3;
printk(KERN_INFO "av7110: found av7110-%d.\n",av7110_num); printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num);
av7110->device_initialized = 1; av7110->device_initialized = 1;
av7110_num++; av7110_num++;
return 0; return 0;
...@@ -1604,7 +1599,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d ...@@ -1604,7 +1599,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
static int av7110_detach (struct saa7146_dev* saa) static int av7110_detach (struct saa7146_dev* saa)
{ {
struct av7110 *av7110 = (struct av7110*)saa->ext_priv; struct av7110 *av7110 = (struct av7110*)saa->ext_priv;
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
if( 0 == av7110->device_initialized ) { if( 0 == av7110->device_initialized ) {
return 0; return 0;
...@@ -1653,8 +1648,6 @@ static void av7110_irq(struct saa7146_dev* dev, u32 *isr) ...@@ -1653,8 +1648,6 @@ static void av7110_irq(struct saa7146_dev* dev, u32 *isr)
{ {
struct av7110 *av7110 = (struct av7110*)dev->ext_priv; struct av7110 *av7110 = (struct av7110*)dev->ext_priv;
// DEB_INT(("dev: %p, av7110: %p\n",dev,av7110));
if (*isr & MASK_19) if (*isr & MASK_19)
tasklet_schedule (&av7110->debi_tasklet); tasklet_schedule (&av7110->debi_tasklet);
......
drivers/media/dvb/ttpci/av7110.h
View file @ a8ce6c87
...@@ -27,6 +27,11 @@ ...@@ -27,6 +27,11 @@
#include <media/saa7146_vv.h> #include <media/saa7146_vv.h>
extern int av7110_debug;
#define dprintk(level,args...) \
do { if ((av7110_debug & level)) { printk("dvb-ttpci: %s(): ", __FUNCTION__); printk(args); } } while (0)
#define MAXFILT 32 #define MAXFILT 32
enum {AV_PES_STREAM, PS_STREAM, TS_STREAM, PES_STREAM}; enum {AV_PES_STREAM, PS_STREAM, TS_STREAM, PES_STREAM};
......
drivers/media/dvb/ttpci/av7110_av.c
View file @ a8ce6c87
...@@ -98,8 +98,6 @@ int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len) ...@@ -98,8 +98,6 @@ int av7110_record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len)
{ {
struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) p2t->priv; struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) p2t->priv;
// DEB_EE(("struct dvb_filter_pes2ts:%p\n", p2t));
if (!(dvbdmxfeed->ts_type & TS_PACKET)) if (!(dvbdmxfeed->ts_type & TS_PACKET))
return 0; return 0;
if (buf[3] == 0xe0) // video PES do not have a length in TS if (buf[3] == 0xe0) // video PES do not have a length in TS
...@@ -115,8 +113,6 @@ static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data) ...@@ -115,8 +113,6 @@ static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
{ {
struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) priv; struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *) priv;
// DEB_EE(("dvb_demux_feed:%p\n", dvbdmxfeed));
dvbdmxfeed->cb.ts(data, 188, NULL, 0, dvbdmxfeed->cb.ts(data, 188, NULL, 0,
&dvbdmxfeed->feed.ts, DMX_OK); &dvbdmxfeed->feed.ts, DMX_OK);
return 0; return 0;
...@@ -127,7 +123,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av, ...@@ -127,7 +123,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av,
{ {
struct dvb_demux *dvbdmx = dvbdmxfeed->demux; struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
DEB_EE(("av7110: %p, dvb_demux_feed:%p\n", av7110, dvbdmxfeed)); dprintk(2, "av7110:%p, , dvb_demux_feed:%p\n", av7110, dvbdmxfeed);
if (av7110->playing || (av7110->rec_mode & av)) if (av7110->playing || (av7110->rec_mode & av))
return -EBUSY; return -EBUSY;
...@@ -169,7 +165,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av, ...@@ -169,7 +165,7 @@ int av7110_av_start_record(struct av7110 *av7110, int av,
int av7110_av_start_play(struct av7110 *av7110, int av) int av7110_av_start_play(struct av7110 *av7110, int av)
{ {
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (av7110->rec_mode) if (av7110->rec_mode)
return -EBUSY; return -EBUSY;
...@@ -202,7 +198,7 @@ int av7110_av_start_play(struct av7110 *av7110, int av) ...@@ -202,7 +198,7 @@ int av7110_av_start_play(struct av7110 *av7110, int av)
void av7110_av_stop(struct av7110 *av7110, int av) void av7110_av_stop(struct av7110 *av7110, int av)
{ {
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (!(av7110->playing & av) && !(av7110->rec_mode & av)) if (!(av7110->playing & av) && !(av7110->rec_mode & av))
return; return;
...@@ -243,8 +239,6 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) ...@@ -243,8 +239,6 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
u32 sync; u32 sync;
u16 blen; u16 blen;
DEB_EE(("dvb_ring_buffer_t: %p\n", buf));
if (!dlen) { if (!dlen) {
wake_up(&buf->queue); wake_up(&buf->queue);
return -1; return -1;
...@@ -275,8 +269,8 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen) ...@@ -275,8 +269,8 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
dvb_ringbuffer_read(buf, dest, (size_t) blen, 0); dvb_ringbuffer_read(buf, dest, (size_t) blen, 0);
DEB_S(("pread=0x%08lx, pwrite=0x%08lx\n", dprintk(2, "pread=0x%08lx, pwrite=0x%08lx\n",
(unsigned long) buf->pread, (unsigned long) buf->pwrite)); (unsigned long) buf->pread, (unsigned long) buf->pwrite);
wake_up(&buf->queue); wake_up(&buf->queue);
return blen; return blen;
} }
...@@ -286,7 +280,7 @@ int av7110_set_volume(struct av7110 *av7110, int volleft, int volright) ...@@ -286,7 +280,7 @@ int av7110_set_volume(struct av7110 *av7110, int volleft, int volright)
{ {
int err, vol, val, balance = 0; int err, vol, val, balance = 0;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
av7110->mixer.volume_left = volleft; av7110->mixer.volume_left = volleft;
av7110->mixer.volume_right = volright; av7110->mixer.volume_right = volright;
...@@ -325,7 +319,7 @@ int av7110_set_volume(struct av7110 *av7110, int volleft, int volright) ...@@ -325,7 +319,7 @@ int av7110_set_volume(struct av7110 *av7110, int volleft, int volright)
void av7110_set_vidmode(struct av7110 *av7110, int mode) void av7110_set_vidmode(struct av7110 *av7110, int mode)
{ {
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
av7110_fw_cmd(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode); av7110_fw_cmd(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode);
...@@ -353,7 +347,7 @@ static void get_video_format(struct av7110 *av7110, u8 *buf, int count) ...@@ -353,7 +347,7 @@ static void get_video_format(struct av7110 *av7110, u8 *buf, int count)
int sw; int sw;
u8 *p; u8 *p;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (av7110->sinfo) if (av7110->sinfo)
return; return;
...@@ -366,7 +360,7 @@ static void get_video_format(struct av7110 *av7110, u8 *buf, int count) ...@@ -366,7 +360,7 @@ static void get_video_format(struct av7110 *av7110, u8 *buf, int count)
vsize = ((p[1] &0x0F) << 8) | (p[2]); vsize = ((p[1] &0x0F) << 8) | (p[2]);
sw = (p[3] & 0x0F); sw = (p[3] & 0x0F);
av7110_set_vidmode(av7110, sw2mode[sw]); av7110_set_vidmode(av7110, sw2mode[sw]);
DEB_S(("dvb: playback %dx%d fr=%d\n", hsize, vsize, sw)); dprintk(2, "playback %dx%d fr=%d\n", hsize, vsize, sw);
av7110->sinfo = 1; av7110->sinfo = 1;
break; break;
} }
...@@ -403,7 +397,7 @@ static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, ...@@ -403,7 +397,7 @@ static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf,
static void play_video_cb(u8 *buf, int count, void *priv) static void play_video_cb(u8 *buf, int count, void *priv)
{ {
struct av7110 *av7110 = (struct av7110 *) priv; struct av7110 *av7110 = (struct av7110 *) priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if ((buf[3] & 0xe0) == 0xe0) { if ((buf[3] & 0xe0) == 0xe0) {
get_video_format(av7110, buf, count); get_video_format(av7110, buf, count);
...@@ -415,7 +409,7 @@ static void play_video_cb(u8 *buf, int count, void *priv) ...@@ -415,7 +409,7 @@ static void play_video_cb(u8 *buf, int count, void *priv)
static void play_audio_cb(u8 *buf, int count, void *priv) static void play_audio_cb(u8 *buf, int count, void *priv)
{ {
struct av7110 *av7110 = (struct av7110 *) priv; struct av7110 *av7110 = (struct av7110 *) priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
aux_ring_buffer_write(&av7110->aout, buf, count); aux_ring_buffer_write(&av7110->aout, buf, count);
} }
...@@ -427,7 +421,7 @@ static ssize_t dvb_play(struct av7110 *av7110, const u8 __user *buf, ...@@ -427,7 +421,7 @@ static ssize_t dvb_play(struct av7110 *av7110, const u8 __user *buf,
unsigned long count, int nonblock, int type) unsigned long count, int nonblock, int type)
{ {
unsigned long todo = count, n; unsigned long todo = count, n;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (!av7110->kbuf[type]) if (!av7110->kbuf[type])
return -ENOBUFS; return -ENOBUFS;
...@@ -460,7 +454,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf, ...@@ -460,7 +454,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf,
unsigned long count, int nonblock, int type) unsigned long count, int nonblock, int type)
{ {
unsigned long todo = count, n; unsigned long todo = count, n;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (!av7110->kbuf[type]) if (!av7110->kbuf[type])
return -ENOBUFS; return -ENOBUFS;
...@@ -490,7 +484,7 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const u8 __user *buf, ...@@ -490,7 +484,7 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const u8 __user *buf,
unsigned long count, int nonblock, int type) unsigned long count, int nonblock, int type)
{ {
unsigned long todo = count, n; unsigned long todo = count, n;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (!av7110->kbuf[type]) if (!av7110->kbuf[type])
return -ENOBUFS; return -ENOBUFS;
...@@ -769,7 +763,7 @@ int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t l ...@@ -769,7 +763,7 @@ int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t l
struct av7110 *av7110 = (struct av7110 *) demux->priv; struct av7110 *av7110 = (struct av7110 *) demux->priv;
struct ipack *ipack = &av7110->ipack[feed->pes_type]; struct ipack *ipack = &av7110->ipack[feed->pes_type];
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
switch (feed->pes_type) { switch (feed->pes_type) {
case 0: case 0:
...@@ -810,8 +804,6 @@ void dvb_video_add_event(struct av7110 *av7110, struct video_event *event) ...@@ -810,8 +804,6 @@ void dvb_video_add_event(struct av7110 *av7110, struct video_event *event)
struct dvb_video_events *events = &av7110->video_events; struct dvb_video_events *events = &av7110->video_events;
int wp; int wp;
DEB_D(("\n"));
spin_lock_bh(&events->lock); spin_lock_bh(&events->lock);
wp = (events->eventw + 1) % MAX_VIDEO_EVENT; wp = (events->eventw + 1) % MAX_VIDEO_EVENT;
...@@ -834,8 +826,6 @@ static int dvb_video_get_event (struct av7110 *av7110, struct video_event *event ...@@ -834,8 +826,6 @@ static int dvb_video_get_event (struct av7110 *av7110, struct video_event *event
{ {
struct dvb_video_events *events = &av7110->video_events; struct dvb_video_events *events = &av7110->video_events;
DEB_D(("\n"));
if (events->overflow) { if (events->overflow) {
events->overflow = 0; events->overflow = 0;
return -EOVERFLOW; return -EOVERFLOW;
...@@ -874,7 +864,7 @@ static unsigned int dvb_video_poll(struct file *file, poll_table *wait) ...@@ -874,7 +864,7 @@ static unsigned int dvb_video_poll(struct file *file, poll_table *wait)
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
unsigned int mask = 0; unsigned int mask = 0;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if ((file->f_flags & O_ACCMODE) != O_RDONLY) if ((file->f_flags & O_ACCMODE) != O_RDONLY)
poll_wait(file, &av7110->avout.queue, wait); poll_wait(file, &av7110->avout.queue, wait);
...@@ -901,7 +891,7 @@ static ssize_t dvb_video_write(struct file *file, const char __user *buf, ...@@ -901,7 +891,7 @@ static ssize_t dvb_video_write(struct file *file, const char __user *buf,
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if ((file->f_flags & O_ACCMODE) == O_RDONLY) if ((file->f_flags & O_ACCMODE) == O_RDONLY)
return -EPERM; return -EPERM;
...@@ -918,7 +908,7 @@ static unsigned int dvb_audio_poll(struct file *file, poll_table *wait) ...@@ -918,7 +908,7 @@ static unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
unsigned int mask = 0; unsigned int mask = 0;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
poll_wait(file, &av7110->aout.queue, wait); poll_wait(file, &av7110->aout.queue, wait);
...@@ -937,7 +927,7 @@ static ssize_t dvb_audio_write(struct file *file, const char __user *buf, ...@@ -937,7 +927,7 @@ static ssize_t dvb_audio_write(struct file *file, const char __user *buf,
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (av7110->audiostate.stream_source != AUDIO_SOURCE_MEMORY) { if (av7110->audiostate.stream_source != AUDIO_SOURCE_MEMORY) {
printk(KERN_ERR "not audio source memory\n"); printk(KERN_ERR "not audio source memory\n");
...@@ -954,7 +944,7 @@ static int play_iframe(struct av7110 *av7110, u8 __user *buf, unsigned int len, ...@@ -954,7 +944,7 @@ static int play_iframe(struct av7110 *av7110, u8 __user *buf, unsigned int len,
{ {
int i, n; int i, n;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (!(av7110->playing & RP_VIDEO)) { if (!(av7110->playing & RP_VIDEO)) {
if (av7110_av_start_play(av7110, RP_VIDEO) < 0) if (av7110_av_start_play(av7110, RP_VIDEO) < 0)
...@@ -984,7 +974,7 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file, ...@@ -984,7 +974,7 @@ static int dvb_video_ioctl(struct inode *inode, struct file *file,
unsigned long arg = (unsigned long) parg; unsigned long arg = (unsigned long) parg;
int ret = 0; int ret = 0;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if ((file->f_flags & O_ACCMODE) == O_RDONLY) { if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
if ( cmd != VIDEO_GET_STATUS && cmd != VIDEO_GET_EVENT && if ( cmd != VIDEO_GET_STATUS && cmd != VIDEO_GET_EVENT &&
...@@ -1180,7 +1170,7 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file, ...@@ -1180,7 +1170,7 @@ static int dvb_audio_ioctl(struct inode *inode, struct file *file,
unsigned long arg = (unsigned long) parg; unsigned long arg = (unsigned long) parg;
int ret = 0; int ret = 0;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (((file->f_flags & O_ACCMODE) == O_RDONLY) && if (((file->f_flags & O_ACCMODE) == O_RDONLY) &&
(cmd != AUDIO_GET_STATUS)) (cmd != AUDIO_GET_STATUS))
...@@ -1296,7 +1286,7 @@ static int dvb_video_open(struct inode *inode, struct file *file) ...@@ -1296,7 +1286,7 @@ static int dvb_video_open(struct inode *inode, struct file *file)
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
int err; int err;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if ((err = dvb_generic_open(inode, file)) < 0) if ((err = dvb_generic_open(inode, file)) < 0)
return err; return err;
...@@ -1320,7 +1310,7 @@ static int dvb_video_release(struct inode *inode, struct file *file) ...@@ -1320,7 +1310,7 @@ static int dvb_video_release(struct inode *inode, struct file *file)
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if ((file->f_flags & O_ACCMODE) != O_RDONLY) { if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
av7110_av_stop(av7110, RP_VIDEO); av7110_av_stop(av7110, RP_VIDEO);
...@@ -1335,7 +1325,7 @@ static int dvb_audio_open(struct inode *inode, struct file *file) ...@@ -1335,7 +1325,7 @@ static int dvb_audio_open(struct inode *inode, struct file *file)
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
int err=dvb_generic_open(inode, file); int err=dvb_generic_open(inode, file);
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
if (err < 0) if (err < 0)
return err; return err;
...@@ -1349,7 +1339,7 @@ static int dvb_audio_release(struct inode *inode, struct file *file) ...@@ -1349,7 +1339,7 @@ static int dvb_audio_release(struct inode *inode, struct file *file)
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(2, "av7110:%p, \n", av7110);
av7110_av_stop(av7110, RP_AUDIO); av7110_av_stop(av7110, RP_AUDIO);
return dvb_generic_release(inode, file); return dvb_generic_release(inode, file);
......
drivers/media/dvb/ttpci/av7110_ca.c
View file @ a8ce6c87
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
void CI_handle(struct av7110 *av7110, u8 *data, u16 len) void CI_handle(struct av7110 *av7110, u8 *data, u16 len)
{ {
DEB_EE(("av7110: %p\n", av7110)); dprintk(8, "av7110:%p\n",av7110);
if (len < 3) if (len < 3)
return; return;
...@@ -207,7 +207,7 @@ static int dvb_ca_open(struct inode *inode, struct file *file) ...@@ -207,7 +207,7 @@ static int dvb_ca_open(struct inode *inode, struct file *file)
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
int err = dvb_generic_open(inode, file); int err = dvb_generic_open(inode, file);
DEB_EE(("av7110: %p\n", av7110)); dprintk(8, "av7110:%p\n",av7110);
if (err < 0) if (err < 0)
return err; return err;
...@@ -223,13 +223,16 @@ static unsigned int dvb_ca_poll (struct file *file, poll_table *wait) ...@@ -223,13 +223,16 @@ static unsigned int dvb_ca_poll (struct file *file, poll_table *wait)
struct dvb_ringbuffer *wbuf = &av7110->ci_wbuffer; struct dvb_ringbuffer *wbuf = &av7110->ci_wbuffer;
unsigned int mask = 0; unsigned int mask = 0;
DEB_EE(("av7110: %p\n", av7110)); dprintk(8, "av7110:%p\n",av7110);
poll_wait(file, &rbuf->queue, wait); poll_wait(file, &rbuf->queue, wait);
poll_wait(file, &wbuf->queue, wait);
if (!dvb_ringbuffer_empty(rbuf)) if (!dvb_ringbuffer_empty(rbuf))
mask |= POLLIN; mask |= (POLLIN | POLLRDNORM);
if (dvb_ringbuffer_avail(wbuf) > 1024)
mask |= POLLOUT; if (dvb_ringbuffer_free(wbuf) > 1024)
mask |= (POLLOUT | POLLWRNORM);
return mask; return mask;
} }
...@@ -241,7 +244,7 @@ static int dvb_ca_ioctl(struct inode *inode, struct file *file, ...@@ -241,7 +244,7 @@ static int dvb_ca_ioctl(struct inode *inode, struct file *file,
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
unsigned long arg = (unsigned long) parg; unsigned long arg = (unsigned long) parg;
DEB_EE(("av7110: %p\n", av7110)); dprintk(8, "av7110:%p\n",av7110);
switch (cmd) { switch (cmd) {
case CA_RESET: case CA_RESET:
...@@ -318,7 +321,7 @@ static ssize_t dvb_ca_write(struct file *file, const char __user *buf, ...@@ -318,7 +321,7 @@ static ssize_t dvb_ca_write(struct file *file, const char __user *buf,
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(8, "av7110:%p\n",av7110);
return ci_ll_write(&av7110->ci_wbuffer, file, buf, count, ppos); return ci_ll_write(&av7110->ci_wbuffer, file, buf, count, ppos);
} }
...@@ -328,7 +331,7 @@ static ssize_t dvb_ca_read(struct file *file, char __user *buf, ...@@ -328,7 +331,7 @@ static ssize_t dvb_ca_read(struct file *file, char __user *buf,
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data; struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv; struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
DEB_EE(("av7110: %p\n", av7110)); dprintk(8, "av7110:%p\n",av7110);
return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos); return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos);
} }
......
drivers/media/dvb/ttpci/av7110_hw.c
View file @ a8ce6c87
...@@ -110,7 +110,7 @@ void av7110_reset_arm(struct av7110 *av7110) ...@@ -110,7 +110,7 @@ void av7110_reset_arm(struct av7110 *av7110)
IER_ENABLE(av7110->dev, MASK_03); IER_ENABLE(av7110->dev, MASK_03);
av7110->arm_ready = 1; av7110->arm_ready = 1;
printk("av7110: ARM RESET\n"); dprintk(1, "reset ARM\n");
} }
...@@ -118,7 +118,7 @@ static int waitdebi(struct av7110 *av7110, int adr, int state) ...@@ -118,7 +118,7 @@ static int waitdebi(struct av7110 *av7110, int adr, int state)
{ {
int k; int k;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
for (k = 0; k < 100; k++) { for (k = 0; k < 100; k++) {
if (irdebi(av7110, DEBINOSWAP, adr, 0, 2) == state) if (irdebi(av7110, DEBINOSWAP, adr, 0, 2) == state)
...@@ -134,7 +134,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len) ...@@ -134,7 +134,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
int blocks, rest; int blocks, rest;
u32 base, bootblock = BOOT_BLOCK; u32 base, bootblock = BOOT_BLOCK;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
blocks = len / BOOT_MAX_SIZE; blocks = len / BOOT_MAX_SIZE;
rest = len % BOOT_MAX_SIZE; rest = len % BOOT_MAX_SIZE;
...@@ -143,7 +143,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len) ...@@ -143,7 +143,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
for (i = 0; i < blocks; i++) { for (i = 0; i < blocks; i++) {
if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0)
return -1; return -1;
DEB_D(("Writing DRAM block %d\n", i)); dprintk(4, "writing DRAM block %d\n", i);
mwdebi(av7110, DEBISWAB, bootblock, mwdebi(av7110, DEBISWAB, bootblock,
((char*)data) + i * BOOT_MAX_SIZE, BOOT_MAX_SIZE); ((char*)data) + i * BOOT_MAX_SIZE, BOOT_MAX_SIZE);
bootblock ^= 0x1400; bootblock ^= 0x1400;
...@@ -206,7 +206,7 @@ int av7110_bootarm(struct av7110 *av7110) ...@@ -206,7 +206,7 @@ int av7110_bootarm(struct av7110 *av7110)
u32 ret; u32 ret;
int i; int i;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTLO); saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTLO);
...@@ -222,17 +222,17 @@ int av7110_bootarm(struct av7110 *av7110) ...@@ -222,17 +222,17 @@ int av7110_bootarm(struct av7110 *av7110)
/* test DEBI */ /* test DEBI */
iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4); iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4);
if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) { if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4)) != 0x10325476) {
printk(KERN_ERR "dvb: debi test in av7110_bootarm() failed: " printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: "
"%08x != %08x (check your BIOS hotplug settings)\n", "%08x != %08x (check your BIOS 'Plug&Play OS' settings)\n",
ret, 0x10325476); ret, 0x10325476);
return -1; return -1;
} }
for (i = 0; i < 8192; i += 4) for (i = 0; i < 8192; i += 4)
iwdebi(av7110, DEBISWAP, DPRAM_BASE + i, 0x00, 4); iwdebi(av7110, DEBISWAP, DPRAM_BASE + i, 0x00, 4);
DEB_D(("av7110_bootarm: debi test OK\n")); dprintk(2, "debi test OK\n");
/* boot */ /* boot */
DEB_D(("av7110_bootarm: load boot code\n")); dprintk(1, "load boot code\n");
saa7146_setgpio(dev, ARM_IRQ_LINE, SAA7146_GPIO_IRQLO); saa7146_setgpio(dev, ARM_IRQ_LINE, SAA7146_GPIO_IRQLO);
//saa7146_setgpio(dev, DEBI_DONE_LINE, SAA7146_GPIO_INPUT); //saa7146_setgpio(dev, DEBI_DONE_LINE, SAA7146_GPIO_INPUT);
//saa7146_setgpio(dev, 3, SAA7146_GPIO_INPUT); //saa7146_setgpio(dev, 3, SAA7146_GPIO_INPUT);
...@@ -241,25 +241,25 @@ int av7110_bootarm(struct av7110 *av7110) ...@@ -241,25 +241,25 @@ int av7110_bootarm(struct av7110 *av7110)
iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2); iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
if (saa7146_wait_for_debi_done(av7110->dev)) { if (saa7146_wait_for_debi_done(av7110->dev)) {
printk(KERN_ERR "dvb: av7110_bootarm(): " printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): "
"saa7146_wait_for_debi_done() timed out\n"); "saa7146_wait_for_debi_done() timed out\n");
return -1; return -1;
} }
saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTHI); saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTHI);
mdelay(1); mdelay(1);
DEB_D(("av7110_bootarm: load dram code\n")); dprintk(1, "load dram code\n");
if (load_dram(av7110, (u32 *)av7110->bin_root, av7110->size_root) < 0) if (load_dram(av7110, (u32 *)av7110->bin_root, av7110->size_root) < 0)
return -1; return -1;
saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTLO); saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTLO);
mdelay(1); mdelay(1);
DEB_D(("av7110_bootarm: load dpram code\n")); dprintk(1, "load dpram code\n");
mwdebi(av7110, DEBISWAB, DPRAM_BASE, av7110->bin_dpram, av7110->size_dpram); mwdebi(av7110, DEBISWAB, DPRAM_BASE, av7110->bin_dpram, av7110->size_dpram);
if (saa7146_wait_for_debi_done(av7110->dev)) { if (saa7146_wait_for_debi_done(av7110->dev)) {
printk(KERN_ERR "dvb: av7110_bootarm(): " printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): "
"saa7146_wait_for_debi_done() timed out after loading DRAM\n"); "saa7146_wait_for_debi_done() timed out after loading DRAM\n");
return -1; return -1;
} }
...@@ -289,10 +289,10 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) ...@@ -289,10 +289,10 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
u32 stat; u32 stat;
#endif #endif
// DEB_EE(("av7110: %p\n", av7110)); // dprintk(4, "%p\n", av7110);
if (!av7110->arm_ready) { if (!av7110->arm_ready) {
DEB_D(("arm not ready.\n")); dprintk(1, "arm not ready.\n");
return -1; return -1;
} }
...@@ -300,7 +300,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) ...@@ -300,7 +300,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
while (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2 )) { while (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2 )) {
msleep(1); msleep(1);
if (time_after(jiffies, start + ARM_WAIT_FREE)) { if (time_after(jiffies, start + ARM_WAIT_FREE)) {
printk(KERN_ERR "%s: timeout waiting for COMMAND idle\n", __FUNCTION__); printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND idle\n", __FUNCTION__);
return -1; return -1;
} }
} }
...@@ -310,7 +310,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) ...@@ -310,7 +310,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
while (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2 )) { while (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2 )) {
msleep(1); msleep(1);
if (time_after(jiffies, start + ARM_WAIT_SHAKE)) { if (time_after(jiffies, start + ARM_WAIT_SHAKE)) {
printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__); printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
return -1; return -1;
} }
} }
...@@ -320,7 +320,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) ...@@ -320,7 +320,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
while (rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2) & OSDQFull) { while (rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2) & OSDQFull) {
msleep(1); msleep(1);
if (time_after(jiffies, start + ARM_WAIT_OSD)) { if (time_after(jiffies, start + ARM_WAIT_OSD)) {
printk(KERN_ERR "%s: timeout waiting for !OSDQFull\n", __FUNCTION__); printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for !OSDQFull\n", __FUNCTION__);
return -1; return -1;
} }
} }
...@@ -339,7 +339,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) ...@@ -339,7 +339,7 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
while (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2 )) { while (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2 )) {
msleep(1); msleep(1);
if (time_after(jiffies, start + ARM_WAIT_FREE)) { if (time_after(jiffies, start + ARM_WAIT_FREE)) {
printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND to complete\n",
__FUNCTION__); __FUNCTION__);
return -1; return -1;
} }
...@@ -347,11 +347,11 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) ...@@ -347,11 +347,11 @@ int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2); stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
if (stat & GPMQOver) { if (stat & GPMQOver) {
printk(KERN_ERR "%s: GPMQOver\n", __FUNCTION__); printk(KERN_ERR "dvb-ttpci: %s(): GPMQOver\n", __FUNCTION__);
return -1; return -1;
} }
else if (stat & OSDQOver) { else if (stat & OSDQOver) {
printk(KERN_ERR "%s: OSDQOver\n", __FUNCTION__); printk(KERN_ERR "dvb-ttpci: %s(): OSDQOver\n", __FUNCTION__);
return -1; return -1;
} }
#endif #endif
...@@ -363,10 +363,10 @@ int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) ...@@ -363,10 +363,10 @@ int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
{ {
int ret; int ret;
// DEB_EE(("av7110: %p\n", av7110)); // dprintk(4, "%p\n", av7110);
if (!av7110->arm_ready) { if (!av7110->arm_ready) {
DEB_D(("arm not ready.\n")); dprintk(1, "arm not ready.\n");
return -1; return -1;
} }
if (down_interruptible(&av7110->dcomlock)) if (down_interruptible(&av7110->dcomlock))
...@@ -375,7 +375,7 @@ int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length) ...@@ -375,7 +375,7 @@ int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
ret = __av7110_send_fw_cmd(av7110, buf, length); ret = __av7110_send_fw_cmd(av7110, buf, length);
up(&av7110->dcomlock); up(&av7110->dcomlock);
if (ret) if (ret)
printk("av7110_send_fw_cmd error\n"); printk("dvb-ttpci: %s(): av7110_send_fw_cmd error\n", __FUNCTION__);
return ret; return ret;
} }
...@@ -385,7 +385,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...) ...@@ -385,7 +385,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)
u16 buf[num + 2]; u16 buf[num + 2];
int i, ret; int i, ret;
// DEB_EE(("av7110: %p\n",av7110)); // dprintk(4, "%p\n", av7110);
buf[0] = ((type << 8) | com); buf[0] = ((type << 8) | com);
buf[1] = num; buf[1] = num;
...@@ -399,7 +399,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...) ...@@ -399,7 +399,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)
ret = av7110_send_fw_cmd(av7110, buf, num + 2); ret = av7110_send_fw_cmd(av7110, buf, num + 2);
if (ret) if (ret)
printk("av7110_fw_cmd error\n"); printk("dvb-ttpci: av7110_fw_cmd error\n");
return ret; return ret;
} }
...@@ -409,7 +409,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) ...@@ -409,7 +409,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
u16 cmd[18] = { ((COMTYPE_COMMON_IF << 8) + subcom), u16 cmd[18] = { ((COMTYPE_COMMON_IF << 8) + subcom),
16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
for(i = 0; i < len && i < 32; i++) for(i = 0; i < len && i < 32; i++)
{ {
...@@ -421,7 +421,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len) ...@@ -421,7 +421,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
ret = av7110_send_fw_cmd(av7110, cmd, 18); ret = av7110_send_fw_cmd(av7110, cmd, 18);
if (ret) if (ret)
printk("av7110_send_ci_cmd error\n"); printk("dvb-ttpci: av7110_send_ci_cmd error\n");
return ret; return ret;
} }
...@@ -435,10 +435,10 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, ...@@ -435,10 +435,10 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
u32 stat; u32 stat;
#endif #endif
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
if (!av7110->arm_ready) { if (!av7110->arm_ready) {
DEB_D(("arm not ready.\n")); dprintk(1, "arm not ready.\n");
return -1; return -1;
} }
...@@ -447,7 +447,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, ...@@ -447,7 +447,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
if ((err = __av7110_send_fw_cmd(av7110, request_buf, request_buf_len)) < 0) { if ((err = __av7110_send_fw_cmd(av7110, request_buf, request_buf_len)) < 0) {
up(&av7110->dcomlock); up(&av7110->dcomlock);
printk("av7110_fw_request error\n"); printk("dvb-ttpci: av7110_fw_request error\n");
return err; return err;
} }
...@@ -457,7 +457,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf, ...@@ -457,7 +457,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
msleep(1); msleep(1);
#endif #endif
if (time_after(jiffies, start + ARM_WAIT_FREE)) { if (time_after(jiffies, start + ARM_WAIT_FREE)) {
printk("%s: timeout waiting for COMMAND to complete\n", __FUNCTION__); printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __FUNCTION__);
up(&av7110->dcomlock); up(&av7110->dcomlock);
return -1; return -1;
} }
...@@ -501,7 +501,7 @@ int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length) ...@@ -501,7 +501,7 @@ int av7110_fw_query(struct av7110 *av7110, u16 tag, u16* buf, s16 length)
int ret; int ret;
ret = av7110_fw_request(av7110, &tag, 0, buf, length); ret = av7110_fw_request(av7110, &tag, 0, buf, length);
if (ret) if (ret)
printk("av7110_fw_query error\n"); printk("dvb-ttpci: av7110_fw_query error\n");
return ret; return ret;
} }
...@@ -516,10 +516,10 @@ int av7110_firmversion(struct av7110 *av7110) ...@@ -516,10 +516,10 @@ int av7110_firmversion(struct av7110 *av7110)
u16 buf[20]; u16 buf[20];
u16 tag = ((COMTYPE_REQUEST << 8) + ReqVersion); u16 tag = ((COMTYPE_REQUEST << 8) + ReqVersion);
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
if (av7110_fw_query(av7110, tag, buf, 16)) { if (av7110_fw_query(av7110, tag, buf, 16)) {
printk("DVB: AV7110-%d: ERROR: Failed to boot firmware\n", printk("dvb-ttpci: failed to boot firmware @ card %d\n",
av7110->dvb_adapter->num); av7110->dvb_adapter->num);
return -EIO; return -EIO;
} }
...@@ -530,17 +530,17 @@ int av7110_firmversion(struct av7110 *av7110) ...@@ -530,17 +530,17 @@ int av7110_firmversion(struct av7110 *av7110)
av7110->arm_app = (buf[6] << 16) + buf[7]; av7110->arm_app = (buf[6] << 16) + buf[7];
av7110->avtype = (buf[8] << 16) + buf[9]; av7110->avtype = (buf[8] << 16) + buf[9];
printk("DVB: AV711%d(%d) - firm %08x, rtsl %08x, vid %08x, app %08x\n", printk("dvb-ttpci: info @ card %d: firm %08x, rtsl %08x, vid %08x, app %08x\n",
av7110->avtype, av7110->dvb_adapter->num, av7110->arm_fw, av7110->dvb_adapter->num, av7110->arm_fw,
av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app); av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app);
/* print firmware capabilities */ /* print firmware capabilities */
if (FW_CI_LL_SUPPORT(av7110->arm_app)) if (FW_CI_LL_SUPPORT(av7110->arm_app))
printk("DVB: AV711%d(%d) - firmware supports CI link layer interface\n", printk("dvb-ttpci: firmware @ card %d supports CI link layer interface\n",
av7110->avtype, av7110->dvb_adapter->num); av7110->dvb_adapter->num);
else else
printk("DVB: AV711%d(%d) - no firmware support for CI link layer interface\n", printk("dvb-ttpci: no firmware support for CI link layer interface @ card %d\n",
av7110->avtype, av7110->dvb_adapter->num); av7110->dvb_adapter->num);
return 0; return 0;
} }
...@@ -552,7 +552,7 @@ int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long bu ...@@ -552,7 +552,7 @@ int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long bu
u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) + SendDiSEqC), u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) + SendDiSEqC),
16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
if (len > 10) if (len > 10)
len = 10; len = 10;
...@@ -569,7 +569,7 @@ int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long bu ...@@ -569,7 +569,7 @@ int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long bu
buf[i + 4] = msg[i]; buf[i + 4] = msg[i];
if (av7110_send_fw_cmd(av7110, buf, 18)) if (av7110_send_fw_cmd(av7110, buf, 18))
printk("av7110_diseqc_send error\n"); printk("dvb-ttpci: av7110_diseqc_send error\n");
return 0; return 0;
} }
...@@ -628,7 +628,7 @@ static int FlushText(struct av7110 *av7110) ...@@ -628,7 +628,7 @@ static int FlushText(struct av7110 *av7110)
while (rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2)) { while (rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2)) {
msleep(1); msleep(1);
if (time_after(jiffies, start + ARM_WAIT_OSD)) { if (time_after(jiffies, start + ARM_WAIT_OSD)) {
printk(KERN_ERR "%s: timeout waiting for BUFF1_BASE == 0\n", printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n",
__FUNCTION__); __FUNCTION__);
up(&av7110->dcomlock); up(&av7110->dcomlock);
return -1; return -1;
...@@ -652,7 +652,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf) ...@@ -652,7 +652,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
while (rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2)) { while (rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2)) {
msleep(1); msleep(1);
if (time_after(jiffies, start + ARM_WAIT_OSD)) { if (time_after(jiffies, start + ARM_WAIT_OSD)) {
printk(KERN_ERR "%s: timeout waiting for BUFF1_BASE == 0\n", printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n",
__FUNCTION__); __FUNCTION__);
up(&av7110->dcomlock); up(&av7110->dcomlock);
return -1; return -1;
...@@ -663,7 +663,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf) ...@@ -663,7 +663,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
while (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2)) { while (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2)) {
msleep(1); msleep(1);
if (time_after(jiffies, start + ARM_WAIT_SHAKE)) { if (time_after(jiffies, start + ARM_WAIT_SHAKE)) {
printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n",
__FUNCTION__); __FUNCTION__);
up(&av7110->dcomlock); up(&av7110->dcomlock);
return -1; return -1;
...@@ -678,7 +678,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf) ...@@ -678,7 +678,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
ret = __av7110_send_fw_cmd(av7110, cbuf, 5); ret = __av7110_send_fw_cmd(av7110, cbuf, 5);
up(&av7110->dcomlock); up(&av7110->dcomlock);
if (ret) if (ret)
printk("WriteText error\n"); printk("dvb-ttpci: WriteText error\n");
return ret; return ret;
} }
...@@ -741,7 +741,7 @@ static inline int LoadBitmap(struct av7110 *av7110, u16 format, ...@@ -741,7 +741,7 @@ static inline int LoadBitmap(struct av7110 *av7110, u16 format,
u8 c; u8 c;
int ret; int ret;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
ret = wait_event_interruptible_timeout(av7110->bmpq, av7110->bmp_state != BMP_LOADING, HZ); ret = wait_event_interruptible_timeout(av7110->bmpq, av7110->bmp_state != BMP_LOADING, HZ);
if (ret == -ERESTARTSYS || ret == 0) { if (ret == -ERESTARTSYS || ret == 0) {
...@@ -794,7 +794,7 @@ static int BlitBitmap(struct av7110 *av7110, u16 win, u16 x, u16 y, u16 trans) ...@@ -794,7 +794,7 @@ static int BlitBitmap(struct av7110 *av7110, u16 win, u16 x, u16 y, u16 trans)
{ {
int ret; int ret;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
BUG_ON (av7110->bmp_state == BMP_NONE); BUG_ON (av7110->bmp_state == BMP_NONE);
...@@ -812,7 +812,7 @@ static int BlitBitmap(struct av7110 *av7110, u16 win, u16 x, u16 y, u16 trans) ...@@ -812,7 +812,7 @@ static int BlitBitmap(struct av7110 *av7110, u16 win, u16 x, u16 y, u16 trans)
static inline int ReleaseBitmap(struct av7110 *av7110) static inline int ReleaseBitmap(struct av7110 *av7110)
{ {
DEB_EE(("av7110: %p\n",av7110)); dprintk(4, "%p\n", av7110);
if (av7110->bmp_state != BMP_LOADED) if (av7110->bmp_state != BMP_LOADED)
return -1; return -1;
......
drivers/media/dvb/ttpci/av7110_ir.c
View file @ a8ce6c87
...@@ -4,18 +4,13 @@ ...@@ -4,18 +4,13 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/bitops.h> #include <asm/bitops.h>
#include "av7110.h" #include "av7110.h"
#define UP_TIMEOUT (HZ/4) #define UP_TIMEOUT (HZ/4)
static int av7110_ir_debug; /* enable ir debugging by or'ing av7110_debug with 16 */
module_param_named(debug_ir, av7110_ir_debug, int, 0644);
MODULE_PARM_DESC(av7110_ir_debug, "Turn on/off IR debugging (default:off).");
#define dprintk(x...) do { if (av7110_ir_debug) printk (x); } while (0)
static struct input_dev input_dev; static struct input_dev input_dev;
...@@ -78,7 +73,7 @@ static void av7110_emit_key (u32 ircom) ...@@ -78,7 +73,7 @@ static void av7110_emit_key (u32 ircom)
keycode = key_map[data]; keycode = key_map[data];
dprintk ("#########%08x######### addr %i data 0x%02x (keycode %i)\n", dprintk(16, "#########%08x######### addr %i data 0x%02x (keycode %i)\n",
ircom, addr, data, keycode); ircom, addr, data, keycode);
/* check device address (if selected) */ /* check device address (if selected) */
......
drivers/media/dvb/ttpci/av7110_v4l.c
View file @ a8ce6c87
...@@ -45,8 +45,8 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val) ...@@ -45,8 +45,8 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
struct i2c_msg msgs = { .flags = 0, .addr = 0x40, .len = 5, .buf = msg }; struct i2c_msg msgs = { .flags = 0, .addr = 0x40, .len = 5, .buf = msg };
if (i2c_transfer(&av7110->i2c_adap, &msgs, 1) != 1) { if (i2c_transfer(&av7110->i2c_adap, &msgs, 1) != 1) {
printk("av7110(%d): %s(%u = %u) failed\n", dprintk(1, "dvb-ttpci: failed @ card %d, %u = %u\n",
av7110->dvb_adapter->num, __FUNCTION__, reg, val); av7110->dvb_adapter->num, reg, val);
return -EIO; return -EIO;
} }
return 0; return 0;
...@@ -62,8 +62,8 @@ int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val) ...@@ -62,8 +62,8 @@ int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
}; };
if (i2c_transfer(&av7110->i2c_adap, &msgs[0], 2) != 2) { if (i2c_transfer(&av7110->i2c_adap, &msgs[0], 2) != 2) {
printk("av7110(%d): %s(%u) failed\n", dprintk(1, "dvb-ttpci: failed @ card %d, %u\n",
av7110->dvb_adapter->num, __FUNCTION__, reg); av7110->dvb_adapter->num, reg);
return -EIO; return -EIO;
} }
*val = (msg2[0] << 8) | msg2[1]; *val = (msg2[0] << 8) | msg2[1];
...@@ -99,7 +99,7 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 reg, u8 data) ...@@ -99,7 +99,7 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 reg, u8 data)
u8 buf[] = { 0x00, reg, data }; u8 buf[] = { 0x00, reg, data };
struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 3 }; struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 3 };
DEB_EE(("av7710: dev: %p\n", dev)); dprintk(4, "dev: %p\n", dev);
if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1)) if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
return -1; return -1;
...@@ -110,7 +110,7 @@ static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4]) ...@@ -110,7 +110,7 @@ static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4])
{ {
struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 }; struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 };
DEB_EE(("av7710: dev: %p\n", dev)); dprintk(4, "dev: %p\n", dev);
if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1)) if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1))
return -1; return -1;
...@@ -128,7 +128,7 @@ static int tuner_set_tv_freq(struct saa7146_dev *dev, u32 freq) ...@@ -128,7 +128,7 @@ static int tuner_set_tv_freq(struct saa7146_dev *dev, u32 freq)
u8 config; u8 config;
u8 buf[4]; u8 buf[4];
DEB_EE(("av7710: freq: 0x%08x\n", freq)); dprintk(4, "freq: 0x%08x\n", freq);
/* magic number: 614. tuning with the frequency given by v4l2 /* magic number: 614. tuning with the frequency given by v4l2
is always off by 614*62.5 = 38375 kHz...*/ is always off by 614*62.5 = 38375 kHz...*/
...@@ -171,13 +171,13 @@ int av7110_dvb_c_switch(struct saa7146_fh *fh) ...@@ -171,13 +171,13 @@ int av7110_dvb_c_switch(struct saa7146_fh *fh)
u8 band = 0; u8 band = 0;
int source, sync, err; int source, sync, err;
DEB_EE(("av7110: %p\n", av7110)); dprintk(4, "%p\n", av7110);
if ((vv->video_status & STATUS_OVERLAY) != 0) { if ((vv->video_status & STATUS_OVERLAY) != 0) {
vv->ov_suspend = vv->video_fh; vv->ov_suspend = vv->video_fh;
err = saa7146_stop_preview(vv->video_fh); /* side effect: video_status is now 0, video_fh is NULL */ err = saa7146_stop_preview(vv->video_fh); /* side effect: video_status is now 0, video_fh is NULL */
if (err != 0) { if (err != 0) {
DEB_D(("warning: suspending video failed\n")); dprintk(2, "suspending video failed\n");
vv->ov_suspend = NULL; vv->ov_suspend = NULL;
} }
} }
...@@ -188,7 +188,7 @@ int av7110_dvb_c_switch(struct saa7146_fh *fh) ...@@ -188,7 +188,7 @@ int av7110_dvb_c_switch(struct saa7146_fh *fh)
source = SAA7146_HPS_SOURCE_PORT_B; source = SAA7146_HPS_SOURCE_PORT_B;
sync = SAA7146_HPS_SYNC_PORT_B; sync = SAA7146_HPS_SYNC_PORT_B;
memcpy(standard, analog_standard, sizeof(struct saa7146_standard) * 2); memcpy(standard, analog_standard, sizeof(struct saa7146_standard) * 2);
printk("av7110: switching to analog TV\n"); dprintk(1, "switching to analog TV\n");
msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0000); // loudspeaker source msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0000); // loudspeaker source
msp_writereg(av7110, MSP_WR_DSP, 0x0009, 0x0000); // headphone source msp_writereg(av7110, MSP_WR_DSP, 0x0009, 0x0000); // headphone source
msp_writereg(av7110, MSP_WR_DSP, 0x000a, 0x0000); // SCART 1 source msp_writereg(av7110, MSP_WR_DSP, 0x000a, 0x0000); // SCART 1 source
...@@ -201,7 +201,7 @@ int av7110_dvb_c_switch(struct saa7146_fh *fh) ...@@ -201,7 +201,7 @@ int av7110_dvb_c_switch(struct saa7146_fh *fh)
source = SAA7146_HPS_SOURCE_PORT_A; source = SAA7146_HPS_SOURCE_PORT_A;
sync = SAA7146_HPS_SYNC_PORT_A; sync = SAA7146_HPS_SYNC_PORT_A;
memcpy(standard, dvb_standard, sizeof(struct saa7146_standard) * 2); memcpy(standard, dvb_standard, sizeof(struct saa7146_standard) * 2);
printk("av7110: switching DVB mode\n"); dprintk(1, "switching DVB mode\n");
msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220); // loudspeaker source msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220); // loudspeaker source
msp_writereg(av7110, MSP_WR_DSP, 0x0009, 0x0220); // headphone source msp_writereg(av7110, MSP_WR_DSP, 0x0009, 0x0220); // headphone source
msp_writereg(av7110, MSP_WR_DSP, 0x000a, 0x0220); // SCART 1 source msp_writereg(av7110, MSP_WR_DSP, 0x000a, 0x0220); // SCART 1 source
...@@ -212,10 +212,11 @@ int av7110_dvb_c_switch(struct saa7146_fh *fh) ...@@ -212,10 +212,11 @@ int av7110_dvb_c_switch(struct saa7146_fh *fh)
/* hmm, this does not do anything!? */ /* hmm, this does not do anything!? */
if (av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, adswitch)) if (av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, adswitch))
printk("ADSwitch error\n"); dprintk(1, "ADSwitch error\n");
if (ves1820_writereg(dev, 0x0f, band)) if (ves1820_writereg(dev, 0x0f, band))
printk("setting band in demodulator failed.\n"); dprintk(1, "setting band in demodulator failed.\n");
saa7146_set_hps_source_and_sync(dev, source, sync); saa7146_set_hps_source_and_sync(dev, source, sync);
if (vv->ov_suspend != NULL) { if (vv->ov_suspend != NULL) {
...@@ -230,7 +231,7 @@ int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) ...@@ -230,7 +231,7 @@ int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
{ {
struct saa7146_dev *dev = fh->dev; struct saa7146_dev *dev = fh->dev;
struct av7110 *av7110 = (struct av7110*) dev->ext_priv; struct av7110 *av7110 = (struct av7110*) dev->ext_priv;
DEB_EE(("saa7146_dev: %p\n", dev)); dprintk(4, "saa7146_dev: %p\n", dev);
switch (cmd) { switch (cmd) {
case VIDIOC_G_TUNER: case VIDIOC_G_TUNER:
...@@ -239,7 +240,7 @@ int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) ...@@ -239,7 +240,7 @@ int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
u16 stereo_det; u16 stereo_det;
s8 stereo; s8 stereo;
DEB_EE(("VIDIOC_G_TUNER: %d\n", t->index)); dprintk(2, "VIDIOC_G_TUNER: %d\n", t->index);
if (!av7110->has_analog_tuner || t->index != 0) if (!av7110->has_analog_tuner || t->index != 0)
return -EINVAL; return -EINVAL;
...@@ -258,10 +259,10 @@ int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) ...@@ -258,10 +259,10 @@ int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
// FIXME: standard / stereo detection is still broken // FIXME: standard / stereo detection is still broken
msp_readreg(av7110, MSP_RD_DEM, 0x007e, &stereo_det); msp_readreg(av7110, MSP_RD_DEM, 0x007e, &stereo_det);
printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det); dprintk(1, "VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det);
msp_readreg(av7110, MSP_RD_DSP, 0x0018, &stereo_det); msp_readreg(av7110, MSP_RD_DSP, 0x0018, &stereo_det);
printk("VIDIOC_G_TUNER: msp3400 stereo detection: 0x%04x\n", stereo_det); dprintk(1, "VIDIOC_G_TUNER: msp3400 stereo detection: 0x%04x\n", stereo_det);
stereo = (s8)(stereo_det >> 8); stereo = (s8)(stereo_det >> 8);
if (stereo > 0x10) { if (stereo > 0x10) {
/* stereo */ /* stereo */
...@@ -282,29 +283,29 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det); ...@@ -282,29 +283,29 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det);
{ {
struct v4l2_tuner *t = arg; struct v4l2_tuner *t = arg;
u16 fm_matrix, src; u16 fm_matrix, src;
DEB_EE(("VIDIOC_S_TUNER: %d\n", t->index)); dprintk(2, "VIDIOC_S_TUNER: %d\n", t->index);
if (!av7110->has_analog_tuner || av7110->current_input != 1) if (!av7110->has_analog_tuner || av7110->current_input != 1)
return -EINVAL; return -EINVAL;
switch (t->audmode) { switch (t->audmode) {
case V4L2_TUNER_MODE_STEREO: case V4L2_TUNER_MODE_STEREO:
DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_STEREO\n")); dprintk(2, "VIDIOC_S_TUNER: V4L2_TUNER_MODE_STEREO\n");
fm_matrix = 0x3001; // stereo fm_matrix = 0x3001; // stereo
src = 0x0020; src = 0x0020;
break; break;
case V4L2_TUNER_MODE_LANG1: case V4L2_TUNER_MODE_LANG1:
DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1\n")); dprintk(2, "VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1\n");
fm_matrix = 0x3000; // mono fm_matrix = 0x3000; // mono
src = 0x0000; src = 0x0000;
break; break;
case V4L2_TUNER_MODE_LANG2: case V4L2_TUNER_MODE_LANG2:
DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG2\n")); dprintk(2, "VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG2\n");
fm_matrix = 0x3000; // mono fm_matrix = 0x3000; // mono
src = 0x0010; src = 0x0010;
break; break;
default: /* case V4L2_TUNER_MODE_MONO: {*/ default: /* case V4L2_TUNER_MODE_MONO: {*/
DEB_D(("VIDIOC_S_TUNER: TDA9840_SET_MONO\n")); dprintk(2, "VIDIOC_S_TUNER: TDA9840_SET_MONO\n");
fm_matrix = 0x3000; // mono fm_matrix = 0x3000; // mono
src = 0x0030; src = 0x0030;
break; break;
...@@ -319,7 +320,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det); ...@@ -319,7 +320,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det);
{ {
struct v4l2_frequency *f = arg; struct v4l2_frequency *f = arg;
DEB_EE(("VIDIOC_G_FREQ: freq:0x%08x.\n", f->frequency)); dprintk(2, "VIDIOC_G_FREQ: freq:0x%08x.\n", f->frequency);
if (!av7110->has_analog_tuner || av7110->current_input != 1) if (!av7110->has_analog_tuner || av7110->current_input != 1)
return -EINVAL; return -EINVAL;
...@@ -333,7 +334,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det); ...@@ -333,7 +334,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det);
{ {
struct v4l2_frequency *f = arg; struct v4l2_frequency *f = arg;
DEB_EE(("VIDIOC_S_FREQUENCY: freq:0x%08x.\n", f->frequency)); dprintk(2, "VIDIOC_S_FREQUENCY: freq:0x%08x.\n", f->frequency);
if (!av7110->has_analog_tuner || av7110->current_input != 1) if (!av7110->has_analog_tuner || av7110->current_input != 1)
return -EINVAL; return -EINVAL;
...@@ -358,7 +359,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det); ...@@ -358,7 +359,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det);
{ {
struct v4l2_input *i = arg; struct v4l2_input *i = arg;
DEB_EE(("VIDIOC_ENUMINPUT: %d\n", i->index)); dprintk(2, "VIDIOC_ENUMINPUT: %d\n", i->index);
if (av7110->has_analog_tuner ) { if (av7110->has_analog_tuner ) {
if (i->index < 0 || i->index >= 2) if (i->index < 0 || i->index >= 2)
...@@ -376,14 +377,14 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det); ...@@ -376,14 +377,14 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det);
{ {
int *input = (int *)arg; int *input = (int *)arg;
*input = av7110->current_input; *input = av7110->current_input;
DEB_EE(("VIDIOC_G_INPUT: %d\n", *input)); dprintk(2, "VIDIOC_G_INPUT: %d\n", *input);
return 0; return 0;
} }
case VIDIOC_S_INPUT: case VIDIOC_S_INPUT:
{ {
int input = *(int *)arg; int input = *(int *)arg;
DEB_EE(("VIDIOC_S_INPUT: %d\n", input)); dprintk(2, "VIDIOC_S_INPUT: %d\n", input);
if (!av7110->has_analog_tuner ) if (!av7110->has_analog_tuner )
return 0; return 0;
...@@ -399,7 +400,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det); ...@@ -399,7 +400,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det);
{ {
struct v4l2_audio *a = arg; struct v4l2_audio *a = arg;
DEB_EE(("VIDIOC_G_AUDIO: %d\n", a->index)); dprintk(2, "VIDIOC_G_AUDIO: %d\n", a->index);
if (a->index != 0) if (a->index != 0)
return -EINVAL; return -EINVAL;
memcpy(a, &msp3400_v4l2_audio, sizeof(struct v4l2_audio)); memcpy(a, &msp3400_v4l2_audio, sizeof(struct v4l2_audio));
...@@ -408,7 +409,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det); ...@@ -408,7 +409,7 @@ printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det);
case VIDIOC_S_AUDIO: case VIDIOC_S_AUDIO:
{ {
struct v4l2_audio *a = arg; struct v4l2_audio *a = arg;
DEB_EE(("VIDIOC_S_AUDIO: %d\n", a->index)); dprintk(2, "VIDIOC_S_AUDIO: %d\n", a->index);
break; break;
} }
default: default:
...@@ -506,13 +507,13 @@ int av7110_init_analog_module(struct av7110 *av7110) ...@@ -506,13 +507,13 @@ int av7110_init_analog_module(struct av7110 *av7110)
|| i2c_writereg(av7110, 0x80, 0x0, 0) != 1) || i2c_writereg(av7110, 0x80, 0x0, 0) != 1)
return -ENODEV; return -ENODEV;
printk("av7110(%d): DVB-C analog module detected, initializing MSP3400\n", printk("dvb-ttpci: DVB-C analog module @ card %d detected, initializing MSP3400\n",
av7110->dvb_adapter->num); av7110->dvb_adapter->num);
av7110->adac_type = DVB_ADAC_MSP; av7110->adac_type = DVB_ADAC_MSP;
msleep(100); // the probing above resets the msp... msleep(100); // the probing above resets the msp...
msp_readreg(av7110, MSP_RD_DSP, 0x001e, &version1); msp_readreg(av7110, MSP_RD_DSP, 0x001e, &version1);
msp_readreg(av7110, MSP_RD_DSP, 0x001f, &version2); msp_readreg(av7110, MSP_RD_DSP, 0x001f, &version2);
printk("av7110(%d): MSP3400 version 0x%04x 0x%04x\n", dprintk(1, "dvb-ttpci: @ card %d MSP3400 version 0x%04x 0x%04x\n",
av7110->dvb_adapter->num, version1, version2); av7110->dvb_adapter->num, version1, version2);
msp_writereg(av7110, MSP_WR_DSP, 0x0013, 0x0c00); msp_writereg(av7110, MSP_WR_DSP, 0x0013, 0x0c00);
msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone
...@@ -531,8 +532,7 @@ int av7110_init_analog_module(struct av7110 *av7110) ...@@ -531,8 +532,7 @@ int av7110_init_analog_module(struct av7110 *av7110)
/* init the saa7113 */ /* init the saa7113 */
while (*i != 0xff) { while (*i != 0xff) {
if (i2c_writereg(av7110, 0x48, i[0], i[1]) != 1) { if (i2c_writereg(av7110, 0x48, i[0], i[1]) != 1) {
printk("av7110(%d): saa7113 initialization failed", dprintk(1, "saa7113 initialization failed @ card %d", av7110->dvb_adapter->num);
av7110->dvb_adapter->num);
break; break;
} }
i += 2; i += 2;
......
drivers/media/dvb/ttpci/budget-av.c
View file @ a8ce6c87
...@@ -127,19 +127,18 @@ static int saa7113_init (struct budget_av *budget_av) ...@@ -127,19 +127,18 @@ static int saa7113_init (struct budget_av *budget_av)
const u8 *data = saa7113_tab; const u8 *data = saa7113_tab;
if (i2c_writereg (&budget->i2c_adap, 0x4a, 0x01, 0x08) != 1) { if (i2c_writereg (&budget->i2c_adap, 0x4a, 0x01, 0x08) != 1) {
DEB_D(("saa7113: not found on KNC card\n")); dprintk(1, "saa7113 not found on KNC card\n");
return -ENODEV; return -ENODEV;
} }
INFO(("saa7113: detected and initializing\n")); dprintk(1, "saa7113 detected and initializing\n");
while (*data != 0xff) { while (*data != 0xff) {
i2c_writereg(&budget->i2c_adap, 0x4a, *data, *(data+1)); i2c_writereg(&budget->i2c_adap, 0x4a, *data, *(data+1));
data += 2; data += 2;
} }
DEB_D(("saa7113: status=%02x\n", dprintk(1, "saa7113 status=%02x\n", i2c_readreg(&budget->i2c_adap, 0x4a, 0x1f));
i2c_readreg(&budget->i2c_adap, 0x4a, 0x1f)));
return 0; return 0;
} }
...@@ -171,7 +170,7 @@ static int budget_av_detach (struct saa7146_dev *dev) ...@@ -171,7 +170,7 @@ static int budget_av_detach (struct saa7146_dev *dev)
struct budget_av *budget_av = (struct budget_av*) dev->ext_priv; struct budget_av *budget_av = (struct budget_av*) dev->ext_priv;
int err; int err;
DEB_EE(("dev: %p\n",dev)); dprintk(2, "dev: %p\n", dev);
if ( 1 == budget_av->has_saa7113 ) { if ( 1 == budget_av->has_saa7113 ) {
saa7146_setgpio(dev, 0, SAA7146_GPIO_OUTLO); saa7146_setgpio(dev, 0, SAA7146_GPIO_OUTLO);
...@@ -198,7 +197,7 @@ static int budget_av_attach (struct saa7146_dev* dev, ...@@ -198,7 +197,7 @@ static int budget_av_attach (struct saa7146_dev* dev,
u8 *mac; u8 *mac;
int err; int err;
DEB_EE(("dev: %p\n",dev)); dprintk(2, "dev: %p\n", dev);
if (bi->type != BUDGET_KNC1 && bi->type != BUDGET_CIN1200) { if (bi->type != BUDGET_KNC1 && bi->type != BUDGET_CIN1200) {
return -ENODEV; return -ENODEV;
...@@ -299,7 +298,7 @@ static int av_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) ...@@ -299,7 +298,7 @@ static int av_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
{ {
struct v4l2_input *i = arg; struct v4l2_input *i = arg;
DEB_EE(("VIDIOC_ENUMINPUT %d.\n",i->index)); dprintk(1, "VIDIOC_ENUMINPUT %d.\n", i->index);
if( i->index < 0 || i->index >= KNC1_INPUTS) { if( i->index < 0 || i->index >= KNC1_INPUTS) {
return -EINVAL; return -EINVAL;
} }
...@@ -312,19 +311,16 @@ static int av_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) ...@@ -312,19 +311,16 @@ static int av_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
*input = budget_av->cur_input; *input = budget_av->cur_input;
DEB_EE(("VIDIOC_G_INPUT %d.\n",*input)); dprintk(1, "VIDIOC_G_INPUT %d.\n", *input);
return 0; return 0;
} }
case VIDIOC_S_INPUT: case VIDIOC_S_INPUT:
{ {
int input = *(int *)arg; int input = *(int *)arg;
DEB_EE(("VIDIOC_S_INPUT %d.\n", input)); dprintk(1, "VIDIOC_S_INPUT %d.\n", input);
return saa7113_setinput (budget_av, input); return saa7113_setinput (budget_av, input);
} }
default: default:
/*
DEB2(printk("does not handle this ioctl.\n"));
*/
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
return 0; return 0;
...@@ -384,21 +380,13 @@ static struct saa7146_extension budget_extension = { ...@@ -384,21 +380,13 @@ static struct saa7146_extension budget_extension = {
.irq_func = ttpci_budget_irq10_handler, .irq_func = ttpci_budget_irq10_handler,
}; };
static int __init budget_av_init(void) static int __init budget_av_init(void)
{ {
DEB_EE((".\n")); return saa7146_register_extension(&budget_extension);
if (saa7146_register_extension(&budget_extension))
return -ENODEV;
return 0;
} }
static void __exit budget_av_exit(void) static void __exit budget_av_exit(void)
{ {
DEB_EE((".\n"));
saa7146_unregister_extension(&budget_extension); saa7146_unregister_extension(&budget_extension);
} }
......
drivers/media/dvb/ttpci/budget-ci.c
View file @ a8ce6c87
...@@ -500,7 +500,7 @@ static void budget_ci_irq (struct saa7146_dev *dev, u32 *isr) ...@@ -500,7 +500,7 @@ static void budget_ci_irq (struct saa7146_dev *dev, u32 *isr)
{ {
struct budget_ci *budget_ci = (struct budget_ci*) dev->ext_priv; struct budget_ci *budget_ci = (struct budget_ci*) dev->ext_priv;
DEB_EE(("dev: %p, budget_ci: %p\n", dev, budget_ci)); dprintk(8, "dev: %p, budget_ci: %p\n", dev, budget_ci);
if (*isr & MASK_06) if (*isr & MASK_06)
tasklet_schedule (&budget_ci->msp430_irq_tasklet); tasklet_schedule (&budget_ci->msp430_irq_tasklet);
...@@ -523,7 +523,7 @@ static int budget_ci_attach (struct saa7146_dev* dev, ...@@ -523,7 +523,7 @@ static int budget_ci_attach (struct saa7146_dev* dev,
if (!(budget_ci = kmalloc (sizeof(struct budget_ci), GFP_KERNEL))) if (!(budget_ci = kmalloc (sizeof(struct budget_ci), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
DEB_EE(("budget_ci: %p\n", budget_ci)); dprintk(2, "budget_ci: %p\n", budget_ci);
spin_lock_init(&budget_ci->debilock); spin_lock_init(&budget_ci->debilock);
budget_ci->budget.ci_present = 0; budget_ci->budget.ci_present = 0;
...@@ -606,10 +606,8 @@ static int __init budget_ci_init(void) ...@@ -606,10 +606,8 @@ static int __init budget_ci_init(void)
return saa7146_register_extension(&budget_extension); return saa7146_register_extension(&budget_extension);
} }
static void __exit budget_ci_exit(void) static void __exit budget_ci_exit(void)
{ {
DEB_EE((".\n"));
saa7146_unregister_extension(&budget_extension); saa7146_unregister_extension(&budget_extension);
} }
......
drivers/media/dvb/ttpci/budget-core.c
View file @ a8ce6c87
...@@ -50,7 +50,7 @@ MODULE_PARM_DESC(budget_debug, "Turn on/off budget debugging (default:off)."); ...@@ -50,7 +50,7 @@ MODULE_PARM_DESC(budget_debug, "Turn on/off budget debugging (default:off).");
static int stop_ts_capture(struct budget *budget) static int stop_ts_capture(struct budget *budget)
{ {
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
if (--budget->feeding) if (--budget->feeding)
return budget->feeding; return budget->feeding;
...@@ -65,7 +65,7 @@ static int start_ts_capture (struct budget *budget) ...@@ -65,7 +65,7 @@ static int start_ts_capture (struct budget *budget)
{ {
struct saa7146_dev *dev=budget->dev; struct saa7146_dev *dev=budget->dev;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
if (budget->feeding) if (budget->feeding)
return ++budget->feeding; return ++budget->feeding;
...@@ -171,7 +171,7 @@ static int budget_start_feed(struct dvb_demux_feed *feed) ...@@ -171,7 +171,7 @@ static int budget_start_feed(struct dvb_demux_feed *feed)
struct budget *budget = (struct budget*) demux->priv; struct budget *budget = (struct budget*) demux->priv;
int status; int status;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
if (!demux->dmx.frontend) if (!demux->dmx.frontend)
return -EINVAL; return -EINVAL;
...@@ -188,7 +188,7 @@ static int budget_stop_feed(struct dvb_demux_feed *feed) ...@@ -188,7 +188,7 @@ static int budget_stop_feed(struct dvb_demux_feed *feed)
struct budget *budget = (struct budget *) demux->priv; struct budget *budget = (struct budget *) demux->priv;
int status; int status;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
spin_lock(&budget->feedlock); spin_lock(&budget->feedlock);
status = stop_ts_capture (budget); status = stop_ts_capture (budget);
...@@ -202,7 +202,7 @@ static int budget_register(struct budget *budget) ...@@ -202,7 +202,7 @@ static int budget_register(struct budget *budget)
struct dvb_demux *dvbdemux=&budget->demux; struct dvb_demux *dvbdemux=&budget->demux;
int ret; int ret;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
dvbdemux->priv = (void *) budget; dvbdemux->priv = (void *) budget;
...@@ -251,7 +251,7 @@ static void budget_unregister(struct budget *budget) ...@@ -251,7 +251,7 @@ static void budget_unregister(struct budget *budget)
{ {
struct dvb_demux *dvbdemux=&budget->demux; struct dvb_demux *dvbdemux=&budget->demux;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
dvb_net_release(&budget->dvb_net); dvb_net_release(&budget->dvb_net);
...@@ -294,7 +294,7 @@ int ttpci_budget_init (struct budget *budget, ...@@ -294,7 +294,7 @@ int ttpci_budget_init (struct budget *budget,
memset(budget, 0, sizeof(struct budget)); memset(budget, 0, sizeof(struct budget));
DEB_EE(("dev: %p, budget: %p\n", dev, budget)); dprintk(2, "dev: %p, budget: %p\n", dev, budget);
budget->card = bi; budget->card = bi;
budget->dev = (struct saa7146_dev *) dev; budget->dev = (struct saa7146_dev *) dev;
...@@ -377,7 +377,7 @@ int ttpci_budget_deinit (struct budget *budget) ...@@ -377,7 +377,7 @@ int ttpci_budget_deinit (struct budget *budget)
{ {
struct saa7146_dev *dev = budget->dev; struct saa7146_dev *dev = budget->dev;
DEB_EE(("budget: %p\n", budget)); dprintk(2, "budget: %p\n", budget);
budget_unregister (budget); budget_unregister (budget);
...@@ -398,7 +398,7 @@ void ttpci_budget_irq10_handler (struct saa7146_dev* dev, u32 *isr) ...@@ -398,7 +398,7 @@ void ttpci_budget_irq10_handler (struct saa7146_dev* dev, u32 *isr)
{ {
struct budget *budget = (struct budget*)dev->ext_priv; struct budget *budget = (struct budget*)dev->ext_priv;
DEB_EE(("dev: %p, budget: %p\n",dev,budget)); dprintk(8, "dev: %p, budget: %p\n",dev,budget);
if (*isr & MASK_10) if (*isr & MASK_10)
tasklet_schedule (&budget->vpe_tasklet); tasklet_schedule (&budget->vpe_tasklet);
......
drivers/media/dvb/ttpci/budget-patch.c
View file @ a8ce6c87
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
* the project's page is at http://www.linuxtv.org/dvb/ * the project's page is at http://www.linuxtv.org/dvb/
*/ */
#include "budget.h"
#include "av7110.h" #include "av7110.h"
#include "av7110_hw.h" #include "av7110_hw.h"
#include "budget.h"
#define budget_patch budget #define budget_patch budget
...@@ -51,7 +51,7 @@ static int budget_wdebi(struct budget_patch *budget, u32 config, int addr, u32 v ...@@ -51,7 +51,7 @@ static int budget_wdebi(struct budget_patch *budget, u32 config, int addr, u32 v
{ {
struct saa7146_dev *dev=budget->dev; struct saa7146_dev *dev=budget->dev;
DEB_EE(("budget: %p\n", budget)); dprintk(2, "budget: %p\n", budget);
if (count <= 0 || count > 4) if (count <= 0 || count > 4)
return -1; return -1;
...@@ -71,7 +71,7 @@ static int budget_av7110_send_fw_cmd(struct budget_patch *budget, u16* buf, int ...@@ -71,7 +71,7 @@ static int budget_av7110_send_fw_cmd(struct budget_patch *budget, u16* buf, int
{ {
int i; int i;
DEB_EE(("budget: %p\n", budget)); dprintk(2, "budget: %p\n", budget);
for (i = 2; i < length; i++) for (i = 2; i < length; i++)
budget_wdebi(budget, DEBINOSWAP, COMMAND + 2*i, (u32) buf[i], 2); budget_wdebi(budget, DEBINOSWAP, COMMAND + 2*i, (u32) buf[i], 2);
...@@ -90,7 +90,7 @@ static void av7110_set22k(struct budget_patch *budget, int state) ...@@ -90,7 +90,7 @@ static void av7110_set22k(struct budget_patch *budget, int state)
{ {
u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0}; u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0};
DEB_EE(("budget: %p\n", budget)); dprintk(2, "budget: %p\n", budget);
budget_av7110_send_fw_cmd(budget, buf, 2); budget_av7110_send_fw_cmd(budget, buf, 2);
} }
...@@ -101,7 +101,7 @@ static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg, ...@@ -101,7 +101,7 @@ static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg,
u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC), u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC),
16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
DEB_EE(("budget: %p\n", budget)); dprintk(2, "budget: %p\n", budget);
if (len>10) if (len>10)
len=10; len=10;
...@@ -126,7 +126,7 @@ int budget_patch_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void * ...@@ -126,7 +126,7 @@ int budget_patch_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *
{ {
struct budget_patch *budget = fe->before_after_data; struct budget_patch *budget = fe->before_after_data;
DEB_EE(("budget: %p\n", budget)); dprintk(2, "budget: %p\n", budget);
switch (cmd) { switch (cmd) {
case FE_SET_TONE: case FE_SET_TONE:
...@@ -171,7 +171,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte ...@@ -171,7 +171,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL))) if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL)))
return -ENOMEM; return -ENOMEM;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
if ((err = ttpci_budget_init (budget, dev, info))) { if ((err = ttpci_budget_init (budget, dev, info))) {
kfree (budget); kfree (budget);
...@@ -251,10 +251,8 @@ static int __init budget_patch_init(void) ...@@ -251,10 +251,8 @@ static int __init budget_patch_init(void)
return saa7146_register_extension(&budget_extension); return saa7146_register_extension(&budget_extension);
} }
static void __exit budget_patch_exit(void) static void __exit budget_patch_exit(void)
{ {
DEB_EE((".\n"));
saa7146_unregister_extension(&budget_extension); saa7146_unregister_extension(&budget_extension);
} }
......
drivers/media/dvb/ttpci/budget.c
View file @ a8ce6c87
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
static void Set22K (struct budget *budget, int state) static void Set22K (struct budget *budget, int state)
{ {
struct saa7146_dev *dev=budget->dev; struct saa7146_dev *dev=budget->dev;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
saa7146_setgpio(dev, 3, (state ? SAA7146_GPIO_OUTHI : SAA7146_GPIO_OUTLO)); saa7146_setgpio(dev, 3, (state ? SAA7146_GPIO_OUTHI : SAA7146_GPIO_OUTLO));
} }
...@@ -51,7 +51,7 @@ static void Set22K (struct budget *budget, int state) ...@@ -51,7 +51,7 @@ static void Set22K (struct budget *budget, int state)
static void DiseqcSendBit (struct budget *budget, int data) static void DiseqcSendBit (struct budget *budget, int data)
{ {
struct saa7146_dev *dev=budget->dev; struct saa7146_dev *dev=budget->dev;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI);
udelay(data ? 500 : 1000); udelay(data ? 500 : 1000);
...@@ -64,7 +64,7 @@ static void DiseqcSendByte (struct budget *budget, int data) ...@@ -64,7 +64,7 @@ static void DiseqcSendByte (struct budget *budget, int data)
{ {
int i, par=1, d; int i, par=1, d;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
for (i=7; i>=0; i--) { for (i=7; i>=0; i--) {
d = (data>>i)&1; d = (data>>i)&1;
...@@ -81,7 +81,7 @@ static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long ...@@ -81,7 +81,7 @@ static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long
struct saa7146_dev *dev=budget->dev; struct saa7146_dev *dev=budget->dev;
int i; int i;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO);
mdelay(16); mdelay(16);
...@@ -110,7 +110,7 @@ int budget_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg) ...@@ -110,7 +110,7 @@ int budget_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
{ {
struct budget *budget = fe->before_after_data; struct budget *budget = fe->before_after_data;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
switch (cmd) { switch (cmd) {
case FE_SET_TONE: case FE_SET_TONE:
...@@ -155,7 +155,7 @@ static int SetVoltage_Activy (struct budget *budget, fe_sec_voltage_t voltage) ...@@ -155,7 +155,7 @@ static int SetVoltage_Activy (struct budget *budget, fe_sec_voltage_t voltage)
{ {
struct saa7146_dev *dev=budget->dev; struct saa7146_dev *dev=budget->dev;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
switch (voltage) { switch (voltage) {
case SEC_VOLTAGE_13: case SEC_VOLTAGE_13:
...@@ -176,7 +176,7 @@ static int budget_ioctl_activy (struct dvb_frontend *fe, unsigned int cmd, void ...@@ -176,7 +176,7 @@ static int budget_ioctl_activy (struct dvb_frontend *fe, unsigned int cmd, void
{ {
struct budget *budget = fe->before_after_data; struct budget *budget = fe->before_after_data;
DEB_EE(("budget: %p\n",budget)); dprintk(2, "budget: %p\n", budget);
switch (cmd) { switch (cmd) {
case FE_SET_VOLTAGE: case FE_SET_VOLTAGE:
...@@ -199,7 +199,7 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_ ...@@ -199,7 +199,7 @@ static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_
return -ENOMEM; return -ENOMEM;
} }
DEB_EE(("dev:%p, info:%p, budget:%p\n",dev,info,budget)); dprintk(2, "dev:%p, info:%p, budget:%p\n", dev, info, budget);
dev->ext_priv = budget; dev->ext_priv = budget;
...@@ -289,7 +289,6 @@ static int __init budget_init(void) ...@@ -289,7 +289,6 @@ static int __init budget_init(void)
static void __exit budget_exit(void) static void __exit budget_exit(void)
{ {
DEB_EE((".\n"));
saa7146_unregister_extension(&budget_extension); saa7146_unregister_extension(&budget_extension);
} }
......
drivers/media/dvb/ttpci/budget.h
View file @ a8ce6c87
...@@ -13,6 +13,13 @@ ...@@ -13,6 +13,13 @@
extern int budget_debug; extern int budget_debug;
#ifdef dprintk
#undef dprintk
#endif
#define dprintk(level,args...) \
do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0)
struct budget_info { struct budget_info {
char *name; char *name;
int type; int type;
......
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