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

Commit 6da34706 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] az6007: Fix compilation troubles at az6007 



Some changes are needed, in order to make az6007 compile with the
upstream tree. Most of the changes are due to the upstream drxk
module.

Even allowing its compilation, the driver is not working yet.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 71d67634

drivers/media/common/tuners/mt2063.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int MT2063_Sleep(struct dvb_frontend *fe) 
	/*

	 *  ToDo:  Add code here to implement a OS blocking

	 */

	msleep(10);

	msleep(100);



	return 0;

}

drivers/media/dvb/dvb-usb/az6007.c

+103 −71
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ 
#include "mt2063.h"

#include "dvb_ca_en50221.h"



/* HACK: Should be moved to the right place */

#define USB_PID_AZUREWAVE_6007		0xccd

#define USB_PID_TERRATEC_H7		0x10b4



/* debug */

int dvb_usb_az6007_debug;

module_param_named(debug,dvb_usb_az6007_debug, int, 0644);
@@ -28,30 +32,39 @@ struct az6007_device_state { 
	struct dvb_ca_en50221 ca;

	struct mutex ca_mutex;

	u8 power_state;

};



struct drxk3913_config az6007_drxk3913_config_DVBT = {	

	.demod_address = 0x52,

	.min_delay_ms = 100,

	.standard	= MTTUNEA_DVBT,

	.set_tuner = mt2063_setTune,

	.tuner_getlocked = mt2063_lockStatus,

	.tuner_MT2063_Open = tuner_MT2063_Open,

	.tuner_MT2063_SoftwareShutdown = tuner_MT2063_SoftwareShutdown,

	.tuner_MT2063_ClearPowerMaskBits = tuner_MT2063_ClearPowerMaskBits,

	/* Due to DRX-K - probably need changes */

	int (*gate_ctrl)(struct dvb_frontend *, int);

	struct semaphore      pll_mutex;

	bool			dont_attach_fe1;

};



struct drxk3913_config az6007_drxk3913_config_DVBC = {	

	.demod_address = 0x52,

	.min_delay_ms = 100,

	.standard	= MTTUNEA_DVBC,

	.set_tuner = mt2063_setTune,

	.tuner_getlocked = mt2063_lockStatus,

	.tuner_MT2063_Open = tuner_MT2063_Open,

	.tuner_MT2063_SoftwareShutdown = tuner_MT2063_SoftwareShutdown,

	.tuner_MT2063_ClearPowerMaskBits = tuner_MT2063_ClearPowerMaskBits,

struct drxk_config terratec_h7_drxk = {

	.adr = 0x29,

	.single_master = 1,

	.no_i2c_bridge = 1,

	.microcode_name = "dvb-usb-terratec-h5-drxk.fw",

};



static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)

{

	struct dvb_usb_adapter *adap = fe->sec_priv;

	struct az6007_device_state *st = adap->priv;

	int status;



	if (!adap || !st)

		return -EINVAL;



	if (enable) {

		down(&st->pll_mutex);

		status = st->gate_ctrl(fe, 1);

	} else {

		status = st->gate_ctrl(fe, 0);

		up(&st->pll_mutex);

	}

	return status;

}



struct mt2063_config az6007_mt2063_config = {

	.tuner_address = 0xc0,

	.refclock = 36125000,
@@ -149,9 +162,9 @@ static int az6007_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) 
}



/* keys for the enclosed remote control */

static struct dvb_usb_rc_key az6007_rc_keys[] = {

	{ 0x00, 0x01, KEY_1 },

	{ 0x00, 0x02, KEY_2 },

struct rc_map_table rc_map_az6007_table[] = {

	{ 0x0001, KEY_1 },

	{ 0x0002, KEY_2 },

};



/* remote control stuff (does not work with my box) */
@@ -350,38 +363,55 @@ static int az6007_frontend_tsbypass(struct dvb_usb_adapter *adap,int onoff) 


static int az6007_frontend_attach(struct dvb_usb_adapter *adap)

{

	struct az6007_device_state *st = adap->priv;



	int result;



	az6007_frontend_poweron(adap);

	az6007_frontend_reset(adap);



	info("az6007_frontend_attach\n");



	if (az6007_type == 0)

	{

		info("az6007_drxk3913_config_DVBT\n");

		adap->fe = drxk3913_attach(&az6007_drxk3913_config_DVBT, &adap->dev->i2c_adap);

	}

	else

	{

		info("az6007_drxk3913_config_DVBC\n");

		adap->fe = drxk3913_attach(&az6007_drxk3913_config_DVBC, &adap->dev->i2c_adap);

	}

	if (adap->fe) {		

		if (mt2063_attach(adap->fe, &az6007_mt2063_config, &adap->dev->i2c_adap)) {

			info("found STB6100 DVB-C/DVB-T frontend @0x%02x\n",az6007_mt2063_config.tuner_address);

	adap->fe = dvb_attach(drxk_attach, &terratec_h7_drxk,

			      &adap->dev->i2c_adap, &adap->fe2);

	if (!adap->fe) {

		result = -EINVAL;

		goto out_free;

	}



	/* FIXME: do we need a pll semaphore? */

	adap->fe->sec_priv = adap;

	sema_init(&st->pll_mutex, 1);

	st->gate_ctrl = adap->fe->ops.i2c_gate_ctrl;

	adap->fe->ops.i2c_gate_ctrl = drxk_gate_ctrl;

	adap->fe2->id = 1;



	/* Attach mt2063 to DVB-C frontend */

	if (adap->fe->ops.i2c_gate_ctrl)

		adap->fe->ops.i2c_gate_ctrl(adap->fe, 1);

	if (!dvb_attach(mt2063_attach, adap->fe, &az6007_mt2063_config,

			&adap->dev->i2c_adap)) {

		result = -EINVAL;



		goto out_free;

	}

	if (adap->fe->ops.i2c_gate_ctrl)

		adap->fe->ops.i2c_gate_ctrl(adap->fe, 0);



	/* Hack - needed due to drxk */

	adap->fe2->tuner_priv = adap->fe->tuner_priv;

	memcpy(&adap->fe2->ops.tuner_ops,

	       &adap->fe->ops.tuner_ops,

	       sizeof(adap->fe->ops.tuner_ops));

	return 0;



			//vp6027_ci_init(adap);

		} else {

			adap->fe = NULL;

		}

	}

	else

	{

out_free:

	if (adap->fe)

		dvb_frontend_detach(adap->fe);

	adap->fe = NULL;

		err("no front-end attached\n");

	}

	//az6007_frontend_tsbypass(adap,0);

	adap->fe2 = NULL;



	return 0;

	return result;

}



static struct dvb_usb_device_properties az6007_properties;
@@ -569,10 +599,12 @@ static struct dvb_usb_device_properties az6007_properties = { 
	//.power_ctrl       = az6007_power_ctrl,

	.read_mac_address = az6007_read_mac_addr,



	.rc_key_map       = az6007_rc_keys,

	.rc_key_map_size  = ARRAY_SIZE(az6007_rc_keys),

	.rc.legacy = {

		.rc_map_table  = rc_map_az6007_table,

		.rc_map_size  = ARRAY_SIZE(rc_map_az6007_table),

		.rc_interval      = 400,

		.rc_query         = az6007_rc_query,

	},

	.i2c_algo         = &az6007_i2c_algo,



	.num_device_descs = 2,