Skip to content

Commit

Permalink
[media] DVB: remove "stats" property bits from ATSC-MH API property a…
Browse files Browse the repository at this point in the history 
…dditions

Mauro is proposing a new API to handle statistics. This functionality will
be returned after the statistics API is ready. Just remove them for now.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed May 20, 2012
1 parent 3113621 commit 10d6737
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 39 deletions.
18 changes: 0 additions & 18 deletions Documentation/DocBook/media/dvb/dvbproperty.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,21 +664,6 @@ typedef enum atscmh_sccc_code_mode {
} atscmh_sccc_code_mode_t;
</programlisting>
</section>
<section id="DTV-ATSCMH-FIC-ERR">
<title><constant>DTV_ATSCMH_FIC_ERR</constant></title>
<para>FIC error count.</para>
<para>Possible values: 0, 1, 2, 3, ..., 0xffff</para>
</section>
<section id="DTV-ATSCMH-CRC-ERR">
<title><constant>DTV_ATSCMH_CRC_ERR</constant></title>
<para>CRC error count.</para>
<para>Possible values: 0, 1, 2, 3, ..., 0xffff</para>
</section>
<section id="DTV-ATSCMH-RS-ERR">
<title><constant>DTV_ATSCMH_RS_ERR</constant></title>
<para>RS error count.</para>
<para>Possible values: 0, 1, 2, 3, ..., 0xffff</para>
</section>
</section>
<section id="DTV-API-VERSION">
<title><constant>DTV_API_VERSION</constant></title>
Expand Down Expand Up @@ -947,9 +932,6 @@ typedef enum fe_hierarchy {
<listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-B"><constant>DTV_ATSCMH_SCCC_CODE_MODE_B</constant></link></para></listitem>
<listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-C"><constant>DTV_ATSCMH_SCCC_CODE_MODE_C</constant></link></para></listitem>
<listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-D"><constant>DTV_ATSCMH_SCCC_CODE_MODE_D</constant></link></para></listitem>
<listitem><para><link linkend="DTV-ATSCMH-FIC-ERR"><constant>DTV_ATSCMH_FIC_ERR</constant></link></para></listitem>
<listitem><para><link linkend="DTV-ATSCMH-CRC-ERR"><constant>DTV_ATSCMH_CRC_ERR</constant></link></para></listitem>
<listitem><para><link linkend="DTV-ATSCMH-RS-ERR"><constant>DTV_ATSCMH_RS_ERR</constant></link></para></listitem>
</itemizedlist>
</section>
</section>
Expand Down
12 changes: 0 additions & 12 deletions drivers/media/dvb/dvb-core/dvb_frontend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1049,9 +1049,6 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = {
_DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_B, 0, 0),
_DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_C, 0, 0),
_DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_D, 0, 0),
_DTV_CMD(DTV_ATSCMH_FIC_ERR, 0, 0),
_DTV_CMD(DTV_ATSCMH_CRC_ERR, 0, 0),
_DTV_CMD(DTV_ATSCMH_RS_ERR, 0, 0),
};

static void dtv_property_dump(struct dtv_property *tvp)
Expand Down Expand Up @@ -1438,15 +1435,6 @@ static int dtv_property_process_get(struct dvb_frontend *fe,
case DTV_ATSCMH_SCCC_CODE_MODE_D:
tvp->u.data = fe->dtv_property_cache.atscmh_sccc_code_mode_d;
break;
case DTV_ATSCMH_FIC_ERR:
tvp->u.data = fe->dtv_property_cache.atscmh_fic_err;
break;
case DTV_ATSCMH_CRC_ERR:
tvp->u.data = fe->dtv_property_cache.atscmh_crc_err;
break;
case DTV_ATSCMH_RS_ERR:
tvp->u.data = fe->dtv_property_cache.atscmh_rs_err;
break;

default:
return -EINVAL;
Expand Down
4 changes: 0 additions & 4 deletions drivers/media/dvb/dvb-core/dvb_frontend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,10 +390,6 @@ struct dtv_frontend_properties {
u8 atscmh_sccc_code_mode_b;
u8 atscmh_sccc_code_mode_c;
u8 atscmh_sccc_code_mode_d;

u16 atscmh_fic_err;
u16 atscmh_crc_err;
u16 atscmh_rs_err;
};

struct dvb_frontend {
Expand Down
9 changes: 8 additions & 1 deletion drivers/media/dvb/frontends/lg2160.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,7 @@ static int lg216x_get_sccc_code_mode(struct lg216x_state *state,

/* ------------------------------------------------------------------------ */

#if 0
static int lg216x_read_fic_err_count(struct lg216x_state *state, u8 *err)
{
u8 fic_err;
Expand Down Expand Up @@ -936,6 +937,7 @@ static int lg216x_read_rs_err_count(struct lg216x_state *state, u16 *err)
}
return ret;
}
#endif

/* ------------------------------------------------------------------------ */

Expand Down Expand Up @@ -1016,6 +1018,7 @@ static int lg216x_get_frontend(struct dvb_frontend *fe)
if (lg_fail(ret))
goto fail;
}
#if 0
ret = lg216x_read_fic_err_count(state,
(u8 *)&fe->dtv_property_cache.atscmh_fic_err);
if (lg_fail(ret))
Expand All @@ -1042,6 +1045,7 @@ static int lg216x_get_frontend(struct dvb_frontend *fe)
break;
}
lg_fail(ret);
#endif
fail:
return ret;
}
Expand Down Expand Up @@ -1319,13 +1323,16 @@ static int lg216x_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{
struct lg216x_state *state = fe->demodulator_priv;
int ret;

#if 0
ret = lg216x_read_rs_err_count(state,
&fe->dtv_property_cache.atscmh_rs_err);
if (lg_fail(ret))
goto fail;

*ucblocks = fe->dtv_property_cache.atscmh_rs_err;
#else
*ucblocks = 0;
#endif
fail:
return 0;
}
Expand Down
5 changes: 1 addition & 4 deletions include/linux/dvb/frontend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,8 @@ struct dvb_frontend_event {
#define DTV_ATSCMH_SCCC_CODE_MODE_B 57
#define DTV_ATSCMH_SCCC_CODE_MODE_C 58
#define DTV_ATSCMH_SCCC_CODE_MODE_D 59
#define DTV_ATSCMH_FIC_ERR 60
#define DTV_ATSCMH_CRC_ERR 61
#define DTV_ATSCMH_RS_ERR 62

#define DTV_MAX_COMMAND DTV_ATSCMH_RS_ERR
#define DTV_MAX_COMMAND DTV_ATSCMH_SCCC_CODE_MODE_D

typedef enum fe_pilot {
PILOT_ON,
Expand Down

0 comments on commit 10d6737

Please sign in to comment.