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

Commit 74340b0a authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4457): Remove dib3000-common-module 



removing the dib3000-common-module. The common stuff is not common anymore - it will be only used by the 3000mb-driver.
A new 3000mc/p-driver will be added which will share common stuff with dib7000.

Signed-off-by: default avatarPatrick Boettcher <pb@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 46f73f93

drivers/media/dvb/frontends/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ obj-$(CONFIG_DVB_CX22700) += cx22700.o 
obj-$(CONFIG_DVB_CX24110) += cx24110.o

obj-$(CONFIG_DVB_TDA8083) += tda8083.o

obj-$(CONFIG_DVB_L64781) += l64781.o

obj-$(CONFIG_DVB_DIB3000MB) += dib3000mb.o dib3000-common.o

obj-$(CONFIG_DVB_DIB3000MC) += dib3000mc.o dib3000-common.o

obj-$(CONFIG_DVB_DIB3000MB) += dib3000mb.o

obj-$(CONFIG_DVB_DIB3000MC) += dib3000mc.o

obj-$(CONFIG_DVB_MT312) += mt312.o

obj-$(CONFIG_DVB_VES1820) += ves1820.o

obj-$(CONFIG_DVB_VES1X93) += ves1x93.o

drivers/media/dvb/frontends/dib3000-common.c

deleted100644 → 0
+0 −83
Original line number Diff line number Diff line 
#include "dib3000-common.h"



#ifdef CONFIG_DVB_DIBCOM_DEBUG

static int debug;

module_param(debug, int, 0644);

MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c,4=srch (|-able)).");

#endif

#define deb_info(args...) dprintk(0x01,args)

#define deb_i2c(args...) dprintk(0x02,args)

#define deb_srch(args...) dprintk(0x04,args)





int dib3000_read_reg(struct dib3000_state *state, u16 reg)

{

	u8 wb[] = { ((reg >> 8) | 0x80) & 0xff, reg & 0xff };

	u8 rb[2];

	struct i2c_msg msg[] = {

		{ .addr = state->config.demod_address, .flags = 0,        .buf = wb, .len = 2 },

		{ .addr = state->config.demod_address, .flags = I2C_M_RD, .buf = rb, .len = 2 },

	};



	if (i2c_transfer(state->i2c, msg, 2) != 2)

		deb_i2c("i2c read error\n");



	deb_i2c("reading i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n",reg,reg,

			(rb[0] << 8) | rb[1],(rb[0] << 8) | rb[1]);



	return (rb[0] << 8) | rb[1];

}



int dib3000_write_reg(struct dib3000_state *state, u16 reg, u16 val)

{

	u8 b[] = {

		(reg >> 8) & 0xff, reg & 0xff,

		(val >> 8) & 0xff, val & 0xff,

	};

	struct i2c_msg msg[] = {

		{ .addr = state->config.demod_address, .flags = 0, .buf = b, .len = 4 }

	};

	deb_i2c("writing i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n",reg,reg,val,val);



	return i2c_transfer(state->i2c,msg, 1) != 1 ? -EREMOTEIO : 0;

}



int dib3000_search_status(u16 irq,u16 lock)

{

	if (irq & 0x02) {

		if (lock & 0x01) {

			deb_srch("auto search succeeded\n");

			return 1; // auto search succeeded

		} else {

			deb_srch("auto search not successful\n");

			return 0; // auto search failed

		}

	} else if (irq & 0x01)  {

		deb_srch("auto search failed\n");

		return 0; // auto search failed

	}

	return -1; // try again

}



/* for auto search */

u16 dib3000_seq[2][2][2] =     /* fft,gua,   inv   */

	{ /* fft */

		{ /* gua */

			{ 0, 1 },                   /*  0   0   { 0,1 } */

			{ 3, 9 },                   /*  0   1   { 0,1 } */

		},

		{

			{ 2, 5 },                   /*  1   0   { 0,1 } */

			{ 6, 11 },                  /*  1   1   { 0,1 } */

		}

	};



MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de");

MODULE_DESCRIPTION("Common functions for the dib3000mb/dib3000mc dvb frontend drivers");

MODULE_LICENSE("GPL");



EXPORT_SYMBOL(dib3000_seq);



EXPORT_SYMBOL(dib3000_read_reg);

EXPORT_SYMBOL(dib3000_write_reg);

EXPORT_SYMBOL(dib3000_search_status);

drivers/media/dvb/frontends/dib3000-common.h

deleted100644 → 0
+0 −135
Original line number Diff line number Diff line 
/*

 * .h-files for the common use of the frontend drivers made by DiBcom

 * DiBcom 3000M-B/C, 3000P

 *

 * DiBcom (http://www.dibcom.fr/)

 *

 * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)

 *

 * based on GPL code from DibCom, which has

 *

 * Copyright (C) 2004 Amaury Demol for DiBcom (ademol@dibcom.fr)

 *

 *	This program is free software; you can redistribute it and/or

 *	modify it under the terms of the GNU General Public License as

 *	published by the Free Software Foundation, version 2.

 *

 * Acknowledgements

 *

 *  Amaury Demol (ademol@dibcom.fr) from DiBcom for providing specs and driver

 *  sources, on which this driver (and the dvb-dibusb) are based.

 *

 * see Documentation/dvb/README.dibusb for more information

 *

 */



#ifndef DIB3000_COMMON_H

#define DIB3000_COMMON_H



#include "dvb_frontend.h"

#include "dib3000.h"



/* info and err, taken from usb.h, if there is anything available like by default. */

#define err(format, arg...)  printk(KERN_ERR     "dib3000: " format "\n" , ## arg)

#define info(format, arg...) printk(KERN_INFO    "dib3000: " format "\n" , ## arg)

#define warn(format, arg...) printk(KERN_WARNING "dib3000: " format "\n" , ## arg)



/* frontend state */

struct dib3000_state {

	struct i2c_adapter* i2c;



/* configuration settings */

	struct dib3000_config config;



	struct dvb_frontend frontend;

	int timing_offset;

	int timing_offset_comp_done;



	fe_bandwidth_t last_tuned_bw;

	u32 last_tuned_freq;

};



/* commonly used methods by the dib3000mb/mc/p frontend */

extern int dib3000_read_reg(struct dib3000_state *state, u16 reg);

extern int dib3000_write_reg(struct dib3000_state *state, u16 reg, u16 val);



extern int dib3000_search_status(u16 irq,u16 lock);



/* handy shortcuts */

#define rd(reg) dib3000_read_reg(state,reg)



#define wr(reg,val) if (dib3000_write_reg(state,reg,val)) \

	{ err("while sending 0x%04x to 0x%04x.",val,reg); return -EREMOTEIO; }



#define wr_foreach(a,v) { int i; \

	if (sizeof(a) != sizeof(v)) \

		err("sizeof: %zu %zu is different",sizeof(a),sizeof(v));\

	for (i=0; i < sizeof(a)/sizeof(u16); i++) \

		wr(a[i],v[i]); \

	}



#define set_or(reg,val) wr(reg,rd(reg) | val)



#define set_and(reg,val) wr(reg,rd(reg) & val)





/* debug */



#ifdef CONFIG_DVB_DIBCOM_DEBUG

#define dprintk(level,args...) \

    do { if ((debug & level)) { printk(args); } } while (0)

#else

#define dprintk(args...) do { } while (0)

#endif



/* mask for enabling a specific pid for the pid_filter */

#define DIB3000_ACTIVATE_PID_FILTERING	(0x2000)



/* common values for tuning */

#define DIB3000_ALPHA_0					(     0)

#define DIB3000_ALPHA_1					(     1)

#define DIB3000_ALPHA_2					(     2)

#define DIB3000_ALPHA_4					(     4)



#define DIB3000_CONSTELLATION_QPSK		(     0)

#define DIB3000_CONSTELLATION_16QAM		(     1)

#define DIB3000_CONSTELLATION_64QAM		(     2)



#define DIB3000_GUARD_TIME_1_32			(     0)

#define DIB3000_GUARD_TIME_1_16			(     1)

#define DIB3000_GUARD_TIME_1_8			(     2)

#define DIB3000_GUARD_TIME_1_4			(     3)



#define DIB3000_TRANSMISSION_MODE_2K	(     0)

#define DIB3000_TRANSMISSION_MODE_8K	(     1)



#define DIB3000_SELECT_LP				(     0)

#define DIB3000_SELECT_HP				(     1)



#define DIB3000_FEC_1_2					(     1)

#define DIB3000_FEC_2_3					(     2)

#define DIB3000_FEC_3_4					(     3)

#define DIB3000_FEC_5_6					(     5)

#define DIB3000_FEC_7_8					(     7)



#define DIB3000_HRCH_OFF				(     0)

#define DIB3000_HRCH_ON					(     1)



#define DIB3000_DDS_INVERSION_OFF		(     0)

#define DIB3000_DDS_INVERSION_ON		(     1)



#define DIB3000_TUNER_WRITE_ENABLE(a)	(0xffff & (a << 8))

#define DIB3000_TUNER_WRITE_DISABLE(a)	(0xffff & ((a << 8) | (1 << 7)))



/* for auto search */

extern u16 dib3000_seq[2][2][2];



#define DIB3000_REG_MANUFACTOR_ID		(  1025)

#define DIB3000_I2C_ID_DIBCOM			(0x01b3)



#define DIB3000_REG_DEVICE_ID			(  1026)

#define DIB3000MB_DEVICE_ID				(0x3000)

#define DIB3000MC_DEVICE_ID				(0x3001)

#define DIB3000P_DEVICE_ID				(0x3002)



#endif // DIB3000_COMMON_H

drivers/media/dvb/frontends/dib3000mb.c

+74 −2
Original line number Diff line number Diff line
@@ -29,9 +29,10 @@ 
#include <linux/string.h>

#include <linux/slab.h>



#include "dib3000-common.h"

#include "dib3000mb_priv.h"

#include "dvb_frontend.h"



#include "dib3000.h"

#include "dib3000mb_priv.h"



/* Version information */

#define DRIVER_VERSION "0.1"
@@ -44,10 +45,81 @@ module_param(debug, int, 0644); 
MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=setfe,8=getfe (|-able)).");

#endif

#define deb_info(args...) dprintk(0x01,args)

#define deb_i2c(args...)  dprintk(0x02,args)

#define deb_srch(args...) dprintk(0x04,args)

#define deb_info(args...) dprintk(0x01,args)

#define deb_xfer(args...) dprintk(0x02,args)

#define deb_setf(args...) dprintk(0x04,args)

#define deb_getf(args...) dprintk(0x08,args)



#ifdef CONFIG_DVB_DIBCOM_DEBUG

static int debug;

module_param(debug, int, 0644);

MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c,4=srch (|-able)).");

#endif



static int dib3000_read_reg(struct dib3000_state *state, u16 reg)

{

	u8 wb[] = { ((reg >> 8) | 0x80) & 0xff, reg & 0xff };

	u8 rb[2];

	struct i2c_msg msg[] = {

		{ .addr = state->config.demod_address, .flags = 0,        .buf = wb, .len = 2 },

		{ .addr = state->config.demod_address, .flags = I2C_M_RD, .buf = rb, .len = 2 },

	};



	if (i2c_transfer(state->i2c, msg, 2) != 2)

		deb_i2c("i2c read error\n");



	deb_i2c("reading i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n",reg,reg,

			(rb[0] << 8) | rb[1],(rb[0] << 8) | rb[1]);



	return (rb[0] << 8) | rb[1];

}



static int dib3000_write_reg(struct dib3000_state *state, u16 reg, u16 val)

{

	u8 b[] = {

		(reg >> 8) & 0xff, reg & 0xff,

		(val >> 8) & 0xff, val & 0xff,

	};

	struct i2c_msg msg[] = {

		{ .addr = state->config.demod_address, .flags = 0, .buf = b, .len = 4 }

	};

	deb_i2c("writing i2c bus (reg: %5d 0x%04x, val: %5d 0x%04x)\n",reg,reg,val,val);



	return i2c_transfer(state->i2c,msg, 1) != 1 ? -EREMOTEIO : 0;

}



static int dib3000_search_status(u16 irq,u16 lock)

{

	if (irq & 0x02) {

		if (lock & 0x01) {

			deb_srch("auto search succeeded\n");

			return 1; // auto search succeeded

		} else {

			deb_srch("auto search not successful\n");

			return 0; // auto search failed

		}

	} else if (irq & 0x01)  {

		deb_srch("auto search failed\n");

		return 0; // auto search failed

	}

	return -1; // try again

}



/* for auto search */

static u16 dib3000_seq[2][2][2] =     /* fft,gua,   inv   */

	{ /* fft */

		{ /* gua */

			{ 0, 1 },                   /*  0   0   { 0,1 } */

			{ 3, 9 },                   /*  0   1   { 0,1 } */

		},

		{

			{ 2, 5 },                   /*  1   0   { 0,1 } */

			{ 6, 11 },                  /*  1   1   { 0,1 } */

		}

	};



static int dib3000mb_get_frontend(struct dvb_frontend* fe,

				  struct dvb_frontend_parameters *fep);

drivers/media/dvb/frontends/dib3000mb_priv.h

+96 −0
Original line number Diff line number Diff line
@@ -13,6 +13,102 @@ 
#ifndef __DIB3000MB_PRIV_H_INCLUDED__

#define __DIB3000MB_PRIV_H_INCLUDED__



/* info and err, taken from usb.h, if there is anything available like by default. */

#define err(format, arg...)  printk(KERN_ERR     "dib3000: " format "\n" , ## arg)

#define info(format, arg...) printk(KERN_INFO    "dib3000: " format "\n" , ## arg)

#define warn(format, arg...) printk(KERN_WARNING "dib3000: " format "\n" , ## arg)



/* handy shortcuts */

#define rd(reg) dib3000_read_reg(state,reg)



#define wr(reg,val) if (dib3000_write_reg(state,reg,val)) \

	{ err("while sending 0x%04x to 0x%04x.",val,reg); return -EREMOTEIO; }



#define wr_foreach(a,v) { int i; \

	if (sizeof(a) != sizeof(v)) \

		err("sizeof: %zu %zu is different",sizeof(a),sizeof(v));\

	for (i=0; i < sizeof(a)/sizeof(u16); i++) \

		wr(a[i],v[i]); \

	}



#define set_or(reg,val) wr(reg,rd(reg) | val)



#define set_and(reg,val) wr(reg,rd(reg) & val)



/* debug */



#ifdef CONFIG_DVB_DIBCOM_DEBUG

#define dprintk(level,args...) \

    do { if ((debug & level)) { printk(args); } } while (0)

#else

#define dprintk(args...) do { } while (0)

#endif



/* mask for enabling a specific pid for the pid_filter */

#define DIB3000_ACTIVATE_PID_FILTERING	(0x2000)



/* common values for tuning */

#define DIB3000_ALPHA_0					(     0)

#define DIB3000_ALPHA_1					(     1)

#define DIB3000_ALPHA_2					(     2)

#define DIB3000_ALPHA_4					(     4)



#define DIB3000_CONSTELLATION_QPSK		(     0)

#define DIB3000_CONSTELLATION_16QAM		(     1)

#define DIB3000_CONSTELLATION_64QAM		(     2)



#define DIB3000_GUARD_TIME_1_32			(     0)

#define DIB3000_GUARD_TIME_1_16			(     1)

#define DIB3000_GUARD_TIME_1_8			(     2)

#define DIB3000_GUARD_TIME_1_4			(     3)



#define DIB3000_TRANSMISSION_MODE_2K	(     0)

#define DIB3000_TRANSMISSION_MODE_8K	(     1)



#define DIB3000_SELECT_LP				(     0)

#define DIB3000_SELECT_HP				(     1)



#define DIB3000_FEC_1_2					(     1)

#define DIB3000_FEC_2_3					(     2)

#define DIB3000_FEC_3_4					(     3)

#define DIB3000_FEC_5_6					(     5)

#define DIB3000_FEC_7_8					(     7)



#define DIB3000_HRCH_OFF				(     0)

#define DIB3000_HRCH_ON					(     1)



#define DIB3000_DDS_INVERSION_OFF		(     0)

#define DIB3000_DDS_INVERSION_ON		(     1)



#define DIB3000_TUNER_WRITE_ENABLE(a)	(0xffff & (a << 8))

#define DIB3000_TUNER_WRITE_DISABLE(a)	(0xffff & ((a << 8) | (1 << 7)))



/* for auto search */

extern u16 dib3000_seq[2][2][2];



#define DIB3000_REG_MANUFACTOR_ID		(  1025)

#define DIB3000_I2C_ID_DIBCOM			(0x01b3)



#define DIB3000_REG_DEVICE_ID			(  1026)

#define DIB3000MB_DEVICE_ID				(0x3000)

#define DIB3000MC_DEVICE_ID				(0x3001)

#define DIB3000P_DEVICE_ID				(0x3002)



/* frontend state */

struct dib3000_state {

	struct i2c_adapter* i2c;



/* configuration settings */

	struct dib3000_config config;



	struct dvb_frontend frontend;

	int timing_offset;

	int timing_offset_comp_done;



	fe_bandwidth_t last_tuned_bw;

	u32 last_tuned_freq;

};



/* register addresses and some of their default values */



/* restart subsystems */