Skip to content

Commit

Permalink
V4L/DVB (7625): au0828: Cleanup
Browse files Browse the repository at this point in the history 
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Apr 24, 2008
1 parent 9c26de5 commit bc3c613
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 96 deletions.
13 changes: 6 additions & 7 deletions drivers/media/video/au0828/au0828-cards.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@
#include "au0828.h"
#include "au0828-cards.h"

#define _dbg(level, fmt, arg...)\
do {\
if (debug >= level) \
printk(KERN_DEBUG DRIVER_NAME "/0: " fmt, ## arg);\
} while (0)

struct au0828_board au0828_boards[] = {
[AU0828_BOARD_UNKNOWN] = {
.name = "Unknown board",
Expand All @@ -51,6 +45,8 @@ int au0828_tuner_callback(void *priv, int command, int arg)
{
struct au0828_dev *dev = priv;

dprintk(1, "%s()\n", __FUNCTION__);

switch(dev->board) {
case AU0828_BOARD_HAUPPAUGE_HVR850:
case AU0828_BOARD_HAUPPAUGE_HVR950Q:
Expand Down Expand Up @@ -97,9 +93,10 @@ static void hauppauge_eeprom(struct au0828_dev *dev, u8 *eeprom_data)

void au0828_card_setup(struct au0828_dev *dev)
{

static u8 eeprom[256];

dprintk(1, "%s()\n", __FUNCTION__);

if (dev->i2c_rc == 0) {
dev->i2c_client.addr = 0xa0 >> 1;
tveeprom_read(&dev->i2c_client, eeprom, sizeof(eeprom));
Expand All @@ -121,6 +118,8 @@ void au0828_card_setup(struct au0828_dev *dev)
*/
void au0828_gpio_setup(struct au0828_dev *dev)
{
dprintk(1, "%s()\n", __FUNCTION__);

switch(dev->board) {
case AU0828_BOARD_HAUPPAUGE_HVR850:
case AU0828_BOARD_HAUPPAUGE_HVR950Q:
Expand Down
71 changes: 43 additions & 28 deletions drivers/media/video/au0828/au0828-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,23 @@

#include "au0828.h"

static unsigned int debug;
/*
* 1 = General debug messages
* 2 = USB handling
* 4 = I2C related
* 8 = Bridge related
*/
unsigned int debug = 0;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable debug messages");

#define _err(fmt, arg...)\
do {\
printk(KERN_ERR DRIVER_NAME "/0: " fmt, ## arg);\
} while (0)

#define _info(fmt, arg...)\
do {\
printk(KERN_INFO DRIVER_NAME "/0: " fmt, ## arg);\
} while (0)
unsigned int usb_debug = 0;
module_param(usb_debug, int, 0644);
MODULE_PARM_DESC(usb_debug, "enable usb debug messages");

#define _dbg(level, fmt, arg...)\
do {\
if (debug >= level) \
printk(KERN_DEBUG DRIVER_NAME "/0: " fmt, ## arg);\
} while (0)
unsigned int bridge_debug = 0;
module_param(bridge_debug, int, 0644);
MODULE_PARM_DESC(bridge_debug, "enable bridge debug messages");

#define _AU0828_BULKPIPE 0x03
#define _BULKPIPESIZE 0xffff
Expand All @@ -61,13 +59,13 @@ static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value,
u32 au0828_readreg(struct au0828_dev *dev, u16 reg)
{
recv_control_msg(dev, CMD_REQUEST_IN, 0, reg, dev->ctrlmsg, 1);
_dbg(3,"%s(0x%x) = 0x%x\n", __FUNCTION__, reg, dev->ctrlmsg[0]);
dprintk(8, "%s(0x%x) = 0x%x\n", __FUNCTION__, reg, dev->ctrlmsg[0]);
return dev->ctrlmsg[0];
}

u32 au0828_writereg(struct au0828_dev *dev, u16 reg, u32 val)
{
_dbg(3,"%s(0x%x, 0x%x)\n", __FUNCTION__, reg, val);
dprintk(8, "%s(0x%x, 0x%x)\n", __FUNCTION__, reg, val);
return send_control_msg(dev, CMD_REQUEST_OUT, val, reg, dev->ctrlmsg, 0);
}

Expand All @@ -76,7 +74,7 @@ static void cmd_msg_dump(struct au0828_dev *dev)
int i;

for (i = 0;i < sizeof(dev->ctrlmsg); i+=16)
_dbg(1,"%s() %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x "
dprintk(2,"%s() %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x "
"%02x %02x %02x %02x %02x %02x\n",
__FUNCTION__,
dev->ctrlmsg[i+0], dev->ctrlmsg[i+1],
Expand Down Expand Up @@ -107,7 +105,7 @@ static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value,
status = min(status, 0);

if (status < 0) {
_err("%s() Failed sending control message, error %d.\n",
printk(KERN_ERR "%s() Failed sending control message, error %d.\n",
__FUNCTION__,
status);
}
Expand Down Expand Up @@ -137,13 +135,12 @@ static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value,
status = min(status, 0);

if (status < 0) {
_err("%s() Failed receiving ctrl msg, error %d.\n",
printk(KERN_ERR "%s() Failed receiving control message, error %d.\n",
__FUNCTION__,
status);
}
else
if (debug > 4)
cmd_msg_dump(dev);
cmd_msg_dump(dev);
}
mutex_unlock(&dev->mutex);
return status;
Expand All @@ -152,7 +149,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
{
struct au0828_dev *dev = usb_get_intfdata(interface);

_dbg(1,"%s()\n", __FUNCTION__);
dprintk(1,"%s()\n", __FUNCTION__);

/* Digital TV */
au0828_dvb_unregister(dev);
Expand Down Expand Up @@ -182,15 +179,15 @@ static int au0828_usb_probe (struct usb_interface *interface,
if (ifnum != 0)
return -ENODEV;

_dbg(1,"%s() vendor id 0x%x device id 0x%x ifnum:%d\n",
dprintk(1,"%s() vendor id 0x%x device id 0x%x ifnum:%d\n",
__FUNCTION__,
le16_to_cpu(usbdev->descriptor.idVendor),
le16_to_cpu(usbdev->descriptor.idProduct),
ifnum);

dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (dev == NULL) {
_err("Unable to allocate memory\n");
printk(KERN_ERR "%s() Unable to allocate memory\n", __FUNCTION__);
return -ENOMEM;
}

Expand All @@ -216,7 +213,7 @@ static int au0828_usb_probe (struct usb_interface *interface,
/* Digital TV */
au0828_dvb_register(dev);

_info("Registered device AU0828 [%s]\n",
printk(KERN_INFO "Registered device AU0828 [%s]\n",
au0828_boards[dev->board].name == NULL ? "Unset" :
au0828_boards[dev->board].name);

Expand All @@ -234,11 +231,29 @@ static int __init au0828_init(void)
{
int ret;

_info("au0828 driver loaded\n");
if(debug)
printk(KERN_INFO "%s() Debugging is enabled\n", __FUNCTION__);

if(usb_debug) {
printk(KERN_INFO "%s() USB Debugging is enabled\n", __FUNCTION__);
debug |= 2;
}

if(i2c_debug) {
printk(KERN_INFO "%s() I2C Debugging is enabled\n", __FUNCTION__);
debug |= 4;
}

if(bridge_debug) {
printk(KERN_INFO "%s() Bridge Debugging is enabled\n", __FUNCTION__);
debug |= 8;
}

printk(KERN_INFO "au0828 driver loaded\n");

ret = usb_register(&au0828_usb_driver);
if (ret)
_err("usb_register failed, error = %d\n", ret);
printk(KERN_ERR "usb_register failed, error = %d\n", ret);

return ret;
}
Expand Down
53 changes: 23 additions & 30 deletions drivers/media/video/au0828/au0828-dvb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,11 @@
#include <media/v4l2-common.h>

#include "au0828.h"

#include "au8522.h"
#include "xc5000.h"

DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);

unsigned int dvb_debug = 1;

#define _dbg(level, fmt, arg...)\
do { if (dvb_debug >= level)\
printk(KERN_DEBUG "%s/0: " fmt, DRIVER_NAME, ## arg);\
} while (0)

static struct au8522_config hauppauge_hvr950q_config = {
.demod_address = 0x8e >> 1,
.status_mode = AU8522_DEMODLOCKING,
Expand All @@ -57,6 +49,8 @@ static void urb_completion(struct urb *purb)
struct au0828_dev *dev = purb->context;
int ptype = usb_pipetype(purb->pipe);

dprintk(2, "%s()\n", __FUNCTION__);

if (!dev)
return;

Expand Down Expand Up @@ -84,7 +78,7 @@ static int stop_urb_transfer(struct au0828_dev *dev)
{
int i;

printk(KERN_INFO "%s()\n", __FUNCTION__);
dprintk(2, "%s()\n", __FUNCTION__);

/* FIXME: Do we need to free the transfer_buffers? */
for (i = 0; i < URB_COUNT; i++) {
Expand All @@ -105,15 +99,11 @@ static int start_urb_transfer(struct au0828_dev *dev)
{
struct urb *purb;
int i, ret = -ENOMEM;
unsigned int pipe = usb_rcvbulkpipe(dev->usbdev, _AU0828_BULKPIPE);
int pipesize = usb_maxpacket(dev->usbdev, pipe, usb_pipeout(pipe));
int packets = _BULKPIPESIZE / pipesize;
int transfer_buflen = packets * pipesize;

printk(KERN_INFO "%s() transfer_buflen = %d\n", __FUNCTION__, transfer_buflen);
dprintk(2, "%s()\n", __FUNCTION__);

if (dev->urb_streaming) {
printk("%s: iso xfer already running!\n", __FUNCTION__);
dprintk(2, "%s: iso xfer already running!\n", __FUNCTION__);
return 0;
}

Expand Down Expand Up @@ -167,17 +157,15 @@ static int au0828_dvb_start_feed(struct dvb_demux_feed *feed)
struct au0828_dvb *dvb = &dev->dvb;
int ret = 0;

printk(KERN_INFO "%s() pid = 0x%x index = %d\n", __FUNCTION__, feed->pid, feed->index);
dprintk(1, "%s()\n", __FUNCTION__);

if (!demux->dmx.frontend)
return -EINVAL;

printk(KERN_INFO "%s() Preparing, feeding = %d\n", __FUNCTION__, dvb->feeding);
if (dvb) {
mutex_lock(&dvb->lock);
if (dvb->feeding++ == 0) {
printk(KERN_INFO "%s() Starting Transport DMA\n",
__FUNCTION__);
/* Start transport */
au0828_write(dev, 0x608, 0x90);
au0828_write(dev, 0x609, 0x72);
au0828_write(dev, 0x60a, 0x71);
Expand All @@ -197,13 +185,12 @@ static int au0828_dvb_stop_feed(struct dvb_demux_feed *feed)
struct au0828_dvb *dvb = &dev->dvb;
int ret = 0;

printk(KERN_INFO "%s() pid = 0x%x index = %d\n", __FUNCTION__, feed->pid, feed->index);
dprintk(1, "%s()\n", __FUNCTION__);

if (dvb) {
mutex_lock(&dvb->lock);
if (--dvb->feeding == 0) {
printk(KERN_INFO "%s() Stopping Transport DMA\n",
__FUNCTION__);
/* Stop transport */
au0828_write(dev, 0x608, 0x00);
au0828_write(dev, 0x609, 0x00);
au0828_write(dev, 0x60a, 0x00);
Expand All @@ -221,11 +208,13 @@ int dvb_register(struct au0828_dev *dev)
struct au0828_dvb *dvb = &dev->dvb;
int result;

dprintk(1, "%s()\n", __FUNCTION__);

/* register adapter */
result = dvb_register_adapter(&dvb->adapter, DRIVER_NAME, THIS_MODULE,
&dev->usbdev->dev, adapter_nr);
if (result < 0) {
printk(KERN_WARNING "%s: dvb_register_adapter failed (errno = %d)\n",
printk(KERN_ERROR "%s: dvb_register_adapter failed (errno = %d)\n",
DRIVER_NAME, result);
goto fail_adapter;
}
Expand All @@ -234,7 +223,7 @@ int dvb_register(struct au0828_dev *dev)
/* register frontend */
result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
if (result < 0) {
printk(KERN_WARNING "%s: dvb_register_frontend failed (errno = %d)\n",
printk(KERN_ERR "%s: dvb_register_frontend failed (errno = %d)\n",
DRIVER_NAME, result);
goto fail_frontend;
}
Expand All @@ -250,7 +239,7 @@ int dvb_register(struct au0828_dev *dev)
dvb->demux.stop_feed = au0828_dvb_stop_feed;
result = dvb_dmx_init(&dvb->demux);
if (result < 0) {
printk(KERN_WARNING "%s: dvb_dmx_init failed (errno = %d)\n",
printk(KERN_ERR "%s: dvb_dmx_init failed (errno = %d)\n",
DRIVER_NAME, result);
goto fail_dmx;
}
Expand All @@ -260,30 +249,30 @@ int dvb_register(struct au0828_dev *dev)
dvb->dmxdev.capabilities = 0;
result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
if (result < 0) {
printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",
printk(KERN_ERR "%s: dvb_dmxdev_init failed (errno = %d)\n",
DRIVER_NAME, result);
goto fail_dmxdev;
}

dvb->fe_hw.source = DMX_FRONTEND_0;
result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_hw);
if (result < 0) {
printk(KERN_WARNING "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
printk(KERN_ERR "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
DRIVER_NAME, result);
goto fail_fe_hw;
}

dvb->fe_mem.source = DMX_MEMORY_FE;
result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_mem);
if (result < 0) {
printk(KERN_WARNING "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
printk(KERN_ERR "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
DRIVER_NAME, result);
goto fail_fe_mem;
}

result = dvb->demux.dmx.connect_frontend(&dvb->demux.dmx, &dvb->fe_hw);
if (result < 0) {
printk(KERN_WARNING "%s: connect_frontend failed (errno = %d)\n",
printk(KERN_ERR "%s: connect_frontend failed (errno = %d)\n",
DRIVER_NAME, result);
goto fail_fe_conn;
}
Expand Down Expand Up @@ -313,6 +302,8 @@ void au0828_dvb_unregister(struct au0828_dev *dev)
{
struct au0828_dvb *dvb = &dev->dvb;

dprintk(1, "%s()\n", __FUNCTION__);

if(dvb->frontend == NULL)
return;

Expand All @@ -335,6 +326,8 @@ int au0828_dvb_register(struct au0828_dev *dev)
struct au0828_dvb *dvb = &dev->dvb;
int ret;

dprintk(1, "%s()\n", __FUNCTION__);

/* init frontend */
switch (dev->board) {
case AU0828_BOARD_HAUPPAUGE_HVR850:
Expand All @@ -355,7 +348,7 @@ int au0828_dvb_register(struct au0828_dev *dev)
break;
}
if (NULL == dvb->frontend) {
printk("Frontend initialization failed\n");
printk(KERN_ERR "%s() Frontend initialization failed\n", __FUNCTION__);
return -1;
}

Expand Down
Loading

0 comments on commit bc3c613

Please sign in to comment.