#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
+#ifdef FEC_9_10
+ #warning "FEC_9_10 already exist in dvb api ... it seems it is now ready for DVB-S2"
+#else
+ #define FEC_9_10 (fe_code_rate_t)(FEC_AUTO+1)
+#endif
#endif
#include <dvbsi++/satellite_delivery_system_descriptor.h>
{
if (!str)
return;
- len = strlen(str);
- if (len > MAX_DISEQC_LENGTH)
- len = MAX_DISEQC_LENGTH;
- memcpy(data, str, len);
+ len=0;
+ int slen = strlen(str);
+ if (slen % 2)
+ {
+ eDebug("invalid diseqc command string length (not 2 byte aligned)");
+ return;
+ }
+ if (slen > MAX_DISEQC_LENGTH*2)
+ {
+ eDebug("invalid diseqc command string length (string is to long)");
+ return;
+ }
+ unsigned char val=0;
+ for (int i=0; i < slen; ++i)
+ {
+ unsigned char c = str[i];
+ switch(c)
+ {
+ case '0' ... '9': c-=48; break;
+ case 'a' ... 'f': c-=87; break;
+ case 'A' ... 'F': c-=55; break;
+ default:
+ eDebug("invalid character in hex string..ignore complete diseqc command !");
+ return;
+ }
+ if ( i % 2 )
+ {
+ val |= c;
+ data[i/2] = val;
+ }
+ else
+ val = c << 4;
+ }
+ len = slen/2;
}
void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
symbol_rate = descriptor.getSymbolRate() * 100;
polarisation = descriptor.getPolarization();
fec = descriptor.getFecInner();
- if ( fec == 0xF )
- fec = FEC::fNone;
+ if ( fec != FEC::fNone && fec > FEC::f9_10 )
+ fec = FEC::fAuto;
inversion = Inversion::Unknown;
orbital_position = ((descriptor.getOrbitalPosition() >> 12) & 0xF) * 1000;
orbital_position += ((descriptor.getOrbitalPosition() >> 8) & 0xF) * 100;
orbital_position += ((descriptor.getOrbitalPosition()) & 0xF);
if (orbital_position && (!descriptor.getWestEastFlag()))
orbital_position = 3600 - orbital_position;
- eDebug("SAT freq %d, %s, pos %d, sr %d, fec %d",
- frequency,
- polarisation ? "hor" : "vert",
- orbital_position,
- symbol_rate, fec);
+ system = descriptor.getModulationSystem();
+ modulation = descriptor.getModulation();
+ if (system == System::DVB_S && modulation == Modulation::M8PSK)
+ {
+ eDebug("satellite_delivery_descriptor non valid modulation type.. force QPSK");
+ modulation=QPSK;
+ }
+ roll_off = descriptor.getRollOff();
+ if (system == System::DVB_S2)
+ {
+ eDebug("SAT DVB-S2 freq %d, %s, pos %d, sr %d, fec %d, modulation %d, roll_off %d",
+ frequency,
+ polarisation ? "hor" : "vert",
+ orbital_position,
+ symbol_rate, fec,
+ modulation,
+ roll_off);
+ }
+ else
+ {
+ eDebug("SAT DVB-S freq %d, %s, pos %d, sr %d, fec %d",
+ frequency,
+ polarisation ? "hor" : "vert",
+ orbital_position,
+ symbol_rate, fec);
+ }
}
void eDVBFrontendParametersCable::set(const CableDeliverySystemDescriptor &descriptor)
if (code_rate_LP > 4)
code_rate_LP = FEC::fAuto;
transmission_mode = descriptor.getTransmissionMode();
- if (transmission_mode > 2)
+ if (transmission_mode > 1) // TM4k forced to auto
transmission_mode = TransmissionMode::TMAuto;
guard_interval = descriptor.getGuardInterval();
if (guard_interval > 3)
return 0;
}
-RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p)
+RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune)
{
sat = p;
+ sat.no_rotor_command_on_tune = no_rotor_command_on_tune;
m_type = iDVBFrontend::feSatellite;
return 0;
}
return 0;
}
case iDVBFrontend::feCable:
+ hash = 0xFFFF0000;
+ return 0;
case iDVBFrontend::feTerrestrial:
+ hash = 0xEEEE0000;
+ return 0;
default:
return -1;
}
DEFINE_REF(eDVBFrontend);
eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok)
- :m_type(-1), m_fe(fe), m_fd(-1), m_timeout(0), m_tuneTimer(0)
+ :m_type(-1), m_fe(fe), m_fd(-1), m_sn(0), m_timeout(0), m_tuneTimer(0)
#if HAVE_DVB_API_VERSION < 3
,m_secfd(-1)
#endif
int eDVBFrontend::openFrontend()
{
- if (m_fd >= 0)
+ if (m_sn)
return -1; // already opened
m_state=0;
m_tuning=0;
#if HAVE_DVB_API_VERSION < 3
- m_secfd = ::open(m_sec_filename, O_RDWR);
if (m_secfd < 0)
{
- eWarning("failed! (%s) %m", m_sec_filename);
- return -1;
+ m_secfd = ::open(m_sec_filename, O_RDWR);
+ if (m_secfd < 0)
+ {
+ eWarning("failed! (%s) %m", m_sec_filename);
+ return -1;
+ }
}
+ else
+ eWarning("sec %d already opened", m_fe);
FrontendInfo fe_info;
#else
dvb_frontend_info fe_info;
#endif
eDebug("opening frontend %d", m_fe);
- m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK);
if (m_fd < 0)
{
- eWarning("failed! (%s) %m", m_filename);
+ m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK);
+ if (m_fd < 0)
+ {
+ eWarning("failed! (%s) %m", m_filename);
#if HAVE_DVB_API_VERSION < 3
- ::close(m_secfd);
- m_secfd=-1;
+ ::close(m_secfd);
+ m_secfd=-1;
#endif
- return -1;
+ return -1;
+ }
}
-
+ else
+ eWarning("frontend %d already opened", m_fe);
if (m_type == -1)
{
if (::ioctl(m_fd, FE_GET_INFO, &fe_info) < 0)
if (m_fd >= 0)
{
eDebug("close frontend %d", m_fe);
+ m_tuneTimer->stop();
setTone(iDVBFrontend::toneOff);
setVoltage(iDVBFrontend::voltageOff);
- ::close(m_fd);
- m_fd=-1;
+ if (m_sec)
+ m_sec->setRotorMoving(false);
+ if (!::close(m_fd))
+ m_fd=-1;
+ else
+ eWarning("couldnt close frontend %d", m_fe);
m_data[0] = m_data[1] = m_data[2] = -1;
}
#if HAVE_DVB_API_VERSION < 3
if (m_secfd >= 0)
{
- ::close(m_secfd);
- m_secfd=-1;
+ if (!::close(m_secfd))
+ m_secfd=-1;
+ else
+ eWarning("couldnt close sec %d", m_fe);
}
#endif
delete m_sn;
case QAM_16:
tmp = "QAM_16";
break;
+ case QAM_64:
+ tmp = "QAM_64";
+ break;
default:
case QAM_AUTO:
tmp = "QAM_AUTO";
PutToDict(dict, "guard_interval", tmp);
switch (parm_u_ofdm_hierarchy_information)
{
+ case HIERARCHY_NONE:
+ tmp = "HIERARCHY_NONE";
+ break;
case HIERARCHY_1:
tmp = "HIERARCHY_1";
break;
switch (feparm.fec)
{
default:
- case eDVBFrontendParametersSatellite::FEC::fNone:
- eDebug("no fec set.. assume auto");
+ eDebug("no valid fec set.. assume auto");
case eDVBFrontendParametersSatellite::FEC::fAuto:
parm_u_qpsk_fec_inner = FEC_AUTO;
break;
+ case eDVBFrontendParametersSatellite::FEC::fNone:
+ parm_u_qpsk_fec_inner = FEC_NONE;
case eDVBFrontendParametersSatellite::FEC::f1_2:
parm_u_qpsk_fec_inner = FEC_1_2;
break;
case eDVBFrontendParametersSatellite::FEC::f7_8:
parm_u_qpsk_fec_inner = FEC_7_8;
break;
+#if HAVE_DVB_API_VERSION >= 3
+ case eDVBFrontendParametersSatellite::FEC::f9_10:
+ parm_u_qpsk_fec_inner = FEC_9_10;
+ break;
+#endif
}
// FIXME !!! get frequency range from tuner
if ( parm_frequency < 900000 || parm_frequency > 2200000 )
case eDVBFrontendParametersTerrestrial::Modulation::QAM16:
parm_u_ofdm_constellation = QAM_16;
break;
+ case eDVBFrontendParametersTerrestrial::Modulation::QAM64:
+ parm_u_ofdm_constellation = QAM_64;
+ break;
default:
case eDVBFrontendParametersTerrestrial::Modulation::Auto:
parm_u_ofdm_constellation = QAM_AUTO;
}
switch (feparm.hierarchy)
{
+ case eDVBFrontendParametersTerrestrial::Hierarchy::HNone:
+ parm_u_ofdm_hierarchy_information = HIERARCHY_NONE;
+ break;
case eDVBFrontendParametersTerrestrial::Hierarchy::H1:
parm_u_ofdm_hierarchy_information = HIERARCHY_1;
break;
parm_u_ofdm_hierarchy_information = HIERARCHY_AUTO;
break;
}
+ switch (feparm.inversion)
+ {
+ case eDVBFrontendParametersTerrestrial::Inversion::On:
+ parm_inversion = INVERSION_ON;
+ break;
+ case eDVBFrontendParametersTerrestrial::Inversion::Off:
+ parm_inversion = INVERSION_OFF;
+ break;
+ default:
+ case eDVBFrontendParametersTerrestrial::Inversion::Unknown:
+ parm_inversion = INVERSION_AUTO;
+ break;
+ }
return 0;
}
return -EINVAL;
}
res=prepare_sat(feparm);
+ m_sec->setRotorMoving(false);
break;
}
case feCable: