iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] drx-j: get rid of typedefs in drx_driver.h

Browse Source 
Most of the changes were done with scripts like:
	for i in drivers/media/dvb-frontends/drx39xyj/*.[ch]; do perl -ne '$var = "drx_sig_quality"; s,\b($var)_t\s+,struct \1 ,g; s,\bp_*($var)_t\s+,struct \1 *,g; s,\b($var)_t\b,struct \1,g; s,\bp_*($var)_t\b,struct \1 *,g; print $_' <$i >a && mv a $i; done

Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-01-16 12:51:36 -03:00
parent ffe7c4f921
commit 1bfc9e15a1
8 changed files with 986 additions and 1106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/media/dvb-frontends/drx39xyj/drx39xxj.c
View File

@ -33,9 +33,9 @@
static int drx39xxj_set_powerstate(struct dvb_frontend *fe, int enable) static int drx39xxj_set_powerstate(struct dvb_frontend *fe, int enable)
{ {
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
drx_demod_instance_t *demod = state->demod; struct drx_demod_instance *demod = state->demod;
int result; int result;
drx_power_mode_t power_mode; enum drx_power_mode power_mode;
if (enable) if (enable)
power_mode = DRX_POWER_UP; power_mode = DRX_POWER_UP;
@ -55,9 +55,9 @@ static int drx39xxj_set_powerstate(struct dvb_frontend *fe, int enable)
static int drx39xxj_read_status(struct dvb_frontend *fe, fe_status_t *status) static int drx39xxj_read_status(struct dvb_frontend *fe, fe_status_t *status)
{ {
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
drx_demod_instance_t *demod = state->demod; struct drx_demod_instance *demod = state->demod;
int result; int result;
drx_lock_status_t lock_status; enum drx_lock_status lock_status;
*status = 0; *status = 0;
@ -102,9 +102,9 @@ static int drx39xxj_read_status(struct dvb_frontend *fe, fe_status_t *status)
static int drx39xxj_read_ber(struct dvb_frontend *fe, u32 *ber) static int drx39xxj_read_ber(struct dvb_frontend *fe, u32 *ber)
{ {
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
drx_demod_instance_t *demod = state->demod; struct drx_demod_instance *demod = state->demod;
int result; int result;
drx_sig_quality_t sig_quality; struct drx_sig_quality sig_quality;
result = drx_ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality); result = drx_ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality);
if (result != DRX_STS_OK) { if (result != DRX_STS_OK) {
@ -121,9 +121,9 @@ static int drx39xxj_read_signal_strength(struct dvb_frontend *fe,
u16 *strength) u16 *strength)
{ {
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
drx_demod_instance_t *demod = state->demod; struct drx_demod_instance *demod = state->demod;
int result; int result;
drx_sig_quality_t sig_quality; struct drx_sig_quality sig_quality;
result = drx_ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality); result = drx_ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality);
if (result != DRX_STS_OK) { if (result != DRX_STS_OK) {
@ -140,9 +140,9 @@ static int drx39xxj_read_signal_strength(struct dvb_frontend *fe,
static int drx39xxj_read_snr(struct dvb_frontend *fe, u16 *snr) static int drx39xxj_read_snr(struct dvb_frontend *fe, u16 *snr)
{ {
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
drx_demod_instance_t *demod = state->demod; struct drx_demod_instance *demod = state->demod;
int result; int result;
drx_sig_quality_t sig_quality; struct drx_sig_quality sig_quality;
result = drx_ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality); result = drx_ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality);
if (result != DRX_STS_OK) { if (result != DRX_STS_OK) {
@ -158,9 +158,9 @@ static int drx39xxj_read_snr(struct dvb_frontend *fe, u16 *snr)
static int drx39xxj_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) static int drx39xxj_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{ {
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
drx_demod_instance_t *demod = state->demod; struct drx_demod_instance *demod = state->demod;
int result; int result;
drx_sig_quality_t sig_quality; struct drx_sig_quality sig_quality;
result = drx_ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality); result = drx_ctrl(demod, DRX_CTRL_SIG_QUALITY, &sig_quality);
if (result != DRX_STS_OK) { if (result != DRX_STS_OK) {
@ -180,12 +180,12 @@ static int drx39xxj_set_frontend(struct dvb_frontend *fe)
#endif #endif
struct dtv_frontend_properties *p = &fe->dtv_property_cache; struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
drx_demod_instance_t *demod = state->demod; struct drx_demod_instance *demod = state->demod;
enum drx_standard standard = DRX_STANDARD_8VSB; enum drx_standard standard = DRX_STANDARD_8VSB;
drx_channel_t channel; struct drx_channel channel;
int result; int result;
drxuio_data_t uio_data; struct drxuio_data uio_data;
drx_channel_t def_channel = { /* frequency */ 0, struct drx_channel def_channel = { /* frequency */ 0,
/* bandwidth */ DRX_BANDWIDTH_6MHZ, /* bandwidth */ DRX_BANDWIDTH_6MHZ,
/* mirror */ DRX_MIRROR_NO, /* mirror */ DRX_MIRROR_NO,
/* constellation */ DRX_CONSTELLATION_AUTO, /* constellation */ DRX_CONSTELLATION_AUTO,
@ -268,7 +268,7 @@ static int drx39xxj_sleep(struct dvb_frontend *fe)
static int drx39xxj_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) static int drx39xxj_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
{ {
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
drx_demod_instance_t *demod = state->demod; struct drx_demod_instance *demod = state->demod;
bool i2c_gate_state; bool i2c_gate_state;
int result; int result;
@ -326,11 +326,11 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
struct drx39xxj_state *state = NULL; struct drx39xxj_state *state = NULL;
struct i2c_device_addr *demod_addr = NULL; struct i2c_device_addr *demod_addr = NULL;
drx_common_attr_t *demod_comm_attr = NULL; struct drx_common_attr *demod_comm_attr = NULL;
drxj_data_t *demod_ext_attr = NULL; drxj_data_t *demod_ext_attr = NULL;
drx_demod_instance_t *demod = NULL; struct drx_demod_instance *demod = NULL;
drxuio_cfg_t uio_cfg; struct drxuio_cfg uio_cfg;
drxuio_data_t uio_data; struct drxuio_data uio_data;
int result; int result;
/* allocate memory for the internal state */ /* allocate memory for the internal state */
@ -338,7 +338,7 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
if (state == NULL) if (state == NULL)
goto error; goto error;
demod = kmalloc(sizeof(drx_demod_instance_t), GFP_KERNEL); demod = kmalloc(sizeof(struct drx_demod_instance), GFP_KERNEL);
if (demod == NULL) if (demod == NULL)
goto error; goto error;
@ -346,7 +346,7 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
if (demod_addr == NULL) if (demod_addr == NULL)
goto error; goto error;
demod_comm_attr = kmalloc(sizeof(drx_common_attr_t), GFP_KERNEL); demod_comm_attr = kmalloc(sizeof(struct drx_common_attr), GFP_KERNEL);
if (demod_comm_attr == NULL) if (demod_comm_attr == NULL)
goto error; goto error;
@ -358,7 +358,7 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
state->i2c = i2c; state->i2c = i2c;
state->demod = demod; state->demod = demod;
memcpy(demod, &drxj_default_demod_g, sizeof(drx_demod_instance_t)); memcpy(demod, &drxj_default_demod_g, sizeof(struct drx_demod_instance));
demod->my_i2c_dev_addr = demod_addr; demod->my_i2c_dev_addr = demod_addr;
memcpy(demod->my_i2c_dev_addr, &drxj_default_addr_g, memcpy(demod->my_i2c_dev_addr, &drxj_default_addr_g,
@ -366,7 +366,7 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
demod->my_i2c_dev_addr->user_data = state; demod->my_i2c_dev_addr->user_data = state;
demod->my_common_attr = demod_comm_attr; demod->my_common_attr = demod_comm_attr;
memcpy(demod->my_common_attr, &drxj_default_comm_attr_g, memcpy(demod->my_common_attr, &drxj_default_comm_attr_g,
sizeof(drx_common_attr_t)); sizeof(struct drx_common_attr));
demod->my_common_attr->microcode = DRXJ_MC_MAIN; demod->my_common_attr->microcode = DRXJ_MC_MAIN;
#if 0 #if 0
demod->my_common_attr->verify_microcode = false; demod->my_common_attr->verify_microcode = false;

2
drivers/media/dvb-frontends/drx39xyj/drx39xxj.h
View File

@ -28,7 +28,7 @@
struct drx39xxj_state { struct drx39xxj_state {
struct i2c_adapter *i2c; struct i2c_adapter *i2c;
drx_demod_instance_t *demod; struct drx_demod_instance *demod;
enum drx_standard current_standard; enum drx_standard current_standard;
struct dvb_frontend frontend; struct dvb_frontend frontend;
int powered_up:1; int powered_up:1;

120
drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.c
View File

@ -56,62 +56,62 @@
/* Function prototypes */ /* Function prototypes */
static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register/memory */ u32 addr, /* address of register/memory */
u16 datasize, /* size of data */ u16 datasize, /* size of data */
u8 *data, /* data to send */ u8 *data, /* data to send */
dr_xflags_t flags); /* special device flags */ u32 flags); /* special device flags */
static int drxdap_fasi_read_block(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_block(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register/memory */ u32 addr, /* address of register/memory */
u16 datasize, /* size of data */ u16 datasize, /* size of data */
u8 *data, /* data to send */ u8 *data, /* data to send */
dr_xflags_t flags); /* special device flags */ u32 flags); /* special device flags */
static int drxdap_fasi_write_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_write_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register */ u32 addr, /* address of register */
u8 data, /* data to write */ u8 data, /* data to write */
dr_xflags_t flags); /* special device flags */ u32 flags); /* special device flags */
static int drxdap_fasi_read_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register */ u32 addr, /* address of register */
u8 *data, /* buffer to receive data */ u8 *data, /* buffer to receive data */
dr_xflags_t flags); /* special device flags */ u32 flags); /* special device flags */
static int drxdap_fasi_read_modify_write_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_modify_write_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t waddr, /* address of register */ u32 waddr, /* address of register */
dr_xaddr_t raddr, /* address to read back from */ u32 raddr, /* address to read back from */
u8 datain, /* data to send */ u8 datain, /* data to send */
u8 *dataout); /* data to receive back */ u8 *dataout); /* data to receive back */
static int drxdap_fasi_write_reg16(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_write_reg16(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register */ u32 addr, /* address of register */
u16 data, /* data to write */ u16 data, /* data to write */
dr_xflags_t flags); /* special device flags */ u32 flags); /* special device flags */
static int drxdap_fasi_read_reg16(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_reg16(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register */ u32 addr, /* address of register */
u16 *data, /* buffer to receive data */ u16 *data, /* buffer to receive data */
dr_xflags_t flags); /* special device flags */ u32 flags); /* special device flags */
static int drxdap_fasi_read_modify_write_reg16(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_modify_write_reg16(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t waddr, /* address of register */ u32 waddr, /* address of register */
dr_xaddr_t raddr, /* address to read back from */ u32 raddr, /* address to read back from */
u16 datain, /* data to send */ u16 datain, /* data to send */
u16 *dataout); /* data to receive back */ u16 *dataout); /* data to receive back */
static int drxdap_fasi_write_reg32(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_write_reg32(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register */ u32 addr, /* address of register */
u32 data, /* data to write */ u32 data, /* data to write */
dr_xflags_t flags); /* special device flags */ u32 flags); /* special device flags */
static int drxdap_fasi_read_reg32(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_reg32(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register */ u32 addr, /* address of register */
u32 *data, /* buffer to receive data */ u32 *data, /* buffer to receive data */
dr_xflags_t flags); /* special device flags */ u32 flags); /* special device flags */
static int drxdap_fasi_read_modify_write_reg32(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_modify_write_reg32(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t waddr, /* address of register */ u32 waddr, /* address of register */
dr_xaddr_t raddr, /* address to read back from */ u32 raddr, /* address to read back from */
u32 datain, /* data to send */ u32 datain, /* data to send */
u32 *dataout); /* data to receive back */ u32 *dataout); /* data to receive back */
@ -119,7 +119,7 @@ static int drxdap_fasi_read_modify_write_reg32(struct i2c_device_addr *dev_addr,
char drx_dap_fasi_module_name[] = "FASI Data Access Protocol"; char drx_dap_fasi_module_name[] = "FASI Data Access Protocol";
char drx_dap_fasi_version_text[] = ""; char drx_dap_fasi_version_text[] = "";
drx_version_t drx_dap_fasi_version = { struct drx_version drx_dap_fasi_version = {
DRX_MODULE_DAP, /**< type identifier of the module */ DRX_MODULE_DAP, /**< type identifier of the module */
drx_dap_fasi_module_name, /**< name or description of module */ drx_dap_fasi_module_name, /**< name or description of module */
@ -130,7 +130,7 @@ drx_version_t drx_dap_fasi_version = {
}; };
/* The structure containing the protocol interface */ /* The structure containing the protocol interface */
drx_access_func_t drx_dap_fasi_funct_g = { struct drx_access_func drx_dap_fasi_funct_g = {
&drx_dap_fasi_version, &drx_dap_fasi_version,
drxdap_fasi_write_block, /* Supported */ drxdap_fasi_write_block, /* Supported */
drxdap_fasi_read_block, /* Supported */ drxdap_fasi_read_block, /* Supported */
@ -150,24 +150,24 @@ drx_access_func_t drx_dap_fasi_funct_g = {
/* Functions not supported by protocol*/ /* Functions not supported by protocol*/
static int drxdap_fasi_write_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_write_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register */ u32 addr, /* address of register */
u8 data, /* data to write */ u8 data, /* data to write */
dr_xflags_t flags) u32 flags)
{ /* special device flags */ { /* special device flags */
return DRX_STS_ERROR; return DRX_STS_ERROR;
} }
static int drxdap_fasi_read_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t addr, /* address of register */ u32 addr, /* address of register */
u8 *data, /* buffer to receive data */ u8 *data, /* buffer to receive data */
dr_xflags_t flags) u32 flags)
{ /* special device flags */ { /* special device flags */
return DRX_STS_ERROR; return DRX_STS_ERROR;
} }
static int drxdap_fasi_read_modify_write_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_modify_write_reg8(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t waddr, /* address of register */ u32 waddr, /* address of register */
dr_xaddr_t raddr, /* address to read back from */ u32 raddr, /* address to read back from */
u8 datain, /* data to send */ u8 datain, /* data to send */
u8 *dataout) u8 *dataout)
{ /* data to receive back */ { /* data to receive back */
@ -175,8 +175,8 @@ static int drxdap_fasi_read_modify_write_reg8(struct i2c_device_addr *dev_addr,
} }
static int drxdap_fasi_read_modify_write_reg32(struct i2c_device_addr *dev_addr, /* address of I2C device */ static int drxdap_fasi_read_modify_write_reg32(struct i2c_device_addr *dev_addr, /* address of I2C device */
dr_xaddr_t waddr, /* address of register */ u32 waddr, /* address of register */
dr_xaddr_t raddr, /* address to read back from */ u32 raddr, /* address to read back from */
u32 datain, /* data to send */ u32 datain, /* data to send */
u32 *dataout) u32 *dataout)
{ /* data to receive back */ { /* data to receive back */
@ -189,10 +189,10 @@ static int drxdap_fasi_read_modify_write_reg32(struct i2c_device_addr *dev_addr,
* *
* int drxdap_fasi_read_block ( * int drxdap_fasi_read_block (
* struct i2c_device_addr *dev_addr, -- address of I2C device * struct i2c_device_addr *dev_addr, -- address of I2C device
* dr_xaddr_t addr, -- address of chip register/memory * u32 addr, -- address of chip register/memory
* u16 datasize, -- number of bytes to read * u16 datasize, -- number of bytes to read
* u8 *data, -- data to receive * u8 *data, -- data to receive
* dr_xflags_t flags) -- special device flags * u32 flags) -- special device flags
* *
* Read block data from chip address. Because the chip is word oriented, * Read block data from chip address. Because the chip is word oriented,
* the number of bytes to read must be even. * the number of bytes to read must be even.
@ -211,9 +211,9 @@ static int drxdap_fasi_read_modify_write_reg32(struct i2c_device_addr *dev_addr,
******************************/ ******************************/
static int drxdap_fasi_read_block(struct i2c_device_addr *dev_addr, static int drxdap_fasi_read_block(struct i2c_device_addr *dev_addr,
dr_xaddr_t addr, u32 addr,
u16 datasize, u16 datasize,
u8 *data, dr_xflags_t flags) u8 *data, u32 flags)
{ {
u8 buf[4]; u8 buf[4];
u16 bufx; u16 bufx;
@ -304,8 +304,8 @@ static int drxdap_fasi_read_block(struct i2c_device_addr *dev_addr,
* *
* int drxdap_fasi_read_modify_write_reg16 ( * int drxdap_fasi_read_modify_write_reg16 (
* struct i2c_device_addr *dev_addr, -- address of I2C device * struct i2c_device_addr *dev_addr, -- address of I2C device
* dr_xaddr_t waddr, -- address of chip register/memory * u32 waddr, -- address of chip register/memory
* dr_xaddr_t raddr, -- chip address to read back from * u32 raddr, -- chip address to read back from
* u16 wdata, -- data to send * u16 wdata, -- data to send
* u16 *rdata) -- data to receive back * u16 *rdata) -- data to receive back
* *
@ -326,8 +326,8 @@ static int drxdap_fasi_read_block(struct i2c_device_addr *dev_addr,
******************************/ ******************************/
static int drxdap_fasi_read_modify_write_reg16(struct i2c_device_addr *dev_addr, static int drxdap_fasi_read_modify_write_reg16(struct i2c_device_addr *dev_addr,
dr_xaddr_t waddr, u32 waddr,
dr_xaddr_t raddr, u32 raddr,
u16 wdata, u16 *rdata) u16 wdata, u16 *rdata)
{ {
int rc = DRX_STS_ERROR; int rc = DRX_STS_ERROR;
@ -350,9 +350,9 @@ static int drxdap_fasi_read_modify_write_reg16(struct i2c_device_addr *dev_addr,
* *
* int drxdap_fasi_read_reg16 ( * int drxdap_fasi_read_reg16 (
* struct i2c_device_addr *dev_addr, -- address of I2C device * struct i2c_device_addr *dev_addr, -- address of I2C device
* dr_xaddr_t addr, -- address of chip register/memory * u32 addr, -- address of chip register/memory
* u16 *data, -- data to receive * u16 *data, -- data to receive
* dr_xflags_t flags) -- special device flags * u32 flags) -- special device flags
* *
* Read one 16-bit register or memory location. The data received back is * Read one 16-bit register or memory location. The data received back is
* converted back to the target platform's endianness. * converted back to the target platform's endianness.
@ -365,8 +365,8 @@ static int drxdap_fasi_read_modify_write_reg16(struct i2c_device_addr *dev_addr,
******************************/ ******************************/
static int drxdap_fasi_read_reg16(struct i2c_device_addr *dev_addr, static int drxdap_fasi_read_reg16(struct i2c_device_addr *dev_addr,
dr_xaddr_t addr, u32 addr,
u16 *data, dr_xflags_t flags) u16 *data, u32 flags)
{ {
u8 buf[sizeof(*data)]; u8 buf[sizeof(*data)];
int rc; int rc;
@ -383,9 +383,9 @@ static int drxdap_fasi_read_reg16(struct i2c_device_addr *dev_addr,
* *
* int drxdap_fasi_read_reg32 ( * int drxdap_fasi_read_reg32 (
* struct i2c_device_addr *dev_addr, -- address of I2C device * struct i2c_device_addr *dev_addr, -- address of I2C device
* dr_xaddr_t addr, -- address of chip register/memory * u32 addr, -- address of chip register/memory
* u32 *data, -- data to receive * u32 *data, -- data to receive
* dr_xflags_t flags) -- special device flags * u32 flags) -- special device flags
* *
* Read one 32-bit register or memory location. The data received back is * Read one 32-bit register or memory location. The data received back is
* converted back to the target platform's endianness. * converted back to the target platform's endianness.
@ -398,8 +398,8 @@ static int drxdap_fasi_read_reg16(struct i2c_device_addr *dev_addr,
******************************/ ******************************/
static int drxdap_fasi_read_reg32(struct i2c_device_addr *dev_addr, static int drxdap_fasi_read_reg32(struct i2c_device_addr *dev_addr,
dr_xaddr_t addr, u32 addr,
u32 *data, dr_xflags_t flags) u32 *data, u32 flags)
{ {
u8 buf[sizeof(*data)]; u8 buf[sizeof(*data)];
int rc; int rc;
@ -418,10 +418,10 @@ static int drxdap_fasi_read_reg32(struct i2c_device_addr *dev_addr,
* *
* int drxdap_fasi_write_block ( * int drxdap_fasi_write_block (
* struct i2c_device_addr *dev_addr, -- address of I2C device * struct i2c_device_addr *dev_addr, -- address of I2C device
* dr_xaddr_t addr, -- address of chip register/memory * u32 addr, -- address of chip register/memory
* u16 datasize, -- number of bytes to read * u16 datasize, -- number of bytes to read
* u8 *data, -- data to receive * u8 *data, -- data to receive
* dr_xflags_t flags) -- special device flags * u32 flags) -- special device flags
* *
* Write block data to chip address. Because the chip is word oriented, * Write block data to chip address. Because the chip is word oriented,
* the number of bytes to write must be even. * the number of bytes to write must be even.
@ -437,9 +437,9 @@ static int drxdap_fasi_read_reg32(struct i2c_device_addr *dev_addr,
******************************/ ******************************/
static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr, static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr,
dr_xaddr_t addr, u32 addr,
u16 datasize, u16 datasize,
u8 *data, dr_xflags_t flags) u8 *data, u32 flags)
{ {
u8 buf[DRXDAP_MAX_WCHUNKSIZE]; u8 buf[DRXDAP_MAX_WCHUNKSIZE];
int st = DRX_STS_ERROR; int st = DRX_STS_ERROR;
@ -562,9 +562,9 @@ static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr,
* *
* int drxdap_fasi_write_reg16 ( * int drxdap_fasi_write_reg16 (
* struct i2c_device_addr *dev_addr, -- address of I2C device * struct i2c_device_addr *dev_addr, -- address of I2C device
* dr_xaddr_t addr, -- address of chip register/memory * u32 addr, -- address of chip register/memory
* u16 data, -- data to send * u16 data, -- data to send
* dr_xflags_t flags) -- special device flags * u32 flags) -- special device flags
* *
* Write one 16-bit register or memory location. The data being written is * Write one 16-bit register or memory location. The data being written is
* converted from the target platform's endianness to little endian. * converted from the target platform's endianness to little endian.
@ -576,8 +576,8 @@ static int drxdap_fasi_write_block(struct i2c_device_addr *dev_addr,
******************************/ ******************************/
static int drxdap_fasi_write_reg16(struct i2c_device_addr *dev_addr, static int drxdap_fasi_write_reg16(struct i2c_device_addr *dev_addr,
dr_xaddr_t addr, u32 addr,
u16 data, dr_xflags_t flags) u16 data, u32 flags)
{ {
u8 buf[sizeof(data)]; u8 buf[sizeof(data)];
@ -591,9 +591,9 @@ static int drxdap_fasi_write_reg16(struct i2c_device_addr *dev_addr,
* *
* int drxdap_fasi_write_reg32 ( * int drxdap_fasi_write_reg32 (
* struct i2c_device_addr *dev_addr, -- address of I2C device * struct i2c_device_addr *dev_addr, -- address of I2C device
* dr_xaddr_t addr, -- address of chip register/memory * u32 addr, -- address of chip register/memory
* u32 data, -- data to send * u32 data, -- data to send
* dr_xflags_t flags) -- special device flags * u32 flags) -- special device flags
* *
* Write one 32-bit register or memory location. The data being written is * Write one 32-bit register or memory location. The data being written is
* converted from the target platform's endianness to little endian. * converted from the target platform's endianness to little endian.
@ -605,8 +605,8 @@ static int drxdap_fasi_write_reg16(struct i2c_device_addr *dev_addr,
******************************/ ******************************/
static int drxdap_fasi_write_reg32(struct i2c_device_addr *dev_addr, static int drxdap_fasi_write_reg32(struct i2c_device_addr *dev_addr,
dr_xaddr_t addr, u32 addr,
u32 data, dr_xflags_t flags) u32 data, u32 flags)
{ {
u8 buf[sizeof(data)]; u8 buf[sizeof(data)];

2
drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.h
View File

@ -238,7 +238,7 @@
extern "C" { extern "C" {
#endif #endif
extern drx_access_func_t drx_dap_fasi_funct_g; extern struct drx_access_func drx_dap_fasi_funct_g;
#define DRXDAP_FASI_RMW 0x10000000 #define DRXDAP_FASI_RMW 0x10000000
#define DRXDAP_FASI_BROADCAST 0x20000000 #define DRXDAP_FASI_BROADCAST 0x20000000

110
drivers/media/dvb-frontends/drx39xyj/drx_driver.c
View File

@ -147,21 +147,21 @@ FUNCTIONS
/* Prototype of default scanning function */ /* Prototype of default scanning function */
static int static int
scan_function_default(void *scan_context, scan_function_default(void *scan_context,
drx_scan_command_t scan_command, enum drx_scan_command scan_command,
pdrx_channel_t scan_channel, bool *get_next_channel); struct drx_channel *scan_channel, bool *get_next_channel);
/** /**
* \brief Get pointer to scanning function. * \brief Get pointer to scanning function.
* \param demod: Pointer to demodulator instance. * \param demod: Pointer to demodulator instance.
* \return drx_scan_func_t. * \return drx_scan_func_t.
*/ */
static drx_scan_func_t get_scan_function(pdrx_demod_instance_t demod) static drx_scan_func_t get_scan_function(struct drx_demod_instance *demod)
{ {
pdrx_common_attr_t common_attr = (pdrx_common_attr_t) (NULL); struct drx_common_attr *common_attr = (struct drx_common_attr *) (NULL);
drx_scan_func_t scan_func = (drx_scan_func_t) (NULL); drx_scan_func_t scan_func = (drx_scan_func_t) (NULL);
/* get scan function from common attributes */ /* get scan function from common attributes */
common_attr = (pdrx_common_attr_t) demod->my_common_attr; common_attr = (struct drx_common_attr *) demod->my_common_attr;
scan_func = common_attr->scan_function; scan_func = common_attr->scan_function;
if (scan_func != NULL) { if (scan_func != NULL) {
@ -178,12 +178,12 @@ static drx_scan_func_t get_scan_function(pdrx_demod_instance_t demod)
* \param scan_context: Context Pointer. * \param scan_context: Context Pointer.
* \return drx_scan_func_t. * \return drx_scan_func_t.
*/ */
static void *get_scan_context(pdrx_demod_instance_t demod, void *scan_context) static void *get_scan_context(struct drx_demod_instance *demod, void *scan_context)
{ {
pdrx_common_attr_t common_attr = (pdrx_common_attr_t) (NULL); struct drx_common_attr *common_attr = (struct drx_common_attr *) (NULL);
/* get scan function from common attributes */ /* get scan function from common attributes */
common_attr = (pdrx_common_attr_t) demod->my_common_attr; common_attr = (struct drx_common_attr *) demod->my_common_attr;
scan_context = common_attr->scan_context; scan_context = common_attr->scan_context;
if (scan_context == NULL) { if (scan_context == NULL) {
@ -211,11 +211,11 @@ static void *get_scan_context(pdrx_demod_instance_t demod, void *scan_context)
* In case DRX_NEVER_LOCK is returned the poll-wait will be aborted. * In case DRX_NEVER_LOCK is returned the poll-wait will be aborted.
* *
*/ */
static int scan_wait_for_lock(pdrx_demod_instance_t demod, bool *is_locked) static int scan_wait_for_lock(struct drx_demod_instance *demod, bool *is_locked)
{ {
bool done_waiting = false; bool done_waiting = false;
drx_lock_status_t lock_state = DRX_NOT_LOCKED; enum drx_lock_status lock_state = DRX_NOT_LOCKED;
drx_lock_status_t desired_lock_state = DRX_NOT_LOCKED; enum drx_lock_status desired_lock_state = DRX_NOT_LOCKED;
u32 timeout_value = 0; u32 timeout_value = 0;
u32 start_time_lock_stage = 0; u32 start_time_lock_stage = 0;
u32 current_time = 0; u32 current_time = 0;
@ -273,17 +273,17 @@ static int scan_wait_for_lock(pdrx_demod_instance_t demod, bool *is_locked)
* *
*/ */
static int static int
scan_prepare_next_scan(pdrx_demod_instance_t demod, s32 skip) scan_prepare_next_scan(struct drx_demod_instance *demod, s32 skip)
{ {
pdrx_common_attr_t common_attr = (pdrx_common_attr_t) (NULL); struct drx_common_attr *common_attr = (struct drx_common_attr *) (NULL);
u16 table_index = 0; u16 table_index = 0;
u16 frequency_plan_size = 0; u16 frequency_plan_size = 0;
p_drx_frequency_plan_t frequency_plan = (p_drx_frequency_plan_t) (NULL); struct drx_frequency_plan *frequency_plan = (struct drx_frequency_plan *) (NULL);
s32 next_frequency = 0; s32 next_frequency = 0;
s32 tuner_min_frequency = 0; s32 tuner_min_frequency = 0;
s32 tuner_max_frequency = 0; s32 tuner_max_frequency = 0;
common_attr = (pdrx_common_attr_t) demod->my_common_attr; common_attr = (struct drx_common_attr *) demod->my_common_attr;
table_index = common_attr->scan_freq_plan_index; table_index = common_attr->scan_freq_plan_index;
frequency_plan = common_attr->scan_param->frequency_plan; frequency_plan = common_attr->scan_param->frequency_plan;
next_frequency = common_attr->scan_next_frequency; next_frequency = common_attr->scan_next_frequency;
@ -355,14 +355,14 @@ scan_prepare_next_scan(pdrx_demod_instance_t demod, s32 skip)
*/ */
static int static int
scan_function_default(void *scan_context, scan_function_default(void *scan_context,
drx_scan_command_t scan_command, enum drx_scan_command scan_command,
pdrx_channel_t scan_channel, bool *get_next_channel) struct drx_channel *scan_channel, bool *get_next_channel)
{ {
pdrx_demod_instance_t demod = NULL; struct drx_demod_instance *demod = NULL;
int status = DRX_STS_ERROR; int status = DRX_STS_ERROR;
bool is_locked = false; bool is_locked = false;
demod = (pdrx_demod_instance_t) scan_context; demod = (struct drx_demod_instance *) scan_context;
if (scan_command != DRX_SCAN_COMMAND_NEXT) { if (scan_command != DRX_SCAN_COMMAND_NEXT) {
/* just return OK if not doing "scan next" */ /* just return OK if not doing "scan next" */
@ -412,21 +412,21 @@ scan_function_default(void *scan_context,
* *
*/ */
static int static int
ctrl_scan_init(pdrx_demod_instance_t demod, p_drx_scan_param_t scan_param) ctrl_scan_init(struct drx_demod_instance *demod, struct drx_scan_param *scan_param)
{ {
int status = DRX_STS_ERROR; int status = DRX_STS_ERROR;
pdrx_common_attr_t common_attr = (pdrx_common_attr_t) (NULL); struct drx_common_attr *common_attr = (struct drx_common_attr *) (NULL);
s32 max_tuner_freq = 0; s32 max_tuner_freq = 0;
s32 min_tuner_freq = 0; s32 min_tuner_freq = 0;
u16 nr_channels_in_plan = 0; u16 nr_channels_in_plan = 0;
u16 i = 0; u16 i = 0;
void *scan_context = NULL; void *scan_context = NULL;
common_attr = (pdrx_common_attr_t) demod->my_common_attr; common_attr = (struct drx_common_attr *) demod->my_common_attr;
common_attr->scan_active = true; common_attr->scan_active = true;
/* invalidate a previous SCAN_INIT */ /* invalidate a previous SCAN_INIT */
common_attr->scan_param = (p_drx_scan_param_t) (NULL); common_attr->scan_param = NULL;
common_attr->scan_next_frequency = 0; common_attr->scan_next_frequency = 0;
/* Check parameters */ /* Check parameters */
@ -551,13 +551,13 @@ ctrl_scan_init(pdrx_demod_instance_t demod, p_drx_scan_param_t scan_param)
* \retval DRX_STS_ERROR: Something went wrong. * \retval DRX_STS_ERROR: Something went wrong.
* \retval DRX_STS_INVALID_ARG: Wrong parameters. * \retval DRX_STS_INVALID_ARG: Wrong parameters.
*/ */
static int ctrl_scan_stop(pdrx_demod_instance_t demod) static int ctrl_scan_stop(struct drx_demod_instance *demod)
{ {
int status = DRX_STS_ERROR; int status = DRX_STS_ERROR;
pdrx_common_attr_t common_attr = (pdrx_common_attr_t) (NULL); struct drx_common_attr *common_attr = (struct drx_common_attr *) (NULL);
void *scan_context = NULL; void *scan_context = NULL;
common_attr = (pdrx_common_attr_t) demod->my_common_attr; common_attr = (struct drx_common_attr *) demod->my_common_attr;
common_attr->scan_active = true; common_attr->scan_active = true;
if ((common_attr->scan_param == NULL) || if ((common_attr->scan_param == NULL) ||
@ -601,15 +601,15 @@ static int ctrl_scan_stop(pdrx_demod_instance_t demod)
* Progress indication will run from 0 upto DRX_SCAN_MAX_PROGRESS during scan. * Progress indication will run from 0 upto DRX_SCAN_MAX_PROGRESS during scan.
* *
*/ */
static int ctrl_scan_next(pdrx_demod_instance_t demod, u16 *scan_progress) static int ctrl_scan_next(struct drx_demod_instance *demod, u16 *scan_progress)
{ {
pdrx_common_attr_t common_attr = (pdrx_common_attr_t) (NULL); struct drx_common_attr *common_attr = (struct drx_common_attr *) (NULL);
bool *scan_ready = (bool *)(NULL); bool *scan_ready = (bool *)(NULL);
u16 max_progress = DRX_SCAN_MAX_PROGRESS; u16 max_progress = DRX_SCAN_MAX_PROGRESS;
u32 num_tries = 0; u32 num_tries = 0;
u32 i = 0; u32 i = 0;
common_attr = (pdrx_common_attr_t) demod->my_common_attr; common_attr = (struct drx_common_attr *) demod->my_common_attr;
/* Check scan parameters */ /* Check scan parameters */
if (scan_progress == NULL) { if (scan_progress == NULL) {
@ -635,9 +635,9 @@ static int ctrl_scan_next(pdrx_demod_instance_t demod, u16 *scan_progress)
scan_ready = &(common_attr->scan_ready); scan_ready = &(common_attr->scan_ready);
for (i = 0; ((i < num_tries) && ((*scan_ready) == false)); i++) { for (i = 0; ((i < num_tries) && ((*scan_ready) == false)); i++) {
drx_channel_t scan_channel = { 0 }; struct drx_channel scan_channel = { 0 };
int status = DRX_STS_ERROR; int status = DRX_STS_ERROR;
p_drx_frequency_plan_t freq_plan = (p_drx_frequency_plan_t) (NULL); struct drx_frequency_plan *freq_plan = (struct drx_frequency_plan *) (NULL);
bool next_channel = false; bool next_channel = false;
void *scan_context = NULL; void *scan_context = NULL;
@ -728,9 +728,9 @@ static int ctrl_scan_next(pdrx_demod_instance_t demod, u16 *scan_progress)
* *
*/ */
static int static int
ctrl_program_tuner(pdrx_demod_instance_t demod, pdrx_channel_t channel) ctrl_program_tuner(struct drx_demod_instance *demod, struct drx_channel *channel)
{ {
pdrx_common_attr_t common_attr = (pdrx_common_attr_t) (NULL); struct drx_common_attr *common_attr = (struct drx_common_attr *) (NULL);
enum drx_standard standard = DRX_STANDARD_UNKNOWN; enum drx_standard standard = DRX_STANDARD_UNKNOWN;
u32 tuner_mode = 0; u32 tuner_mode = 0;
int status = DRX_STS_ERROR; int status = DRX_STS_ERROR;
@ -742,7 +742,7 @@ ctrl_program_tuner(pdrx_demod_instance_t demod, pdrx_channel_t channel)
return DRX_STS_INVALID_ARG; return DRX_STS_INVALID_ARG;
} }
common_attr = (pdrx_common_attr_t) demod->my_common_attr; common_attr = (struct drx_common_attr *) demod->my_common_attr;
/* select analog or digital tuner mode based on current standard */ /* select analog or digital tuner mode based on current standard */
if (drx_ctrl(demod, DRX_CTRL_GET_STANDARD, &standard) != DRX_STS_OK) { if (drx_ctrl(demod, DRX_CTRL_GET_STANDARD, &standard) != DRX_STS_OK) {
@ -839,8 +839,8 @@ ctrl_program_tuner(pdrx_demod_instance_t demod, pdrx_channel_t channel)
* \retval DRX_STS_INVALID_ARG: Wrong parameters. * \retval DRX_STS_INVALID_ARG: Wrong parameters.
* *
*/ */
static int ctrl_dump_registers(pdrx_demod_instance_t demod, static int ctrl_dump_registers(struct drx_demod_instance *demod,
p_drx_reg_dump_t registers) struct drx_reg_dump *registers)
{ {
u16 i = 0; u16 i = 0;
@ -982,8 +982,8 @@ static u16 u_code_compute_crc(u8 *block_data, u16 nr_words)
* - Provided image is corrupt * - Provided image is corrupt
*/ */
static int static int
ctrl_u_code(pdrx_demod_instance_t demod, ctrl_u_code(struct drx_demod_instance *demod,
p_drxu_code_info_t mc_info, drxu_code_action_t action) struct drxu_code_info *mc_info, enum drxu_code_action action)
{ {
int rc; int rc;
u16 i = 0; u16 i = 0;
@ -1123,7 +1123,7 @@ ctrl_u_code(pdrx_demod_instance_t demod,
[DRX_UCODE_MAX_BUF_SIZE]; [DRX_UCODE_MAX_BUF_SIZE];
u32 bytes_to_compare = 0; u32 bytes_to_compare = 0;
u32 bytes_left_to_compare = 0; u32 bytes_left_to_compare = 0;
dr_xaddr_t curr_addr = (dr_xaddr_t) 0; u32 curr_addr = (dr_xaddr_t) 0;
u8 *curr_ptr = NULL; u8 *curr_ptr = NULL;
bytes_left_to_compare = mc_block_nr_bytes; bytes_left_to_compare = mc_block_nr_bytes;
@ -1202,16 +1202,16 @@ ctrl_u_code(pdrx_demod_instance_t demod,
* \retval DRX_STS_INVALID_ARG: Invalid arguments. * \retval DRX_STS_INVALID_ARG: Invalid arguments.
*/ */
static int static int
ctrl_version(pdrx_demod_instance_t demod, p_drx_version_list_t *version_list) ctrl_version(struct drx_demod_instance *demod, struct drx_version_list **version_list)
{ {
static char drx_driver_core_module_name[] = "Core driver"; static char drx_driver_core_module_name[] = "Core driver";
static char drx_driver_core_version_text[] = static char drx_driver_core_version_text[] =
DRX_VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH); DRX_VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH);
static drx_version_t drx_driver_core_version; static struct drx_version drx_driver_core_version;
static drx_version_list_t drx_driver_core_versionList; static struct drx_version_list drx_driver_core_versionList;
p_drx_version_list_t demod_version_list = (p_drx_version_list_t) (NULL); struct drx_version_list *demod_version_list = (struct drx_version_list *) (NULL);
int return_status = DRX_STS_ERROR; int return_status = DRX_STS_ERROR;
/* Check arguments */ /* Check arguments */
@ -1234,13 +1234,13 @@ ctrl_version(pdrx_demod_instance_t demod, p_drx_version_list_t *version_list)
drx_driver_core_version.v_string = drx_driver_core_version_text; drx_driver_core_version.v_string = drx_driver_core_version_text;
drx_driver_core_versionList.version = &drx_driver_core_version; drx_driver_core_versionList.version = &drx_driver_core_version;
drx_driver_core_versionList.next = (p_drx_version_list_t) (NULL); drx_driver_core_versionList.next = (struct drx_version_list *) (NULL);
if ((return_status == DRX_STS_OK) && (demod_version_list != NULL)) { if ((return_status == DRX_STS_OK) && (demod_version_list != NULL)) {
/* Append versioninfo from driver to versioninfo from demod */ /* Append versioninfo from driver to versioninfo from demod */
/* Return version info in "bottom-up" order. This way, multiple /* Return version info in "bottom-up" order. This way, multiple
devices can be handled without using malloc. */ devices can be handled without using malloc. */
p_drx_version_list_t current_list_element = demod_version_list; struct drx_version_list *current_list_element = demod_version_list;
while (current_list_element->next != NULL) { while (current_list_element->next != NULL) {
current_list_element = current_list_element->next; current_list_element = current_list_element->next;
} }
@ -1271,7 +1271,7 @@ ctrl_version(pdrx_demod_instance_t demod, p_drx_version_list_t *version_list)
* *
*/ */
int drx_init(pdrx_demod_instance_t demods[]) int drx_init(struct drx_demod_instance *demods[])
{ {
return DRX_STS_OK; return DRX_STS_OK;
} }
@ -1305,7 +1305,7 @@ int drx_term(void)
* *
*/ */
int drx_open(pdrx_demod_instance_t demod) int drx_open(struct drx_demod_instance *demod)
{ {
int status = DRX_STS_OK; int status = DRX_STS_OK;
@ -1342,7 +1342,7 @@ int drx_open(pdrx_demod_instance_t demod)
* Put device into sleep mode. * Put device into sleep mode.
*/ */
int drx_close(pdrx_demod_instance_t demod) int drx_close(struct drx_demod_instance *demod)
{ {
int status = DRX_STS_OK; int status = DRX_STS_OK;
@ -1383,7 +1383,7 @@ int drx_close(pdrx_demod_instance_t demod)
*/ */
int int
drx_ctrl(pdrx_demod_instance_t demod, u32 ctrl, void *ctrl_data) drx_ctrl(struct drx_demod_instance *demod, u32 ctrl, void *ctrl_data)
{ {
int status = DRX_STS_ERROR; int status = DRX_STS_ERROR;
@ -1420,7 +1420,7 @@ drx_ctrl(pdrx_demod_instance_t demod, u32 ctrl, void *ctrl_data)
/*======================================================================*/ /*======================================================================*/
case DRX_CTRL_VERSION: case DRX_CTRL_VERSION:
return ctrl_version(demod, (p_drx_version_list_t *)ctrl_data); return ctrl_version(demod, (struct drx_version_list **)ctrl_data);
break; break;
/*======================================================================*/ /*======================================================================*/
@ -1438,7 +1438,7 @@ drx_ctrl(pdrx_demod_instance_t demod, u32 ctrl, void *ctrl_data)
/*===================================================================*/ /*===================================================================*/
case DRX_CTRL_LOAD_UCODE: case DRX_CTRL_LOAD_UCODE:
return ctrl_u_code(demod, return ctrl_u_code(demod,
(p_drxu_code_info_t) ctrl_data, (struct drxu_code_info *)ctrl_data,
UCODE_UPLOAD); UCODE_UPLOAD);
break; break;
@ -1446,7 +1446,7 @@ drx_ctrl(pdrx_demod_instance_t demod, u32 ctrl, void *ctrl_data)
case DRX_CTRL_VERIFY_UCODE: case DRX_CTRL_VERIFY_UCODE:
{ {
return ctrl_u_code(demod, return ctrl_u_code(demod,
(p_drxu_code_info_t) ctrl_data, (struct drxu_code_info *)ctrl_data,
UCODE_VERIFY); UCODE_VERIFY);
} }
break; break;
@ -1456,7 +1456,7 @@ drx_ctrl(pdrx_demod_instance_t demod, u32 ctrl, void *ctrl_data)
case DRX_CTRL_SCAN_INIT: case DRX_CTRL_SCAN_INIT:
{ {
return ctrl_scan_init(demod, return ctrl_scan_init(demod,
(p_drx_scan_param_t) ctrl_data); (struct drx_scan_param *) ctrl_data);
} }
break; break;
@ -1479,7 +1479,7 @@ drx_ctrl(pdrx_demod_instance_t demod, u32 ctrl, void *ctrl_data)
case DRX_CTRL_PROGRAM_TUNER: case DRX_CTRL_PROGRAM_TUNER:
{ {
return ctrl_program_tuner(demod, return ctrl_program_tuner(demod,
(pdrx_channel_t) (struct drx_channel *)
ctrl_data); ctrl_data);
} }
break; break;
@ -1488,7 +1488,7 @@ drx_ctrl(pdrx_demod_instance_t demod, u32 ctrl, void *ctrl_data)
case DRX_CTRL_DUMP_REGISTERS: case DRX_CTRL_DUMP_REGISTERS:
{ {
return ctrl_dump_registers(demod, return ctrl_dump_registers(demod,
(p_drx_reg_dump_t) (struct drx_reg_dump *)
ctrl_data); ctrl_data);
} }
break; break;

1034
drivers/media/dvb-frontends/drx39xyj/drx_driver.h
View File

File diff suppressed because it is too large Load Diff

746
drivers/media/dvb-frontends/drx39xyj/drxj.c
View File

File diff suppressed because it is too large Load Diff

28
drivers/media/dvb-frontends/drx39xyj/drxj.h
View File

@ -489,10 +489,10 @@ TYPEDEFS
u16 hi_cfg_transmit; /**< HI Configure() parameter 6 */ u16 hi_cfg_transmit; /**< HI Configure() parameter 6 */
/* UIO configuartion */ /* UIO configuartion */
drxuio_mode_t uio_sma_rx_mode;/**< current mode of SmaRx pin */ enum drxuio_mode uio_sma_rx_mode;/**< current mode of SmaRx pin */
drxuio_mode_t uio_sma_tx_mode;/**< current mode of SmaTx pin */ enum drxuio_mode uio_sma_tx_mode;/**< current mode of SmaTx pin */
drxuio_mode_t uio_gpio_mode; /**< current mode of ASEL pin */ enum drxuio_mode uio_gpio_mode; /**< current mode of ASEL pin */
drxuio_mode_t uio_irqn_mode; /**< current mode of IRQN pin */ enum drxuio_mode uio_irqn_mode; /**< current mode of IRQN pin */
/* IQM fs frequecy shift and inversion */ /* IQM fs frequecy shift and inversion */
u32 iqm_fs_rate_ofs; /**< frequency shifter setting after setchannel */ u32 iqm_fs_rate_ofs; /**< frequency shifter setting after setchannel */
@ -531,8 +531,8 @@ TYPEDEFS
/* Version information */ /* Version information */
char v_text[2][12]; /**< allocated text versions */ char v_text[2][12]; /**< allocated text versions */
drx_version_t v_version[2]; /**< allocated versions structs */ struct drx_version v_version[2]; /**< allocated versions structs */
drx_version_list_t v_list_elements[2]; struct drx_version_list v_list_elements[2];
/**< allocated version list */ /**< allocated version list */
/* smart antenna configuration */ /* smart antenna configuration */
@ -571,7 +571,7 @@ TYPEDEFS
u16 oob_pre_saw; u16 oob_pre_saw;
drxj_cfg_oob_lo_power_t oob_lo_pow; drxj_cfg_oob_lo_power_t oob_lo_pow;
drx_aud_data_t aud_data; struct drx_aud_data aud_data;
/**< audio storage */ /**< audio storage */
} drxj_data_t, *pdrxj_data_t; } drxj_data_t, *pdrxj_data_t;
@ -723,20 +723,20 @@ STRUCTS
Exported FUNCTIONS Exported FUNCTIONS
-------------------------------------------------------------------------*/ -------------------------------------------------------------------------*/
int drxj_open(pdrx_demod_instance_t demod); int drxj_open(struct drx_demod_instance *demod);
int drxj_close(pdrx_demod_instance_t demod); int drxj_close(struct drx_demod_instance *demod);
int drxj_ctrl(pdrx_demod_instance_t demod, int drxj_ctrl(struct drx_demod_instance *demod,
u32 ctrl, void *ctrl_data); u32 ctrl, void *ctrl_data);
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
Exported GLOBAL VARIABLES Exported GLOBAL VARIABLES
-------------------------------------------------------------------------*/ -------------------------------------------------------------------------*/
extern drx_access_func_t drx_dap_drxj_funct_g; extern struct drx_access_func drx_dap_drxj_funct_g;
extern drx_demod_func_t drxj_functions_g; extern struct drx_demod_func drxj_functions_g;
extern drxj_data_t drxj_data_g; extern drxj_data_t drxj_data_g;
extern struct i2c_device_addr drxj_default_addr_g; extern struct i2c_device_addr drxj_default_addr_g;
extern drx_common_attr_t drxj_default_comm_attr_g; extern struct drx_common_attr drxj_default_comm_attr_g;
extern drx_demod_instance_t drxj_default_demod_g; extern struct drx_demod_instance drxj_default_demod_g;
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
THE END THE END