git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work on linked tuners ( can not test it :( )
[enigma2.git]
/
lib
/
dvb
/
frontend.cpp
diff --git
a/lib/dvb/frontend.cpp
b/lib/dvb/frontend.cpp
index 6910b19e17c58e3febc55b2e52fe56d063dc3a90..092549d0611d59a0e10ebbca7daffdd79975623e 100644
(file)
--- a/
lib/dvb/frontend.cpp
+++ b/
lib/dvb/frontend.cpp
@@
-288,7
+288,9
@@
eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): m_type(-1), m_fe(fe), m_c
m_tuneTimer = new eTimer(eApp);
CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop);
m_tuneTimer = new eTimer(eApp);
CONNECT(m_tuneTimer->timeout, eDVBFrontend::tuneLoop);
- memset(m_data, 0xFFFF, sizeof(m_data));
+ int entries = sizeof(m_data) / sizeof(int);
+ for (int i=0; i<entries; ++i)
+ m_data[i] = -1;
return;
}
return;
}
@@
-645,6
+647,7
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
}
case feCable:
{
}
case feCable:
{
+#if HAVE_DVB_API_VERSION >= 3
eDVBFrontendParametersCable feparm;
if (where.getDVBC(feparm))
return -EINVAL;
eDVBFrontendParametersCable feparm;
if (where.getDVBC(feparm))
return -EINVAL;
@@
-655,8
+658,6
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
parm.frequency = feparm.frequency * 1000;
parm.u.qam.symbol_rate = feparm.symbol_rate;
#endif
parm.frequency = feparm.frequency * 1000;
parm.u.qam.symbol_rate = feparm.symbol_rate;
#endif
-
-
fe_modulation_t mod;
switch (feparm.modulation)
{
fe_modulation_t mod;
switch (feparm.modulation)
{
@@
-684,7
+685,7
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
#else
parm.u.qam.modulation = mod;
#endif
#else
parm.u.qam.modulation = mod;
#endif
- switch (feparm.
modulat
ion)
+ switch (feparm.
invers
ion)
{
case eDVBFrontendParametersCable::Inversion::On:
#if HAVE_DVB_API_VERSION < 3
{
case eDVBFrontendParametersCable::Inversion::On:
#if HAVE_DVB_API_VERSION < 3
@@
-709,41
+710,51
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
parm.inversion =
#endif
INVERSION_AUTO;
parm.inversion =
#endif
INVERSION_AUTO;
- break;
+ break;
}
}
+
+ fe_code_rate_t fec_inner;
switch (feparm.fec_inner)
{
case eDVBFrontendParametersCable::FEC::fNone:
switch (feparm.fec_inner)
{
case eDVBFrontendParametersCable::FEC::fNone:
-
parm.u.qam.
fec_inner = FEC_NONE;
+ fec_inner = FEC_NONE;
break;
case eDVBFrontendParametersCable::FEC::f1_2:
break;
case eDVBFrontendParametersCable::FEC::f1_2:
-
parm.u.qam.
fec_inner = FEC_1_2;
+ fec_inner = FEC_1_2;
break;
case eDVBFrontendParametersCable::FEC::f2_3:
break;
case eDVBFrontendParametersCable::FEC::f2_3:
-
parm.u.qam.
fec_inner = FEC_2_3;
+ fec_inner = FEC_2_3;
break;
case eDVBFrontendParametersCable::FEC::f3_4:
break;
case eDVBFrontendParametersCable::FEC::f3_4:
-
parm.u.qam.
fec_inner = FEC_3_4;
+ fec_inner = FEC_3_4;
break;
case eDVBFrontendParametersCable::FEC::f4_5:
break;
case eDVBFrontendParametersCable::FEC::f4_5:
-
parm.u.qam.
fec_inner = FEC_4_5;
+ fec_inner = FEC_4_5;
break;
case eDVBFrontendParametersCable::FEC::f5_6:
break;
case eDVBFrontendParametersCable::FEC::f5_6:
-
parm.u.qam.
fec_inner = FEC_5_6;
+ fec_inner = FEC_5_6;
break;
case eDVBFrontendParametersCable::FEC::f6_7:
break;
case eDVBFrontendParametersCable::FEC::f6_7:
-
parm.u.qam.
fec_inner = FEC_6_7;
+ fec_inner = FEC_6_7;
break;
case eDVBFrontendParametersCable::FEC::f7_8:
break;
case eDVBFrontendParametersCable::FEC::f7_8:
-
parm.u.qam.
fec_inner = FEC_7_8;
+ fec_inner = FEC_7_8;
break;
case eDVBFrontendParametersCable::FEC::f8_9:
break;
case eDVBFrontendParametersCable::FEC::f8_9:
-
parm.u.qam.
fec_inner = FEC_8_9;
+ fec_inner = FEC_8_9;
break;
case eDVBFrontendParametersCable::FEC::fAuto:
break;
case eDVBFrontendParametersCable::FEC::fAuto:
-
parm.u.qam.
fec_inner = FEC_AUTO;
+ fec_inner = FEC_AUTO;
break;
}
break;
}
+#if HAVE_DVB_API_VERSION < 3
+ parm.u.qam.FEC_inner = fec_inner;
+#else
+ parm.u.qam.fec_inner = fec_inner;
+#endif
+#else
+ eFatal("Old API not fully supported");
+#endif // old api
break;
}
case feTerrestrial:
break;
}
case feTerrestrial:
@@
-986,7
+997,7
@@
RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list)
RESULT eDVBFrontend::getData(int num, int &data)
{
RESULT eDVBFrontend::getData(int num, int &data)
{
- if ( num <
7
)
+ if ( num <
(int)(sizeof(m_data)/sizeof(int))
)
{
data = m_data[num];
return 0;
{
data = m_data[num];
return 0;
@@
-996,7
+1007,7
@@
RESULT eDVBFrontend::getData(int num, int &data)
RESULT eDVBFrontend::setData(int num, int val)
{
RESULT eDVBFrontend::setData(int num, int val)
{
- if ( num <
7
)
+ if ( num <
(int)(sizeof(m_data)/sizeof(int))
)
{
m_data[num] = val;
return 0;
{
m_data[num] = val;
return 0;