Commit 3fc954a1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Mauro Carvalho Chehab

[media] drx-j: Fix compilation and un-comment it

There were some DVB internal API changes, since this driver were
written. Change it to work with the new API.
Acked-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 443f18d0
...@@ -2,7 +2,6 @@ config DVB_DRX39XYJ ...@@ -2,7 +2,6 @@ config DVB_DRX39XYJ
tristate "Micronas DRX-J demodulator" tristate "Micronas DRX-J demodulator"
depends on DVB_CORE && I2C depends on DVB_CORE && I2C
default m if DVB_FE_CUSTOMISE default m if DVB_FE_CUSTOMISE
depends on BROKEN
help help
An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want
to support this frontend. to support this frontend.
drx39xyj-objs := drx39xxj.o drx_driver.o drx39xxj_dummy.o drxj.o drx_dap_fasi.o drx39xyj-objs := drx39xxj.o drx_driver.o drx39xxj_dummy.o drxj.o drx_dap_fasi.o
obj-$(CONFIG_DVB_DRX39XYJ) += drx39xyj.o obj-$(CONFIG_DVB_DRX39XYJ) += drx39xyj.o
ccflags-y += -I$(srctree)/drivers/media/dvb-core/
ccflags-y += -I$(srctree)/drivers/media/tuners/
...@@ -175,18 +175,12 @@ static int drx39xxj_read_ucblocks(struct dvb_frontend *fe, u32 * ucblocks) ...@@ -175,18 +175,12 @@ static int drx39xxj_read_ucblocks(struct dvb_frontend *fe, u32 * ucblocks)
return 0; return 0;
} }
static int drx39xxj_get_frontend(struct dvb_frontend *fe, static int drx39xxj_set_frontend(struct dvb_frontend *fe)
struct dvb_frontend_parameters *p)
{
return 0;
}
static int drx39xxj_set_frontend(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{ {
#ifdef DJH_DEBUG #ifdef DJH_DEBUG
int i; int i;
#endif #endif
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
DRXDemodInstance_t *demod = state->demod; DRXDemodInstance_t *demod = state->demod;
DRXStandard_t standard = DRX_STANDARD_8VSB; DRXStandard_t standard = DRX_STANDARD_8VSB;
...@@ -217,7 +211,7 @@ static int drx39xxj_set_frontend(struct dvb_frontend *fe, ...@@ -217,7 +211,7 @@ static int drx39xxj_set_frontend(struct dvb_frontend *fe,
if (fe->ops.tuner_ops.set_params) { if (fe->ops.tuner_ops.set_params) {
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 1); fe->ops.i2c_gate_ctrl(fe, 1);
fe->ops.tuner_ops.set_params(fe, p); fe->ops.tuner_ops.set_params(fe);
if (fe->ops.i2c_gate_ctrl) if (fe->ops.i2c_gate_ctrl)
fe->ops.i2c_gate_ctrl(fe, 0); fe->ops.i2c_gate_ctrl(fe, 0);
} }
...@@ -426,10 +420,9 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c) ...@@ -426,10 +420,9 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
} }
static struct dvb_frontend_ops drx39xxj_ops = { static struct dvb_frontend_ops drx39xxj_ops = {
.delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
.info = { .info = {
.name = "Micronas DRX39xxj family Frontend", .name = "Micronas DRX39xxj family Frontend",
.type = FE_ATSC | FE_QAM,
.frequency_stepsize = 62500, .frequency_stepsize = 62500,
.frequency_min = 51000000, .frequency_min = 51000000,
.frequency_max = 858000000, .frequency_max = 858000000,
...@@ -439,7 +432,6 @@ static struct dvb_frontend_ops drx39xxj_ops = { ...@@ -439,7 +432,6 @@ static struct dvb_frontend_ops drx39xxj_ops = {
.i2c_gate_ctrl = drx39xxj_i2c_gate_ctrl, .i2c_gate_ctrl = drx39xxj_i2c_gate_ctrl,
.sleep = drx39xxj_sleep, .sleep = drx39xxj_sleep,
.set_frontend = drx39xxj_set_frontend, .set_frontend = drx39xxj_set_frontend,
.get_frontend = drx39xxj_get_frontend,
.get_tune_settings = drx39xxj_get_tune_settings, .get_tune_settings = drx39xxj_get_tune_settings,
.read_status = drx39xxj_read_status, .read_status = drx39xxj_read_status,
.read_ber = drx39xxj_read_ber, .read_ber = drx39xxj_read_ber,
......
...@@ -55,6 +55,7 @@ config VIDEO_EM28XX_DVB ...@@ -55,6 +55,7 @@ config VIDEO_EM28XX_DVB
select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_TDA18271 if MEDIA_SUBDRV_AUTOSELECT
select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT
select DVB_DRX39XYJ if MEDIA_SUBDRV_AUTOSELECT
---help--- ---help---
This adds support for DVB cards based on the This adds support for DVB cards based on the
Empiatech em28xx chips. Empiatech em28xx chips.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment