| Message ID | 1345169022-10221-2-git-send-email-crope@iki.fi (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em 16-08-2012 23:03, Antti Palosaari escreveu: > Common routine for use of dvb-core, demodulator and tuner for check > given DVB-T parameters correctness. > > Signed-off-by: Antti Palosaari <crope@iki.fi> > --- > drivers/media/dvb-core/dvb_frontend.c | 136 ++++++++++++++++++++++++++++++++++ > drivers/media/dvb-core/dvb_frontend.h | 2 + > 2 files changed, 138 insertions(+) > > diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c > index d29d41a..4abb648 100644 > --- a/drivers/media/dvb-core/dvb_frontend.c > +++ b/drivers/media/dvb-core/dvb_frontend.c > @@ -2505,6 +2505,142 @@ int dvb_frontend_resume(struct dvb_frontend *fe) > } > EXPORT_SYMBOL(dvb_frontend_resume); > > +int dvb_validate_params_dvbt(struct dvb_frontend *fe) > +{ > + struct dtv_frontend_properties *c = &fe->dtv_property_cache; > + > + dev_dbg(fe->dvb->device, "%s:\n", __func__); > + > + switch (c->delivery_system) { > + case SYS_DVBT: > + break; > + default: > + dev_dbg(fe->dvb->device, "%s: delivery_system=%d\n", __func__, > + c->delivery_system); > + return -EINVAL; > + } Why do you need to check if the system is DVB-T here? The routine name is only for DVB-T! It should either be a generic routine for all standards, or not having such checks, otherwise, it will end by checking if the delivery system is DVB-T on multiple places. IMO, a dvb_validate_params() call that checks for all types is better. Not sure if you have seen, but there is already something like that at the dvb_frontend.c: dvb_frontend_check_parameters(). So, please let's not reinvent the wheel. > + > + if (c->frequency >= 174000000 && c->frequency <= 230000000) { > + ; > + } else if (c->frequency >= 470000000 && c->frequency <= 862000000) { > + ; > + } else { > + dev_dbg(fe->dvb->device, "%s: frequency=%d\n", __func__, > + c->frequency); > + return -EINVAL; > + } Hmm... dvb_frontend_check_parameters() already checks for the min and max frequencies, based on tuner/demod capabilities. Also, I don't see any reason why the range between 230 MHz and 470 MHz should explicitly excluded here. Are you sure that there aren't any Country somewhere that might be using part of this range for TV? AFAIKT, most tuners will support this range anyway, so enforcing drivers to not use them without any really good reason doesn't make much sense. > + > + switch (c->bandwidth_hz) { > + case 6000000: > + case 7000000: > + case 8000000: > + break; > + default: > + dev_dbg(fe->dvb->device, "%s: bandwidth_hz=%d\n", __func__, > + c->bandwidth_hz); > + return -EINVAL; > + } Hmm... 0 is a valid value (it means AUTO, as documented at the DVB API spec). Also, 5 MHz is also a valid value for DVB-T (see Annex G of EN 300.744 v 1.6.1). I don't doubt you'll find some places with 5MHz on DVB-T outside Europe. > + > + switch (c->transmission_mode) { > + case TRANSMISSION_MODE_AUTO: > + case TRANSMISSION_MODE_2K: > + case TRANSMISSION_MODE_8K: > + break; DVB-T specs also allow 4K for 5 MHz bandwidth. > + default: > + dev_dbg(fe->dvb->device, "%s: transmission_mode=%d\n", __func__, > + c->transmission_mode); > + return -EINVAL; > + } > + > + switch (c->modulation) { > + case QAM_AUTO: > + case QPSK: > + case QAM_16: > + case QAM_64: > + break; > + default: > + dev_dbg(fe->dvb->device, "%s: modulation=%d\n", __func__, > + c->modulation); > + return -EINVAL; > + } > + > + switch (c->guard_interval) { > + case GUARD_INTERVAL_AUTO: > + case GUARD_INTERVAL_1_32: > + case GUARD_INTERVAL_1_16: > + case GUARD_INTERVAL_1_8: > + case GUARD_INTERVAL_1_4: > + break; > + default: > + dev_dbg(fe->dvb->device, "%s: guard_interval=%d\n", __func__, > + c->guard_interval); > + return -EINVAL; > + } > + > + switch (c->hierarchy) { > + case HIERARCHY_NONE: > + case HIERARCHY_AUTO: > + case HIERARCHY_1: > + case HIERARCHY_2: > + case HIERARCHY_4: > + break; > + default: > + dev_dbg(fe->dvb->device, "%s: hierarchy=%d\n", __func__, > + c->hierarchy); > + return -EINVAL; > + } > + > + switch (c->code_rate_HP) { > + case FEC_AUTO: > + case FEC_1_2: > + case FEC_2_3: > + case FEC_3_4: > + case FEC_5_6: > + case FEC_7_8: > + break; > + default: > + dev_dbg(fe->dvb->device, "%s: code_rate_HP=%d\n", __func__, > + c->code_rate_HP); > + return -EINVAL; > + } > + > + /* > + * code_rate_LP is used only with hierarchical coding > + */ > + if (c->hierarchy == HIERARCHY_NONE) { > + switch (c->code_rate_LP) { > + case FEC_NONE: > + /* > + * TODO: FEC_AUTO here is wrong, but for some reason > + * dtv_set_frontend() forces it. > + */ > + case FEC_AUTO: > + break; > + default: > + dev_dbg(fe->dvb->device, "%s: code_rate_LP=%d\n", > + __func__, c->code_rate_LP); > + return -EINVAL; > + } > + } else { > + switch (c->code_rate_LP) { > + case FEC_AUTO: > + case FEC_1_2: > + case FEC_2_3: > + case FEC_3_4: > + case FEC_5_6: > + case FEC_7_8: > + break; > + default: > + dev_dbg(fe->dvb->device, "%s: code_rate_LP=%d\n", > + __func__, c->code_rate_LP); > + return -EINVAL; > + } > + } > + > + return 0; > +} > +EXPORT_SYMBOL(dvb_validate_params_dvbt); Please use EXPORT_SYMBOL_GPL(). > + > int dvb_register_frontend(struct dvb_adapter* dvb, > struct dvb_frontend* fe) > { > diff --git a/drivers/media/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h > index 74ba563..6df0c44 100644 > --- a/drivers/media/dvb-core/dvb_frontend.h > +++ b/drivers/media/dvb-core/dvb_frontend.h > @@ -425,4 +425,6 @@ extern int dvb_frontend_resume(struct dvb_frontend *fe); > extern void dvb_frontend_sleep_until(struct timeval *waketime, u32 add_usec); > extern s32 timeval_usec_diff(struct timeval lasttime, struct timeval curtime); > > +extern int dvb_validate_params_dvbt(struct dvb_frontend *fe); > + > #endif > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/11/2012 10:23 PM, Mauro Carvalho Chehab wrote: > Em 16-08-2012 23:03, Antti Palosaari escreveu: >> Common routine for use of dvb-core, demodulator and tuner for check >> given DVB-T parameters correctness. >> >> Signed-off-by: Antti Palosaari <crope@iki.fi> >> --- >> drivers/media/dvb-core/dvb_frontend.c | 136 ++++++++++++++++++++++++++++++++++ >> drivers/media/dvb-core/dvb_frontend.h | 2 + >> 2 files changed, 138 insertions(+) >> >> diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c >> index d29d41a..4abb648 100644 >> --- a/drivers/media/dvb-core/dvb_frontend.c >> +++ b/drivers/media/dvb-core/dvb_frontend.c >> @@ -2505,6 +2505,142 @@ int dvb_frontend_resume(struct dvb_frontend *fe) >> } >> EXPORT_SYMBOL(dvb_frontend_resume); >> >> +int dvb_validate_params_dvbt(struct dvb_frontend *fe) >> +{ >> + struct dtv_frontend_properties *c = &fe->dtv_property_cache; >> + >> + dev_dbg(fe->dvb->device, "%s:\n", __func__); >> + >> + switch (c->delivery_system) { >> + case SYS_DVBT: >> + break; >> + default: >> + dev_dbg(fe->dvb->device, "%s: delivery_system=%d\n", __func__, >> + c->delivery_system); >> + return -EINVAL; >> + } > > Why do you need to check if the system is DVB-T here? The routine name > is only for DVB-T! It should either be a generic routine for all standards, > or not having such checks, otherwise, it will end by checking if the > delivery system is DVB-T on multiple places. It is currently checked somewhere already. Idea was to provide single function which does all the checks as well as it could do. If frontend is defined to support SYS_DVBT you still must check somewhere call from the userspace is really for delivery_system == SYS_DVBT. So, you look first from frontend ops supported delivery system, then call that delivery system to ensure one got from userspace request is really that. if (frontend.ops.delsys == SYS_DVBT) dvb_validate_params_dvbt() if (frontend.ops.delsys == SYS_DVBC) dvb_validate_params_dvbc() > IMO, a dvb_validate_params() call that checks for all types is better. Surely it is and it was the plan too. But could you guess how much work it is to make good checks for all supported delivery systems used. Even finding out all possible values for each parameter is quite a lot of reading standards not to mention checks for invalid parameter combinations. > Not sure if you have seen, but there is already something like that at > the dvb_frontend.c: dvb_frontend_check_parameters(). So, please let's not > reinvent the wheel. Those check are quite broken currently by design as new chips supports multiple standards. This changed after MFE support. One simple example, frontend supports both DVB-T and DVB-C. How could you checks frequency limit using current approach? Not possible. Due to that I see new way based of television standards are needed. When all these checks are done by frontend in some day in future it is possible to remove those old and broken values from tuner/demod ops. >> + >> + if (c->frequency >= 174000000 && c->frequency <= 230000000) { >> + ; >> + } else if (c->frequency >= 470000000 && c->frequency <= 862000000) { >> + ; >> + } else { >> + dev_dbg(fe->dvb->device, "%s: frequency=%d\n", __func__, >> + c->frequency); >> + return -EINVAL; >> + } > > Hmm... dvb_frontend_check_parameters() already checks for the min and max > frequencies, based on tuner/demod capabilities. Answered that just earlier. > Also, I don't see any reason why the range between 230 MHz and 470 MHz should > explicitly excluded here. Are you sure that there aren't any Country somewhere > that might be using part of this range for TV? AFAIKT, most tuners will support > this range anyway, so enforcing drivers to not use them without any really good > reason doesn't make much sense. There is no other reason than it is not used. Demodulator operates baseband signal and thus no any other limit for RF than those coming from baseband signal characteristics. Hardware limits are coming from the RF tuner. There is mainly two possibilities. 1) make general checks based of used standards 2) leave checking for each driver (allowing all the combinations hardware could do regardless if it is required by specification or not) >> + switch (c->bandwidth_hz) { >> + case 6000000: >> + case 7000000: >> + case 8000000: >> + break; >> + default: >> + dev_dbg(fe->dvb->device, "%s: bandwidth_hz=%d\n", __func__, >> + c->bandwidth_hz); >> + return -EINVAL; >> + } > > Hmm... 0 is a valid value (it means AUTO, as documented at the DVB API spec). ok, sounds crazy but there could be still hardware that detects it automatically for OFDM modulated signal. I wonder how tuner filters (RF/IF) are configured in that case... > Also, 5 MHz is also a valid value for DVB-T (see Annex G of EN 300.744 v 1.6.1). > I don't doubt you'll find some places with 5MHz on DVB-T outside Europe. Yes, it is latest annex (DVB-T Annex G). Also 4k FFT mode from DVB-H is derived. >> + >> + switch (c->transmission_mode) { >> + case TRANSMISSION_MODE_AUTO: >> + case TRANSMISSION_MODE_2K: >> + case TRANSMISSION_MODE_8K: >> + break; > > DVB-T specs also allow 4K for 5 MHz bandwidth. Seems to allow nowadays. >> + default: >> + dev_dbg(fe->dvb->device, "%s: transmission_mode=%d\n", __func__, >> + c->transmission_mode); >> + return -EINVAL; >> + } >> + >> + switch (c->modulation) { >> + case QAM_AUTO: >> + case QPSK: >> + case QAM_16: >> + case QAM_64: >> + break; >> + default: >> + dev_dbg(fe->dvb->device, "%s: modulation=%d\n", __func__, >> + c->modulation); >> + return -EINVAL; >> + } >> + >> + switch (c->guard_interval) { >> + case GUARD_INTERVAL_AUTO: >> + case GUARD_INTERVAL_1_32: >> + case GUARD_INTERVAL_1_16: >> + case GUARD_INTERVAL_1_8: >> + case GUARD_INTERVAL_1_4: >> + break; >> + default: >> + dev_dbg(fe->dvb->device, "%s: guard_interval=%d\n", __func__, >> + c->guard_interval); >> + return -EINVAL; >> + } >> + >> + switch (c->hierarchy) { >> + case HIERARCHY_NONE: >> + case HIERARCHY_AUTO: >> + case HIERARCHY_1: >> + case HIERARCHY_2: >> + case HIERARCHY_4: >> + break; >> + default: >> + dev_dbg(fe->dvb->device, "%s: hierarchy=%d\n", __func__, >> + c->hierarchy); >> + return -EINVAL; >> + } >> + >> + switch (c->code_rate_HP) { >> + case FEC_AUTO: >> + case FEC_1_2: >> + case FEC_2_3: >> + case FEC_3_4: >> + case FEC_5_6: >> + case FEC_7_8: >> + break; >> + default: >> + dev_dbg(fe->dvb->device, "%s: code_rate_HP=%d\n", __func__, >> + c->code_rate_HP); >> + return -EINVAL; >> + } >> + >> + /* >> + * code_rate_LP is used only with hierarchical coding >> + */ >> + if (c->hierarchy == HIERARCHY_NONE) { >> + switch (c->code_rate_LP) { >> + case FEC_NONE: >> + /* >> + * TODO: FEC_AUTO here is wrong, but for some reason >> + * dtv_set_frontend() forces it. >> + */ >> + case FEC_AUTO: >> + break; >> + default: >> + dev_dbg(fe->dvb->device, "%s: code_rate_LP=%d\n", >> + __func__, c->code_rate_LP); >> + return -EINVAL; >> + } >> + } else { >> + switch (c->code_rate_LP) { >> + case FEC_AUTO: >> + case FEC_1_2: >> + case FEC_2_3: >> + case FEC_3_4: >> + case FEC_5_6: >> + case FEC_7_8: >> + break; >> + default: >> + dev_dbg(fe->dvb->device, "%s: code_rate_LP=%d\n", >> + __func__, c->code_rate_LP); >> + return -EINVAL; >> + } >> + } >> + >> + return 0; >> +} >> +EXPORT_SYMBOL(dvb_validate_params_dvbt); > > Please use EXPORT_SYMBOL_GPL(). > >> + >> int dvb_register_frontend(struct dvb_adapter* dvb, >> struct dvb_frontend* fe) >> { >> diff --git a/drivers/media/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h >> index 74ba563..6df0c44 100644 >> --- a/drivers/media/dvb-core/dvb_frontend.h >> +++ b/drivers/media/dvb-core/dvb_frontend.h >> @@ -425,4 +425,6 @@ extern int dvb_frontend_resume(struct dvb_frontend *fe); >> extern void dvb_frontend_sleep_until(struct timeval *waketime, u32 add_usec); >> extern s32 timeval_usec_diff(struct timeval lasttime, struct timeval curtime); >> >> +extern int dvb_validate_params_dvbt(struct dvb_frontend *fe); >> + >> #endif >> >
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c index d29d41a..4abb648 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c @@ -2505,6 +2505,142 @@ int dvb_frontend_resume(struct dvb_frontend *fe) } EXPORT_SYMBOL(dvb_frontend_resume); +int dvb_validate_params_dvbt(struct dvb_frontend *fe) +{ + struct dtv_frontend_properties *c = &fe->dtv_property_cache; + + dev_dbg(fe->dvb->device, "%s:\n", __func__); + + switch (c->delivery_system) { + case SYS_DVBT: + break; + default: + dev_dbg(fe->dvb->device, "%s: delivery_system=%d\n", __func__, + c->delivery_system); + return -EINVAL; + } + + if (c->frequency >= 174000000 && c->frequency <= 230000000) { + ; + } else if (c->frequency >= 470000000 && c->frequency <= 862000000) { + ; + } else { + dev_dbg(fe->dvb->device, "%s: frequency=%d\n", __func__, + c->frequency); + return -EINVAL; + } + + switch (c->bandwidth_hz) { + case 6000000: + case 7000000: + case 8000000: + break; + default: + dev_dbg(fe->dvb->device, "%s: bandwidth_hz=%d\n", __func__, + c->bandwidth_hz); + return -EINVAL; + } + + switch (c->transmission_mode) { + case TRANSMISSION_MODE_AUTO: + case TRANSMISSION_MODE_2K: + case TRANSMISSION_MODE_8K: + break; + default: + dev_dbg(fe->dvb->device, "%s: transmission_mode=%d\n", __func__, + c->transmission_mode); + return -EINVAL; + } + + switch (c->modulation) { + case QAM_AUTO: + case QPSK: + case QAM_16: + case QAM_64: + break; + default: + dev_dbg(fe->dvb->device, "%s: modulation=%d\n", __func__, + c->modulation); + return -EINVAL; + } + + switch (c->guard_interval) { + case GUARD_INTERVAL_AUTO: + case GUARD_INTERVAL_1_32: + case GUARD_INTERVAL_1_16: + case GUARD_INTERVAL_1_8: + case GUARD_INTERVAL_1_4: + break; + default: + dev_dbg(fe->dvb->device, "%s: guard_interval=%d\n", __func__, + c->guard_interval); + return -EINVAL; + } + + switch (c->hierarchy) { + case HIERARCHY_NONE: + case HIERARCHY_AUTO: + case HIERARCHY_1: + case HIERARCHY_2: + case HIERARCHY_4: + break; + default: + dev_dbg(fe->dvb->device, "%s: hierarchy=%d\n", __func__, + c->hierarchy); + return -EINVAL; + } + + switch (c->code_rate_HP) { + case FEC_AUTO: + case FEC_1_2: + case FEC_2_3: + case FEC_3_4: + case FEC_5_6: + case FEC_7_8: + break; + default: + dev_dbg(fe->dvb->device, "%s: code_rate_HP=%d\n", __func__, + c->code_rate_HP); + return -EINVAL; + } + + /* + * code_rate_LP is used only with hierarchical coding + */ + if (c->hierarchy == HIERARCHY_NONE) { + switch (c->code_rate_LP) { + case FEC_NONE: + /* + * TODO: FEC_AUTO here is wrong, but for some reason + * dtv_set_frontend() forces it. + */ + case FEC_AUTO: + break; + default: + dev_dbg(fe->dvb->device, "%s: code_rate_LP=%d\n", + __func__, c->code_rate_LP); + return -EINVAL; + } + } else { + switch (c->code_rate_LP) { + case FEC_AUTO: + case FEC_1_2: + case FEC_2_3: + case FEC_3_4: + case FEC_5_6: + case FEC_7_8: + break; + default: + dev_dbg(fe->dvb->device, "%s: code_rate_LP=%d\n", + __func__, c->code_rate_LP); + return -EINVAL; + } + } + + return 0; +} +EXPORT_SYMBOL(dvb_validate_params_dvbt); + int dvb_register_frontend(struct dvb_adapter* dvb, struct dvb_frontend* fe) { diff --git a/drivers/media/dvb-core/dvb_frontend.h b/drivers/media/dvb-core/dvb_frontend.h index 74ba563..6df0c44 100644 --- a/drivers/media/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb-core/dvb_frontend.h @@ -425,4 +425,6 @@ extern int dvb_frontend_resume(struct dvb_frontend *fe); extern void dvb_frontend_sleep_until(struct timeval *waketime, u32 add_usec); extern s32 timeval_usec_diff(struct timeval lasttime, struct timeval curtime); +extern int dvb_validate_params_dvbt(struct dvb_frontend *fe); + #endif
Common routine for use of dvb-core, demodulator and tuner for check given DVB-T parameters correctness. Signed-off-by: Antti Palosaari <crope@iki.fi> --- drivers/media/dvb-core/dvb_frontend.c | 136 ++++++++++++++++++++++++++++++++++ drivers/media/dvb-core/dvb_frontend.h | 2 + 2 files changed, 138 insertions(+)