Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 250256
b: refs/heads/master
c: 9ac51c5
h: refs/heads/master
v: v3
  • Loading branch information
Steve Kerrison authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent b685c43 commit 032bcc0
Show file tree
Hide file tree
Showing 7 changed files with 145 additions and 43 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d6a5f921fb8cbd418b298e5bbe83e5c8c8e1da16
refs/heads/master: 9ac51c5e53d6b16c9a3fa541117cf96dedd6b3dd
1 change: 1 addition & 0 deletions trunk/drivers/media/dvb/frontends/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ stb0899-objs = stb0899_drv.o stb0899_algo.o
stv0900-objs = stv0900_core.o stv0900_sw.o
au8522-objs = au8522_dig.o au8522_decoder.o
drxd-objs = drxd_firm.o drxd_hard.o
cxd2820r-objs = cxd2820r_core.o cxd2820r_c.o cxd2820r_t.o cxd2820r_t2.o

obj-$(CONFIG_DVB_PLL) += dvb-pll.o
obj-$(CONFIG_DVB_STV0299) += stv0299.o
Expand Down
22 changes: 12 additions & 10 deletions trunk/drivers/media/dvb/frontends/cxd2820r_c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
*/


static int cxd2820r_set_frontend_c(struct dvb_frontend *fe,
#include "cxd2820r_priv.h"

int cxd2820r_set_frontend_c(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
Expand Down Expand Up @@ -92,7 +94,7 @@ static int cxd2820r_set_frontend_c(struct dvb_frontend *fe,
return ret;
}

static int cxd2820r_get_frontend_c(struct dvb_frontend *fe,
int cxd2820r_get_frontend_c(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
Expand Down Expand Up @@ -143,7 +145,7 @@ static int cxd2820r_get_frontend_c(struct dvb_frontend *fe,
return ret;
}

static int cxd2820r_read_ber_c(struct dvb_frontend *fe, u32 *ber)
int cxd2820r_read_ber_c(struct dvb_frontend *fe, u32 *ber)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret;
Expand Down Expand Up @@ -177,7 +179,7 @@ static int cxd2820r_read_ber_c(struct dvb_frontend *fe, u32 *ber)
return ret;
}

static int cxd2820r_read_signal_strength_c(struct dvb_frontend *fe,
int cxd2820r_read_signal_strength_c(struct dvb_frontend *fe,
u16 *strength)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
Expand Down Expand Up @@ -207,7 +209,7 @@ static int cxd2820r_read_signal_strength_c(struct dvb_frontend *fe,
return ret;
}

static int cxd2820r_read_snr_c(struct dvb_frontend *fe, u16 *snr)
int cxd2820r_read_snr_c(struct dvb_frontend *fe, u16 *snr)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret;
Expand Down Expand Up @@ -244,14 +246,14 @@ static int cxd2820r_read_snr_c(struct dvb_frontend *fe, u16 *snr)
return ret;
}

static int cxd2820r_read_ucblocks_c(struct dvb_frontend *fe, u32 *ucblocks)
int cxd2820r_read_ucblocks_c(struct dvb_frontend *fe, u32 *ucblocks)
{
*ucblocks = 0;
/* no way to read ? */
return 0;
}

static int cxd2820r_read_status_c(struct dvb_frontend *fe, fe_status_t *status)
int cxd2820r_read_status_c(struct dvb_frontend *fe, fe_status_t *status)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret;
Expand Down Expand Up @@ -280,7 +282,7 @@ static int cxd2820r_read_status_c(struct dvb_frontend *fe, fe_status_t *status)
return ret;
}

static int cxd2820r_init_c(struct dvb_frontend *fe)
int cxd2820r_init_c(struct dvb_frontend *fe)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret;
Expand All @@ -295,7 +297,7 @@ static int cxd2820r_init_c(struct dvb_frontend *fe)
return ret;
}

static int cxd2820r_sleep_c(struct dvb_frontend *fe)
int cxd2820r_sleep_c(struct dvb_frontend *fe)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret, i;
Expand Down Expand Up @@ -324,7 +326,7 @@ static int cxd2820r_sleep_c(struct dvb_frontend *fe)
return ret;
}

static int cxd2820r_get_tune_settings_c(struct dvb_frontend *fe,
int cxd2820r_get_tune_settings_c(struct dvb_frontend *fe,
struct dvb_frontend_tune_settings *s)
{
s->min_delay_ms = 500;
Expand Down
19 changes: 7 additions & 12 deletions trunk/drivers/media/dvb/frontends/cxd2820r.c → ...ivers/media/dvb/frontends/cxd2820r_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg,
}

/* write multiple registers */
static int cxd2820r_wr_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
int cxd2820r_wr_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
int len)
{
int ret;
Expand All @@ -119,7 +119,7 @@ static int cxd2820r_wr_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
}

/* read multiple registers */
static int cxd2820r_rd_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
int cxd2820r_rd_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
int len)
{
int ret;
Expand All @@ -145,19 +145,19 @@ static int cxd2820r_rd_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
}

/* write single register */
static int cxd2820r_wr_reg(struct cxd2820r_priv *priv, u32 reg, u8 val)
int cxd2820r_wr_reg(struct cxd2820r_priv *priv, u32 reg, u8 val)
{
return cxd2820r_wr_regs(priv, reg, &val, 1);
}

/* read single register */
static int cxd2820r_rd_reg(struct cxd2820r_priv *priv, u32 reg, u8 *val)
int cxd2820r_rd_reg(struct cxd2820r_priv *priv, u32 reg, u8 *val)
{
return cxd2820r_rd_regs(priv, reg, val, 1);
}

/* write single register with mask */
static int cxd2820r_wr_reg_mask(struct cxd2820r_priv *priv, u32 reg, u8 val,
int cxd2820r_wr_reg_mask(struct cxd2820r_priv *priv, u32 reg, u8 val,
u8 mask)
{
int ret;
Expand All @@ -177,7 +177,7 @@ static int cxd2820r_wr_reg_mask(struct cxd2820r_priv *priv, u32 reg, u8 val,
return cxd2820r_wr_reg(priv, reg, val);
}

static int cxd2820r_gpio(struct dvb_frontend *fe)
int cxd2820r_gpio(struct dvb_frontend *fe)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret, i;
Expand Down Expand Up @@ -285,16 +285,11 @@ static void cxd2820r_unlock(struct cxd2820r_priv *priv, int active_fe)
}

/* 64 bit div with round closest, like DIV_ROUND_CLOSEST but 64 bit */
static u32 cxd2820r_div_u64_round_closest(u64 dividend, u32 divisor)
u32 cxd2820r_div_u64_round_closest(u64 dividend, u32 divisor)
{
return div_u64(dividend + (divisor / 2), divisor);
}

/* TODO: ... */
#include "cxd2820r_t.c"
#include "cxd2820r_c.c"
#include "cxd2820r_t2.c"

static int cxd2820r_set_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{
Expand Down
102 changes: 101 additions & 1 deletion trunk/drivers/media/dvb/frontends/cxd2820r_priv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#ifndef CXD2820R_PRIV_H
#define CXD2820R_PRIV_H

#include <linux/dvb/version.h>
#include "dvb_frontend.h"
#include "dvb_math.h"
#include "cxd2820r.h"
Expand Down Expand Up @@ -70,8 +71,107 @@ struct cxd2820r_priv {

u8 bank[2];
u8 gpio[3];

fe_delivery_system_t delivery_system;
};

/* cxd2820r_core.c */

extern int cxd2820r_debug;

int cxd2820r_gpio(struct dvb_frontend *fe);

int cxd2820r_wr_reg_mask(struct cxd2820r_priv *priv, u32 reg, u8 val,
u8 mask);

int cxd2820r_wr_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
int len);

u32 cxd2820r_div_u64_round_closest(u64 dividend, u32 divisor);

int cxd2820r_wr_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
int len);

int cxd2820r_rd_regs(struct cxd2820r_priv *priv, u32 reginfo, u8 *val,
int len);

int cxd2820r_wr_reg(struct cxd2820r_priv *priv, u32 reg, u8 val);

int cxd2820r_rd_reg(struct cxd2820r_priv *priv, u32 reg, u8 *val);

/* cxd2820r_c.c */

int cxd2820r_get_frontend_c(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p);

int cxd2820r_set_frontend_c(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params);

int cxd2820r_read_status_c(struct dvb_frontend *fe, fe_status_t *status);

int cxd2820r_read_ber_c(struct dvb_frontend *fe, u32 *ber);

int cxd2820r_read_signal_strength_c(struct dvb_frontend *fe, u16 *strength);

int cxd2820r_read_snr_c(struct dvb_frontend *fe, u16 *snr);

int cxd2820r_read_ucblocks_c(struct dvb_frontend *fe, u32 *ucblocks);

int cxd2820r_init_c(struct dvb_frontend *fe);

int cxd2820r_sleep_c(struct dvb_frontend *fe);

int cxd2820r_get_tune_settings_c(struct dvb_frontend *fe,
struct dvb_frontend_tune_settings *s);

/* cxd2820r_t.c */

int cxd2820r_get_frontend_t(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p);

int cxd2820r_set_frontend_t(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params);

int cxd2820r_read_status_t(struct dvb_frontend *fe, fe_status_t *status);

int cxd2820r_read_ber_t(struct dvb_frontend *fe, u32 *ber);

int cxd2820r_read_signal_strength_t(struct dvb_frontend *fe, u16 *strength);

int cxd2820r_read_snr_t(struct dvb_frontend *fe, u16 *snr);

int cxd2820r_read_ucblocks_t(struct dvb_frontend *fe, u32 *ucblocks);

int cxd2820r_init_t(struct dvb_frontend *fe);

int cxd2820r_sleep_t(struct dvb_frontend *fe);

int cxd2820r_get_tune_settings_t(struct dvb_frontend *fe,
struct dvb_frontend_tune_settings *s);

/* cxd2820r_t2.c */

int cxd2820r_get_frontend_t2(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p);

int cxd2820r_set_frontend_t2(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params);

int cxd2820r_read_status_t2(struct dvb_frontend *fe, fe_status_t *status);

int cxd2820r_read_ber_t2(struct dvb_frontend *fe, u32 *ber);

int cxd2820r_read_signal_strength_t2(struct dvb_frontend *fe, u16 *strength);

int cxd2820r_read_snr_t2(struct dvb_frontend *fe, u16 *snr);

int cxd2820r_read_ucblocks_t2(struct dvb_frontend *fe, u32 *ucblocks);

int cxd2820r_init_t2(struct dvb_frontend *fe);

int cxd2820r_sleep_t2(struct dvb_frontend *fe);

int cxd2820r_get_tune_settings_t2(struct dvb_frontend *fe,
struct dvb_frontend_tune_settings *s);

#endif /* CXD2820R_PRIV_H */
22 changes: 12 additions & 10 deletions trunk/drivers/media/dvb/frontends/cxd2820r_t.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
*/


static int cxd2820r_set_frontend_t(struct dvb_frontend *fe,
#include "cxd2820r_priv.h"

int cxd2820r_set_frontend_t(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
Expand Down Expand Up @@ -133,7 +135,7 @@ static int cxd2820r_set_frontend_t(struct dvb_frontend *fe,
return ret;
}

static int cxd2820r_get_frontend_t(struct dvb_frontend *fe,
int cxd2820r_get_frontend_t(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
Expand Down Expand Up @@ -251,7 +253,7 @@ static int cxd2820r_get_frontend_t(struct dvb_frontend *fe,
return ret;
}

static int cxd2820r_read_ber_t(struct dvb_frontend *fe, u32 *ber)
int cxd2820r_read_ber_t(struct dvb_frontend *fe, u32 *ber)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret;
Expand Down Expand Up @@ -285,7 +287,7 @@ static int cxd2820r_read_ber_t(struct dvb_frontend *fe, u32 *ber)
return ret;
}

static int cxd2820r_read_signal_strength_t(struct dvb_frontend *fe,
int cxd2820r_read_signal_strength_t(struct dvb_frontend *fe,
u16 *strength)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
Expand All @@ -309,7 +311,7 @@ static int cxd2820r_read_signal_strength_t(struct dvb_frontend *fe,
return ret;
}

static int cxd2820r_read_snr_t(struct dvb_frontend *fe, u16 *snr)
int cxd2820r_read_snr_t(struct dvb_frontend *fe, u16 *snr)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret;
Expand Down Expand Up @@ -337,14 +339,14 @@ static int cxd2820r_read_snr_t(struct dvb_frontend *fe, u16 *snr)
return ret;
}

static int cxd2820r_read_ucblocks_t(struct dvb_frontend *fe, u32 *ucblocks)
int cxd2820r_read_ucblocks_t(struct dvb_frontend *fe, u32 *ucblocks)
{
*ucblocks = 0;
/* no way to read ? */
return 0;
}

static int cxd2820r_read_status_t(struct dvb_frontend *fe, fe_status_t *status)
int cxd2820r_read_status_t(struct dvb_frontend *fe, fe_status_t *status)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret;
Expand Down Expand Up @@ -391,7 +393,7 @@ static int cxd2820r_read_status_t(struct dvb_frontend *fe, fe_status_t *status)
return ret;
}

static int cxd2820r_init_t(struct dvb_frontend *fe)
int cxd2820r_init_t(struct dvb_frontend *fe)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret;
Expand All @@ -406,7 +408,7 @@ static int cxd2820r_init_t(struct dvb_frontend *fe)
return ret;
}

static int cxd2820r_sleep_t(struct dvb_frontend *fe)
int cxd2820r_sleep_t(struct dvb_frontend *fe)
{
struct cxd2820r_priv *priv = fe->demodulator_priv;
int ret, i;
Expand Down Expand Up @@ -435,7 +437,7 @@ static int cxd2820r_sleep_t(struct dvb_frontend *fe)
return ret;
}

static int cxd2820r_get_tune_settings_t(struct dvb_frontend *fe,
int cxd2820r_get_tune_settings_t(struct dvb_frontend *fe,
struct dvb_frontend_tune_settings *s)
{
s->min_delay_ms = 500;
Expand Down
Loading

0 comments on commit 032bcc0

Please sign in to comment.