X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a8bb7bff847ea237903e6ac8e5ee0c22b10ef603..193333b7bc72ab13d4dee5750b31c3c33041c696:/lib/dvb/frontend.cpp diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 97d8553e..c04ac146 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -47,6 +47,11 @@ #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 @@ -99,8 +104,8 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto 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; @@ -108,11 +113,32 @@ void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescripto 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) @@ -144,7 +170,7 @@ void eDVBFrontendParametersTerrestrial::set(const TerrestrialDeliverySystemDescr 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) @@ -305,7 +331,7 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const 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 @@ -334,35 +360,44 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok) 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) @@ -431,15 +466,19 @@ int eDVBFrontend::closeFrontend() setVoltage(iDVBFrontend::voltageOff); if (m_sec) m_sec->setRotorMoving(false); - ::close(m_fd); - m_fd=-1; + 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; @@ -1263,11 +1302,12 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm) 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; @@ -1283,6 +1323,11 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm) 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 )