#define BANDWIDTH_AUTO (BandWidth)3
#define GUARD_INTERVAL_AUTO (GuardInterval)4
#define HIERARCHY_AUTO (Hierarchy)4
-#define parm.frequency parm.Frequency
-#define parm.inversion parm.Inversion
-#define parm.u.qpsk.symbol_rate parm.u.qpsk.SymbolRate
-#define parm.u.qpsk.fec_inner parm.u.qpsk.FEC_inner
-#define parm.u.qam.symbol_rate parm.u.qam.SymbolRate
-#define parm.u.qam.fec_inner parm.u.qam.FEC_inner
-#define parm.u.qam.modulation parm.u.qam.QAM
-#define parm.u.ofdm.bandwidth parm.u.ofdm.bandWidth
-#define parm.u.ofdm.code_rate_LP parm.u.ofdm.LP_CodeRate
-#define parm.u.ofdm.code_rate_HP parm.u.ofdm.HP_CodeRate
-#define parm.u.ofdm.constellation parm.u.ofdm.Constellation
-#define parm.u.ofdm.transmission_mode parm.u.ofdm.TransmissionMode
-#define parm.u.ofdm.guard_interval parm.u.ofdm.guardInterval
-#define parm.u.ofdm.hierarchy_information parm.u.ofdm.HierarchyInformation
+#define parm_frequency parm.Frequency
+#define parm_inversion parm.Inversion
+#define parm_u_qpsk_symbol_rate parm.u.qpsk.SymbolRate
+#define parm_u_qpsk_fec_inner parm.u.qpsk.FEC_inner
+#define parm_u_qam_symbol_rate parm.u.qam.SymbolRate
+#define parm_u_qam_fec_inner parm.u.qam.FEC_inner
+#define parm_u_qam_modulation parm.u.qam.QAM
+#define parm_u_ofdm_bandwidth parm.u.ofdm.bandWidth
+#define parm_u_ofdm_code_rate_LP parm.u.ofdm.LP_CodeRate
+#define parm_u_ofdm_code_rate_HP parm.u.ofdm.HP_CodeRate
+#define parm_u_ofdm_constellation parm.u.ofdm.Constellation
+#define parm_u_ofdm_transmission_mode parm.u.ofdm.TransmissionMode
+#define parm_u_ofdm_guard_interval parm.u.ofdm.guardInterval
+#define parm_u_ofdm_hierarchy_information parm.u.ofdm.HierarchyInformation
#else
#include <linux/dvb/frontend.h>
+#define parm_frequency parm.frequency
+#define parm_inversion parm.inversion
+#define parm_u_qpsk_symbol_rate parm.u.qpsk.symbol_rate
+#define parm_u_qpsk_fec_inner parm.u.qpsk.fec_inner
+#define parm_u_qam_symbol_rate parm.u.qam.symbol_rate
+#define parm_u_qam_fec_inner parm.u.qam.fec_inner
+#define parm_u_qam_modulation parm.u.qam.modulation
+#define parm_u_ofdm_bandwidth parm.u.ofdm.bandwidth
+#define parm_u_ofdm_code_rate_LP parm.u.ofdm.code_rate_LP
+#define parm_u_ofdm_code_rate_HP parm.u.ofdm.code_rate_HP
+#define parm_u_ofdm_constellation parm.u.ofdm.constellation
+#define parm_u_ofdm_transmission_mode parm.u.ofdm.transmission_mode
+#define parm_u_ofdm_guard_interval parm.u.ofdm.guard_interval
+#define parm_u_ofdm_hierarchy_information parm.u.ofdm.hierarchy_information
#endif
#include <dvbsi++/satellite_delivery_system_descriptor.h>
#include <dvbsi++/cable_delivery_system_descriptor.h>
#include <dvbsi++/terrestrial_delivery_system_descriptor.h>
+void eDVBDiseqcCommand::setCommandString(const char *str)
+{
+ if (!str)
+ return;
+ len = strlen(str);
+ if (len > MAX_DISEQC_LENGTH)
+ len = MAX_DISEQC_LENGTH;
+ memcpy(data, str, len);
+}
+
void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
{
frequency = descriptor.getFrequency() * 10;
return 0;
}
-RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const
+RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const
{
switch (m_type)
{
m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read);
CONNECT(m_sn->activated, eDVBFrontend::feEvent);
- m_sn->start();
return 0;
}
{
int freq_offset=0;
int csw=0;
+ const char *fec=0;
fe->getData(0, csw);
fe->getData(9, freq_offset);
- int frequency = parm.frequency + freq_offset;
+ int frequency = parm_frequency + freq_offset;
PutToDict(dict, "frequency", frequency);
- PutToDict(dict, "inversion", parm.inversion);
- PutToDict(dict, "symbol_rate", parm.u.qpsk.symbol_rate);
- const char *fec=0;
- switch(parm.u.qpsk.fec_inner)
+ PutToDict(dict, "symbol_rate", parm_u_qpsk_symbol_rate);
+
+ switch(parm_u_qpsk_fec_inner)
{
- case FEC_1_2:
- fec = "FEC_1_2";
- break;
- case FEC_2_3:
- fec = "FEC_2_3";
- break;
- case FEC_3_4:
- fec = "FEC_3_4";
- break;
- case FEC_5_6:
- fec = "FEC_5_6";
- break;
- case FEC_7_8:
- fec = "FEC_7_8";
- break;
- default:
- case FEC_AUTO:
- fec = "FEC_AUTO";
- break;
+ case FEC_1_2:
+ fec = "FEC_1_2";
+ break;
+ case FEC_2_3:
+ fec = "FEC_2_3";
+ break;
+ case FEC_3_4:
+ fec = "FEC_3_4";
+ break;
+ case FEC_5_6:
+ fec = "FEC_5_6";
+ break;
+ case FEC_7_8:
+ fec = "FEC_7_8";
+ break;
+ default:
+ case FEC_AUTO:
+ fec = "FEC_AUTO";
+ break;
}
PutToDict(dict, "fec_inner", fec);
}
void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm)
{
-/*
-#define parm.frequency parm.Frequency
-#define parm.inversion parm.Inversion
-#define parm.u.qam.symbol_rate parm.u.qam.SymbolRate
-#define parm.u.qam.fec_inner parm.u.qam.FEC_inner
-#define parm.u.qam.modulation parm.u.qam.QAM
-*/
+ const char *tmp=0;
+ PutToDict(dict, "frequency", parm_frequency/1000);
+ PutToDict(dict, "symbol_rate", parm_u_qam_symbol_rate);
+ switch(parm_u_qam_fec_inner)
+ {
+ case FEC_NONE:
+ tmp = "FEC_NONE";
+ break;
+ case FEC_1_2:
+ tmp = "FEC_1_2";
+ break;
+ case FEC_2_3:
+ tmp = "FEC_2_3";
+ break;
+ case FEC_3_4:
+ tmp = "FEC_3_4";
+ break;
+ case FEC_5_6:
+ tmp = "FEC_5_6";
+ break;
+ case FEC_7_8:
+ tmp = "FEC_7_8";
+ break;
+#if HAVE_DVB_API_VERSION >= 3
+ case FEC_8_9:
+ tmp = "FEC_8_9";
+ break;
+#endif
+ default:
+ case FEC_AUTO:
+ tmp = "FEC_AUTO";
+ break;
+ }
+ PutToDict(dict, "fec_inner", tmp);
+ switch(parm_u_qam_modulation)
+ {
+ case QAM_16:
+ tmp = "QAM_16";
+ break;
+ case QAM_32:
+ tmp = "QAM_32";
+ break;
+ case QAM_64:
+ tmp = "QAM_64";
+ break;
+ case QAM_128:
+ tmp = "QAM_128";
+ break;
+ case QAM_256:
+ tmp = "QAM_256";
+ break;
+ default:
+ case QAM_AUTO:
+ tmp = "QAM_AUTO";
+ break;
+ }
+ PutToDict(dict, "modulation", tmp);
}
void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm)
{
-/*
-#define parm.frequency parm.Frequency
-#define parm.inversion parm.Inversion
-#define parm.u.ofdm.bandwidth parm.u.ofdm.bandWidth
-#define parm.u.ofdm.code_rate_LP parm.u.ofdm.LP_CodeRate
-#define parm.u.ofdm.code_rate_HP parm.u.ofdm.HP_CodeRate
-#define parm.u.ofdm.constellation parm.u.ofdm.Constellation
-#define parm.u.ofdm.transmission_mode parm.u.ofdm.TransmissionMode
-#define parm.u.ofdm.guard_interval parm.u.ofdm.guardInterval
-#define parm.u.ofdm.hierarchy_information parm.u.ofdm.HierarchyInformation
-*/
+ const char *tmp=0;
+ PutToDict(dict, "frequency", parm_frequency);
+ switch (parm_u_ofdm_bandwidth)
+ {
+ case BANDWIDTH_8_MHZ:
+ tmp = "BANDWIDTH_8_MHZ";
+ break;
+ case BANDWIDTH_7_MHZ:
+ tmp = "BANDWIDTH_7_MHZ";
+ break;
+ case BANDWIDTH_6_MHZ:
+ tmp = "BANDWIDTH_6_MHZ";
+ break;
+ default:
+ case BANDWIDTH_AUTO:
+ tmp = "BANDWIDTH_AUTO";
+ break;
+ }
+ PutToDict(dict, "bandwidth", tmp);
+ switch (parm_u_ofdm_code_rate_LP)
+ {
+ case FEC_1_2:
+ tmp = "FEC_1_2";
+ break;
+ case FEC_2_3:
+ tmp = "FEC_2_3";
+ break;
+ case FEC_3_4:
+ tmp = "FEC_3_4";
+ break;
+ case FEC_5_6:
+ tmp = "FEC_5_6";
+ break;
+ case FEC_7_8:
+ tmp = "FEC_7_8";
+ break;
+ default:
+ case FEC_AUTO:
+ tmp = "FEC_AUTO";
+ break;
+ }
+ PutToDict(dict, "code_rate_lp", tmp);
+ switch (parm_u_ofdm_code_rate_HP)
+ {
+ case FEC_1_2:
+ tmp = "FEC_1_2";
+ break;
+ case FEC_2_3:
+ tmp = "FEC_2_3";
+ break;
+ case FEC_3_4:
+ tmp = "FEC_3_4";
+ break;
+ case FEC_5_6:
+ tmp = "FEC_5_6";
+ break;
+ case FEC_7_8:
+ tmp = "FEC_7_8";
+ break;
+ default:
+ case FEC_AUTO:
+ tmp = "FEC_AUTO";
+ break;
+ }
+ PutToDict(dict, "code_rate_hp", tmp);
+ switch (parm_u_ofdm_constellation)
+ {
+ case QPSK:
+ tmp = "QPSK";
+ break;
+ case QAM_16:
+ tmp = "QAM_16";
+ break;
+ default:
+ case QAM_AUTO:
+ tmp = "QAM_AUTO";
+ break;
+ }
+ PutToDict(dict, "constellation", tmp);
+ switch (parm_u_ofdm_transmission_mode)
+ {
+ case TRANSMISSION_MODE_2K:
+ tmp = "TRANSMISSION_MODE_2K";
+ break;
+ case TRANSMISSION_MODE_8K:
+ tmp = "TRANSMISSION_MODE_8K";
+ break;
+ default:
+ case TRANSMISSION_MODE_AUTO:
+ tmp = "TRANSMISSION_MODE_AUTO";
+ break;
+ }
+ PutToDict(dict, "transmission_mode", tmp);
+ switch (parm_u_ofdm_guard_interval)
+ {
+ case GUARD_INTERVAL_1_32:
+ tmp = "GUARD_INTERVAL_1_32";
+ break;
+ case GUARD_INTERVAL_1_16:
+ tmp = "GUARD_INTERVAL_1_16";
+ break;
+ case GUARD_INTERVAL_1_8:
+ tmp = "GUARD_INTERVAL_1_8";
+ break;
+ case GUARD_INTERVAL_1_4:
+ tmp = "GUARD_INTERVAL_1_4";
+ break;
+ default:
+ case GUARD_INTERVAL_AUTO:
+ tmp = "GUARD_INTERVAL_AUTO";
+ break;
+ }
+ PutToDict(dict, "guard_interval", tmp);
+ switch (parm_u_ofdm_hierarchy_information)
+ {
+ case HIERARCHY_1:
+ tmp = "HIERARCHY_1";
+ break;
+ case HIERARCHY_2:
+ tmp = "HIERARCHY_2";
+ break;
+ case HIERARCHY_4:
+ tmp = "HIERARCHY_4";
+ break;
+ default:
+ case HIERARCHY_AUTO:
+ tmp = "HIERARCHY_AUTO";
+ break;
+ }
+ PutToDict(dict, "hierarchy_information", tmp);
}
PyObject *eDVBFrontend::readTransponderData(bool original)
if (ret)
{
bool read=m_fd != -1;
- const char *tmp = "unknown";
+ const char *tmp=0;
- PutToDict(ret, "tuner number", m_fe);
+ PutToDict(ret, "tuner_number", m_fe);
switch(m_type)
{
tmp = "DVB-S";
break;
case feCable:
- tmp="DVB-C";
+ tmp = "DVB-C";
break;
case feTerrestrial:
- tmp="DVB-T";
+ tmp = "DVB-T";
break;
default:
+ tmp = "UNKNOWN";
read=false;
break;
}
- PutToDict(ret, "tuner type", tmp);
+ PutToDict(ret, "tuner_type", tmp);
if (read)
{
FRONTENDPARAMETERS front;
- tmp = "unknown";
+ tmp = "UNKNOWN";
switch(m_state)
{
case stateIdle:
- tmp="idle";
+ tmp="IDLE";
break;
case stateTuning:
- tmp="tuning";
+ tmp="TUNING";
break;
case stateFailed:
- tmp="failed";
+ tmp="FAILED";
break;
case stateLock:
- tmp="lock";
+ tmp="LOCKED";
break;
case stateLostLock:
- tmp="lostlock";
+ tmp="LOSTLOCK";
break;
default:
break;
}
- PutToDict(ret, "tuner state", tmp);
+ PutToDict(ret, "tuner_state", tmp);
- PutToDict(ret, "tuner locked", readFrontendData(Locked));
- PutToDict(ret, "tuner synced", readFrontendData(Synced));
- PutToDict(ret, "tuner bit_error_rate", readFrontendData(bitErrorRate));
- PutToDict(ret, "tuner signal_power", readFrontendData(signalPower));
- PutToDict(ret, "tuner signal_quality", readFrontendData(signalQuality));
+ PutToDict(ret, "tuner_locked", readFrontendData(Locked));
+ PutToDict(ret, "tuner_synced", readFrontendData(Synced));
+ PutToDict(ret, "tuner_bit_error_rate", readFrontendData(bitErrorRate));
+ PutToDict(ret, "tuner_signal_power", readFrontendData(signalPower));
+ PutToDict(ret, "tuner_signal_quality", readFrontendData(signalQuality));
if (!original && ioctl(m_fd, FE_GET_FRONTEND, &front)<0)
eDebug("FE_GET_FRONTEND (%m)");
else
{
+ tmp = "INVERSION_AUTO";
+ switch(parm_inversion)
+ {
+ case INVERSION_ON:
+ tmp = "INVERSION_ON";
+ break;
+ case INVERSION_OFF:
+ tmp = "INVERSION_OFF";
+ break;
+ default:
+ break;
+ }
+ if (tmp)
+ PutToDict(ret, "inversion", tmp);
+
switch(m_type)
{
case feSatellite:
void eDVBFrontend::setFrontend()
{
eDebug("setting frontend %d", m_fe);
+ m_sn->start();
+ feEvent(-1);
if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1)
{
perror("FE_SET_FRONTEND failed");
res = m_sec->prepare(*this, parm, feparm, 1 << m_fe);
if (!res)
{
- parm.u.qpsk.symbol_rate = feparm.symbol_rate;
+ parm_u_qpsk_symbol_rate = feparm.symbol_rate;
switch (feparm.inversion)
{
case eDVBFrontendParametersSatellite::Inversion::On:
- parm.inversion = INVERSION_ON;
+ parm_inversion = INVERSION_ON;
break;
case eDVBFrontendParametersSatellite::Inversion::Off:
- parm.inversion = INVERSION_OFF;
+ parm_inversion = INVERSION_OFF;
break;
default:
case eDVBFrontendParametersSatellite::Inversion::Unknown:
- parm.inversion = INVERSION_AUTO;
+ parm_inversion = INVERSION_AUTO;
break;
}
switch (feparm.fec)
case eDVBFrontendParametersSatellite::FEC::fNone:
eDebug("no fec set.. assume auto");
case eDVBFrontendParametersSatellite::FEC::fAuto:
- parm.u.qpsk.fec_inner = FEC_AUTO;
+ parm_u_qpsk_fec_inner = FEC_AUTO;
break;
case eDVBFrontendParametersSatellite::FEC::f1_2:
- parm.u.qpsk.fec_inner = FEC_1_2;
+ parm_u_qpsk_fec_inner = FEC_1_2;
break;
case eDVBFrontendParametersSatellite::FEC::f2_3:
- parm.u.qpsk.fec_inner = FEC_2_3;
+ parm_u_qpsk_fec_inner = FEC_2_3;
break;
case eDVBFrontendParametersSatellite::FEC::f3_4:
- parm.u.qpsk.fec_inner = FEC_3_4;
+ parm_u_qpsk_fec_inner = FEC_3_4;
break;
case eDVBFrontendParametersSatellite::FEC::f5_6:
- parm.u.qpsk.fec_inner = FEC_5_6;
+ parm_u_qpsk_fec_inner = FEC_5_6;
break;
case eDVBFrontendParametersSatellite::FEC::f7_8:
- parm.u.qpsk.fec_inner = FEC_7_8;
+ parm_u_qpsk_fec_inner = FEC_7_8;
break;
}
- eDebug("tuning to %d mhz", parm.frequency/1000);
+ // FIXME !!! get frequency range from tuner
+ if ( parm_frequency < 900000 || parm_frequency > 2200000 )
+ {
+ eDebug("%d mhz out of tuner range.. dont tune", parm_frequency/1000);
+ return -EINVAL;
+ }
+ eDebug("tuning to %d mhz", parm_frequency/1000);
}
return res;
}
RESULT eDVBFrontend::prepare_cable(const eDVBFrontendParametersCable &feparm)
{
- parm.frequency = feparm.frequency * 1000;
- parm.u.qam.symbol_rate = feparm.symbol_rate;
+ parm_frequency = feparm.frequency * 1000;
+ parm_u_qam_symbol_rate = feparm.symbol_rate;
switch (feparm.modulation)
{
case eDVBFrontendParametersCable::Modulation::QAM16:
- parm.u.qam.modulation = QAM_16;
+ parm_u_qam_modulation = QAM_16;
break;
case eDVBFrontendParametersCable::Modulation::QAM32:
- parm.u.qam.modulation = QAM_32;
+ parm_u_qam_modulation = QAM_32;
break;
case eDVBFrontendParametersCable::Modulation::QAM64:
- parm.u.qam.modulation = QAM_64;
+ parm_u_qam_modulation = QAM_64;
break;
case eDVBFrontendParametersCable::Modulation::QAM128:
- parm.u.qam.modulation = QAM_128;
+ parm_u_qam_modulation = QAM_128;
break;
case eDVBFrontendParametersCable::Modulation::QAM256:
- parm.u.qam.modulation = QAM_256;
+ parm_u_qam_modulation = QAM_256;
break;
default:
case eDVBFrontendParametersCable::Modulation::Auto:
- parm.u.qam.modulation = QAM_AUTO;
+ parm_u_qam_modulation = QAM_AUTO;
break;
}
switch (feparm.inversion)
{
case eDVBFrontendParametersCable::Inversion::On:
- parm.inversion = INVERSION_ON;
+ parm_inversion = INVERSION_ON;
break;
case eDVBFrontendParametersCable::Inversion::Off:
- parm.inversion = INVERSION_OFF;
+ parm_inversion = INVERSION_OFF;
break;
default:
case eDVBFrontendParametersCable::Inversion::Unknown:
- parm.inversion = INVERSION_AUTO;
+ parm_inversion = INVERSION_AUTO;
break;
}
switch (feparm.fec_inner)
{
case eDVBFrontendParametersCable::FEC::fNone:
- parm.u.qam.fec_inner = FEC_NONE;
+ parm_u_qam_fec_inner = FEC_NONE;
break;
case eDVBFrontendParametersCable::FEC::f1_2:
- parm.u.qam.fec_inner = FEC_1_2;
+ parm_u_qam_fec_inner = FEC_1_2;
break;
case eDVBFrontendParametersCable::FEC::f2_3:
- parm.u.qam.fec_inner = FEC_2_3;
+ parm_u_qam_fec_inner = FEC_2_3;
break;
case eDVBFrontendParametersCable::FEC::f3_4:
- parm.u.qam.fec_inner = FEC_3_4;
+ parm_u_qam_fec_inner = FEC_3_4;
break;
case eDVBFrontendParametersCable::FEC::f5_6:
- parm.u.qam.fec_inner = FEC_5_6;
+ parm_u_qam_fec_inner = FEC_5_6;
break;
case eDVBFrontendParametersCable::FEC::f7_8:
- parm.u.qam.fec_inner = FEC_7_8;
+ parm_u_qam_fec_inner = FEC_7_8;
break;
+#if HAVE_DVB_API_VERSION >= 3
case eDVBFrontendParametersCable::FEC::f8_9:
- parm.u.qam.fec_inner = FEC_8_9;
+ parm_u_qam_fec_inner = FEC_8_9;
break;
+#endif
default:
case eDVBFrontendParametersCable::FEC::fAuto:
- parm.u.qam.fec_inner = FEC_AUTO;
+ parm_u_qam_fec_inner = FEC_AUTO;
break;
}
return 0;
RESULT eDVBFrontend::prepare_terrestrial(const eDVBFrontendParametersTerrestrial &feparm)
{
- parm.frequency = feparm.frequency;
+ parm_frequency = feparm.frequency;
switch (feparm.bandwidth)
{
case eDVBFrontendParametersTerrestrial::Bandwidth::Bw8MHz:
- parm.u.ofdm.bandwidth = BANDWIDTH_8_MHZ;
+ parm_u_ofdm_bandwidth = BANDWIDTH_8_MHZ;
break;
case eDVBFrontendParametersTerrestrial::Bandwidth::Bw7MHz:
- parm.u.ofdm.bandwidth = BANDWIDTH_7_MHZ;
+ parm_u_ofdm_bandwidth = BANDWIDTH_7_MHZ;
break;
case eDVBFrontendParametersTerrestrial::Bandwidth::Bw6MHz:
- parm.u.ofdm.bandwidth = BANDWIDTH_6_MHZ;
+ parm_u_ofdm_bandwidth = BANDWIDTH_6_MHZ;
break;
default:
case eDVBFrontendParametersTerrestrial::Bandwidth::BwAuto:
- parm.u.ofdm.bandwidth = BANDWIDTH_AUTO;
+ parm_u_ofdm_bandwidth = BANDWIDTH_AUTO;
break;
}
switch (feparm.code_rate_LP)
{
- case eDVBFrontendParametersCable::FEC::f1_2:
- parm.u.ofdm.code_rate_LP = FEC_1_2;
+ case eDVBFrontendParametersTerrestrial::FEC::f1_2:
+ parm_u_ofdm_code_rate_LP = FEC_1_2;
break;
- case eDVBFrontendParametersCable::FEC::f2_3:
- parm.u.ofdm.code_rate_LP = FEC_2_3;
+ case eDVBFrontendParametersTerrestrial::FEC::f2_3:
+ parm_u_ofdm_code_rate_LP = FEC_2_3;
break;
- case eDVBFrontendParametersCable::FEC::f3_4:
- parm.u.ofdm.code_rate_LP = FEC_3_4;
+ case eDVBFrontendParametersTerrestrial::FEC::f3_4:
+ parm_u_ofdm_code_rate_LP = FEC_3_4;
break;
- case eDVBFrontendParametersCable::FEC::f5_6:
- parm.u.ofdm.code_rate_LP = FEC_5_6;
+ case eDVBFrontendParametersTerrestrial::FEC::f5_6:
+ parm_u_ofdm_code_rate_LP = FEC_5_6;
break;
- case eDVBFrontendParametersCable::FEC::f7_8:
- parm.u.ofdm.code_rate_LP = FEC_7_8;
+ case eDVBFrontendParametersTerrestrial::FEC::f7_8:
+ parm_u_ofdm_code_rate_LP = FEC_7_8;
break;
default:
- case eDVBFrontendParametersCable::FEC::fAuto:
- case eDVBFrontendParametersCable::FEC::fNone:
- parm.u.ofdm.code_rate_LP = FEC_AUTO;
+ case eDVBFrontendParametersTerrestrial::FEC::fAuto:
+ parm_u_ofdm_code_rate_LP = FEC_AUTO;
break;
}
switch (feparm.code_rate_HP)
{
- case eDVBFrontendParametersCable::FEC::f1_2:
- parm.u.ofdm.code_rate_HP = FEC_1_2;
+ case eDVBFrontendParametersTerrestrial::FEC::f1_2:
+ parm_u_ofdm_code_rate_HP = FEC_1_2;
break;
- case eDVBFrontendParametersCable::FEC::f2_3:
- parm.u.ofdm.code_rate_HP = FEC_2_3;
+ case eDVBFrontendParametersTerrestrial::FEC::f2_3:
+ parm_u_ofdm_code_rate_HP = FEC_2_3;
break;
- case eDVBFrontendParametersCable::FEC::f3_4:
- parm.u.ofdm.code_rate_HP = FEC_3_4;
+ case eDVBFrontendParametersTerrestrial::FEC::f3_4:
+ parm_u_ofdm_code_rate_HP = FEC_3_4;
break;
- case eDVBFrontendParametersCable::FEC::f5_6:
- parm.u.ofdm.code_rate_HP = FEC_5_6;
+ case eDVBFrontendParametersTerrestrial::FEC::f5_6:
+ parm_u_ofdm_code_rate_HP = FEC_5_6;
break;
- case eDVBFrontendParametersCable::FEC::f7_8:
- parm.u.ofdm.code_rate_HP = FEC_7_8;
+ case eDVBFrontendParametersTerrestrial::FEC::f7_8:
+ parm_u_ofdm_code_rate_HP = FEC_7_8;
break;
default:
- case eDVBFrontendParametersCable::FEC::fAuto:
- case eDVBFrontendParametersCable::FEC::fNone:
- parm.u.ofdm.code_rate_HP = FEC_AUTO;
+ case eDVBFrontendParametersTerrestrial::FEC::fAuto:
+ parm_u_ofdm_code_rate_HP = FEC_AUTO;
break;
}
switch (feparm.modulation)
{
case eDVBFrontendParametersTerrestrial::Modulation::QPSK:
- parm.u.ofdm.constellation = QPSK;
+ parm_u_ofdm_constellation = QPSK;
break;
case eDVBFrontendParametersTerrestrial::Modulation::QAM16:
- parm.u.ofdm.constellation = QAM_16;
+ parm_u_ofdm_constellation = QAM_16;
break;
default:
case eDVBFrontendParametersTerrestrial::Modulation::Auto:
- parm.u.ofdm.constellation = QAM_AUTO;
+ parm_u_ofdm_constellation = QAM_AUTO;
break;
}
switch (feparm.transmission_mode)
{
case eDVBFrontendParametersTerrestrial::TransmissionMode::TM2k:
- parm.u.ofdm.transmission_mode = TRANSMISSION_MODE_2K;
+ parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_2K;
break;
case eDVBFrontendParametersTerrestrial::TransmissionMode::TM8k:
- parm.u.ofdm.transmission_mode = TRANSMISSION_MODE_8K;
+ parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_8K;
break;
default:
case eDVBFrontendParametersTerrestrial::TransmissionMode::TMAuto:
- parm.u.ofdm.transmission_mode = TRANSMISSION_MODE_AUTO;
+ parm_u_ofdm_transmission_mode = TRANSMISSION_MODE_AUTO;
break;
}
switch (feparm.guard_interval)
{
case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_32:
- parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_32;
+ parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_32;
break;
case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_16:
- parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_16;
+ parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_16;
break;
case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_8:
- parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_8;
+ parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_8;
break;
case eDVBFrontendParametersTerrestrial::GuardInterval::GI_1_4:
- parm.u.ofdm.guard_interval = GUARD_INTERVAL_1_4;
+ parm_u_ofdm_guard_interval = GUARD_INTERVAL_1_4;
break;
default:
case eDVBFrontendParametersTerrestrial::GuardInterval::GI_Auto:
- parm.u.ofdm.guard_interval = GUARD_INTERVAL_AUTO;
+ parm_u_ofdm_guard_interval = GUARD_INTERVAL_AUTO;
break;
}
switch (feparm.hierarchy)
{
case eDVBFrontendParametersTerrestrial::Hierarchy::H1:
- parm.u.ofdm.hierarchy_information = HIERARCHY_1;
+ parm_u_ofdm_hierarchy_information = HIERARCHY_1;
break;
case eDVBFrontendParametersTerrestrial::Hierarchy::H2:
- parm.u.ofdm.hierarchy_information = HIERARCHY_2;
+ parm_u_ofdm_hierarchy_information = HIERARCHY_2;
break;
case eDVBFrontendParametersTerrestrial::Hierarchy::H4:
- parm.u.ofdm.hierarchy_information = HIERARCHY_4;
+ parm_u_ofdm_hierarchy_information = HIERARCHY_4;
break;
default:
case eDVBFrontendParametersTerrestrial::Hierarchy::HAuto:
- parm.u.ofdm.hierarchy_information = HIERARCHY_AUTO;
+ parm_u_ofdm_hierarchy_information = HIERARCHY_AUTO;
break;
}
return 0;
{
eDebug("(%d)tune", m_fe);
+ m_timeout->stop();
+
int res=0;
if (m_type == -1)
return -ENODEV;
- feEvent(-1);
-
+ m_sn->stop();
m_sec_sequence.clear();
switch (m_type)
return -EINVAL;
res=prepare_cable(feparm);
if (!res)
+ {
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ }
break;
}
case feTerrestrial:
}
res=prepare_terrestrial(feparm);
if (!res)
+ {
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ }
break;
}
}
if (!res) // prepare ok
{
m_tuneTimer->start(0,true);
- m_timeout->stop();
m_sec_sequence.current() = m_sec_sequence.begin();
if (m_state != stateTuning)
git.cweiske.de / enigma2.git / blobdiff