#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_S2_1_2 (fe_code_rate_t)(FEC_AUTO+1)
- #define FEC_S2_2_3 (fe_code_rate_t)(FEC_S2_1_2+1)
- #define FEC_S2_3_4 (fe_code_rate_t)(FEC_S2_2_3+1)
- #define FEC_S2_5_6 (fe_code_rate_t)(FEC_S2_3_4+1)
- #define FEC_S2_7_8 (fe_code_rate_t)(FEC_S2_5_6+1)
- #define FEC_S2_8_9 (fe_code_rate_t)(FEC_S2_7_8+1)
- #define FEC_S2_3_5 (fe_code_rate_t)(FEC_S2_8_9+1)
- #define FEC_S2_4_5 (fe_code_rate_t)(FEC_S2_3_5+1)
- #define FEC_S2_9_10 (fe_code_rate_t)(FEC_S2_4_5+1)
+ #define FEC_S2_QPSK_1_2 (fe_code_rate_t)(FEC_AUTO+1)
+ #define FEC_S2_QPSK_2_3 (fe_code_rate_t)(FEC_S2_QPSK_1_2+1)
+ #define FEC_S2_QPSK_3_4 (fe_code_rate_t)(FEC_S2_QPSK_2_3+1)
+ #define FEC_S2_QPSK_5_6 (fe_code_rate_t)(FEC_S2_QPSK_3_4+1)
+ #define FEC_S2_QPSK_7_8 (fe_code_rate_t)(FEC_S2_QPSK_5_6+1)
+ #define FEC_S2_QPSK_8_9 (fe_code_rate_t)(FEC_S2_QPSK_7_8+1)
+ #define FEC_S2_QPSK_3_5 (fe_code_rate_t)(FEC_S2_QPSK_8_9+1)
+ #define FEC_S2_QPSK_4_5 (fe_code_rate_t)(FEC_S2_QPSK_3_5+1)
+ #define FEC_S2_QPSK_9_10 (fe_code_rate_t)(FEC_S2_QPSK_4_5+1)
+ #define FEC_S2_8PSK_1_2 (fe_code_rate_t)(FEC_S2_QPSK_9_10+1)
+ #define FEC_S2_8PSK_2_3 (fe_code_rate_t)(FEC_S2_8PSK_1_2+1)
+ #define FEC_S2_8PSK_3_4 (fe_code_rate_t)(FEC_S2_8PSK_2_3+1)
+ #define FEC_S2_8PSK_5_6 (fe_code_rate_t)(FEC_S2_8PSK_3_4+1)
+ #define FEC_S2_8PSK_7_8 (fe_code_rate_t)(FEC_S2_8PSK_5_6+1)
+ #define FEC_S2_8PSK_8_9 (fe_code_rate_t)(FEC_S2_8PSK_7_8+1)
+ #define FEC_S2_8PSK_3_5 (fe_code_rate_t)(FEC_S2_8PSK_8_9+1)
+ #define FEC_S2_8PSK_4_5 (fe_code_rate_t)(FEC_S2_8PSK_3_5+1)
+ #define FEC_S2_8PSK_9_10 (fe_code_rate_t)(FEC_S2_8PSK_4_5+1)
#endif
#endif
diff = 1<<30; // big difference
return 0;
}
-
+
switch (type)
{
case iDVBFrontend::feSatellite:
eDVBFrontendParametersSatellite osat;
if (parm->getDVBS(osat))
return -2;
-
+
if (sat.orbital_position != osat.orbital_position)
diff = 1<<29;
else if (sat.polarisation != osat.polarisation)
eDVBFrontendParametersCable ocable;
if (parm->getDVBC(ocable))
return -2;
-
+
if (cable.modulation != ocable.modulation && cable.modulation != eDVBFrontendParametersCable::Modulation::Auto && ocable.modulation != eDVBFrontendParametersCable::Modulation::Auto)
diff = 1 << 29;
else if (cable.inversion != ocable.inversion && cable.inversion != eDVBFrontendParametersCable::Inversion::Unknown && ocable.inversion != eDVBFrontendParametersCable::Inversion::Unknown)
diff = abs(cable.frequency - ocable.frequency);
diff += abs(cable.symbol_rate - ocable.symbol_rate);
}
-
+
return 0;
case iDVBFrontend::feTerrestrial:
eDVBFrontendParametersTerrestrial oterrestrial;
if (parm->getDVBT(oterrestrial))
return -2;
-
+
diff = abs(terrestrial.frequency - oterrestrial.frequency);
return 0;
int res;
int state;
res = ::ioctl(m_fd, FE_GET_EVENT, &event);
-
+
if (res && (errno == EAGAIN))
break;
eWarning("FE_GET_EVENT failed! %m");
return;
}
-
+
if (w < 0)
continue;
tmp = "FEC_AUTO";
break;
#if HAVE_DVB_API_VERSION >=3
- case FEC_S2_1_2:
+ case FEC_S2_8PSK_1_2:
+ case FEC_S2_QPSK_1_2:
tmp = "FEC_1_2";
break;
- case FEC_S2_2_3:
+ case FEC_S2_8PSK_2_3:
+ case FEC_S2_QPSK_2_3:
tmp = "FEC_2_3";
break;
- case FEC_S2_3_4:
+ case FEC_S2_8PSK_3_4:
+ case FEC_S2_QPSK_3_4:
tmp = "FEC_3_4";
break;
- case FEC_S2_5_6:
+ case FEC_S2_8PSK_5_6:
+ case FEC_S2_QPSK_5_6:
tmp = "FEC_5_6";
break;
- case FEC_S2_7_8:
+ case FEC_S2_8PSK_7_8:
+ case FEC_S2_QPSK_7_8:
tmp = "FEC_7_8";
break;
- case FEC_S2_8_9:
+ case FEC_S2_8PSK_8_9:
+ case FEC_S2_QPSK_8_9:
tmp = "FEC_8_9";
break;
- case FEC_S2_3_5:
+ case FEC_S2_8PSK_3_5:
+ case FEC_S2_QPSK_3_5:
tmp = "FEC_3_5";
break;
- case FEC_S2_4_5:
+ case FEC_S2_8PSK_4_5:
+ case FEC_S2_QPSK_4_5:
tmp = "FEC_4_5";
break;
- case FEC_S2_9_10:
+ case FEC_S2_8PSK_9_10:
+ case FEC_S2_QPSK_9_10:
tmp = "FEC_9_10";
break;
#endif
}
+#if HAVE_DVB_API_VERSION >=3
+ PutToDict(dict, "modulation",
+ parm_u_qpsk_fec_inner > FEC_S2_QPSK_9_10 ? "8PSK": "QPSK" );
+#else
+ PutToDict(dict, "modulation", "QPSK" );
+#endif
PutToDict(dict, "fec_inner", tmp);
tmp = parm_u_qpsk_fec_inner > FEC_AUTO ?
"DVB-S2" : "DVB-S";
}
#if HAVE_DVB_API_VERSION >= 3
else // DVB_S2
+ {
switch (feparm.fec)
{
case eDVBFrontendParametersSatellite::FEC::f1_2:
- parm_u_qpsk_fec_inner = FEC_S2_1_2;
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_1_2;
break;
case eDVBFrontendParametersSatellite::FEC::f2_3:
- parm_u_qpsk_fec_inner = FEC_S2_2_3;
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_2_3;
break;
case eDVBFrontendParametersSatellite::FEC::f3_4:
- parm_u_qpsk_fec_inner = FEC_S2_3_4;
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_4;
break;
case eDVBFrontendParametersSatellite::FEC::f3_5:
- parm_u_qpsk_fec_inner = FEC_S2_3_5;
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_3_5;
break;
case eDVBFrontendParametersSatellite::FEC::f4_5:
- parm_u_qpsk_fec_inner = FEC_S2_4_5;
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_4_5;
break;
case eDVBFrontendParametersSatellite::FEC::f5_6:
- parm_u_qpsk_fec_inner = FEC_S2_5_6;
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_5_6;
break;
case eDVBFrontendParametersSatellite::FEC::f7_8:
- parm_u_qpsk_fec_inner = FEC_S2_7_8;
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_7_8;
break;
case eDVBFrontendParametersSatellite::FEC::f8_9:
- parm_u_qpsk_fec_inner = FEC_S2_8_9;
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_8_9;
break;
case eDVBFrontendParametersSatellite::FEC::f9_10:
- parm_u_qpsk_fec_inner = FEC_S2_9_10;
+ parm_u_qpsk_fec_inner = FEC_S2_QPSK_9_10;
break;
default:
eDebug("no valid fec for DVB-S2 set.. abort !!");
return -EINVAL;
}
+ if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation::M8PSK)
+ parm_u_qpsk_fec_inner = (fe_code_rate_t)((int)parm_u_qpsk_fec_inner+9);
+ // 8PSK fec driver values are decimal 9 bigger
+ }
#endif
// FIXME !!! get frequency range from tuner
if ( parm_frequency < 900000 || parm_frequency > 2200000 )