Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73c993a8 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7045): xc5000: Small amount of cleanup and commenting 



xc5000: Small amount of cleanup and commenting, just for clarification.

Signed-off-by: default avatarSteven Toth <stoth@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 8c70017f

drivers/media/dvb/frontends/xc5000.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/videodev2.h>

#include <linux/videodev.h>

#include <linux/delay.h>

#include <linux/dvb/frontend.h>

#include <linux/i2c.h>
@@ -212,7 +212,7 @@ static void xc5000_TunerReset(struct dvb_frontend *fe) 
	dprintk(1, "%s()\n", __FUNCTION__);



	if (priv->cfg->tuner_callback) {

		ret = priv->cfg->tuner_callback(priv->cfg->video_dev,

		ret = priv->cfg->tuner_callback(priv->cfg->priv,

						XC5000_TUNER_RESET, 0);

		if (ret)

			printk(KERN_ERR "xc5000: reset failed\n");

drivers/media/dvb/frontends/xc5000.h

+10 −2
Original line number Diff line number Diff line
@@ -30,8 +30,16 @@ struct i2c_adapter; 
struct xc5000_config {

	u8   i2c_address;

	u32  if_khz;

	void *video_dev;

	int  (*tuner_callback) (void *dev, int command, int arg);



	/* For each bridge framework, when it attaches either analog or digital,

	 * it has to store a reference back to its _core equivalent structure,

	 * so that it can service the hardware by steering gpio's etc.

	 * Each bridge implementation is different so cast priv accordingly.

	 * The xc5000 driver cares not for this value, other than ensuring

	 * it's passed back to a bridge during tuner_callback().

	 */

	void *priv;

	int  (*tuner_callback) (void *priv, int command, int arg);

};



/* xc5000 callback command */

drivers/media/video/cx23885/cx23885-cards.c

+3 −3
Original line number Diff line number Diff line
@@ -247,9 +247,9 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data) 
/* Tuner callback function for cx23885 boards. Currently only needed

 * for HVR1500Q, which has an xc5000 tuner.

 */

int cx23885_tuner_callback(void *i2c_bus, int command, int arg)

int cx23885_tuner_callback(void *priv, int command, int arg)

{

	struct cx23885_i2c *bus = i2c_bus;

	struct cx23885_i2c *bus = priv;

	struct cx23885_dev *dev = bus->dev;



	switch(dev->board) {
@@ -271,7 +271,7 @@ int cx23885_tuner_callback(void *i2c_bus, int command, int arg) 


	return 0; /* Should never be here */

}

EXPORT_SYMBOL(cx23885_tuner_callback);



void cx23885_gpio_setup(struct cx23885_dev *dev)

{

	switch(dev->board) {

drivers/media/video/cx23885/cx23885-dvb.c

+1 −6
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ static struct s5h1409_config hauppauge_hvr1500q_config = { 
static struct xc5000_config hauppauge_hvr1500q_tunerconfig = {

	.i2c_address      = 0x61,

	.if_khz           = 5380,

	/* cannot set .video_dev here, do it before attach. */

	.tuner_callback   = cx23885_tuner_callback

};
@@ -282,11 +281,7 @@ static int dvb_register(struct cx23885_tsport *port) 
						&hauppauge_hvr1500q_config,

						&dev->i2c_bus[0].i2c_adap);

		if (port->dvb.frontend != NULL) {

			/* tunerconfig.video_dev must point to

			 * i2c_adap.algo_data

			 */

			hauppauge_hvr1500q_tunerconfig.video_dev =

				i2c_bus->i2c_adap.algo_data;

			hauppauge_hvr1500q_tunerconfig.priv = i2c_bus;

			dvb_attach(xc5000_attach, port->dvb.frontend,

				&i2c_bus->i2c_adap,

				&hauppauge_hvr1500q_tunerconfig);

drivers/media/video/cx23885/cx23885.h

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ extern const unsigned int cx23885_bcount; 
extern struct cx23885_subid cx23885_subids[];

extern const unsigned int cx23885_idcount;



extern int cx23885_tuner_callback(void *i2c_bus, int command, int arg);

extern int cx23885_tuner_callback(void *priv, int command, int arg);

extern void cx23885_card_list(struct cx23885_dev *dev);

extern int  cx23885_ir_init(struct cx23885_dev *dev);

extern void cx23885_gpio_setup(struct cx23885_dev *dev);