setRotorPosNum(1); // stored pos 1
}
-static void checkLinkedParams(int direction, int &linked_ptr, int &ret, const eDVBFrontendParametersSatellite &sat, int csw, int ucsw, int toneburst, bool diseqc, bool rotor, int RotorPos)
+static void checkLinkedParams(int direction, long &linked_ptr, int &ret, const eDVBFrontendParametersSatellite &sat, int csw, int ucsw, int toneburst, bool diseqc, bool rotor, int RotorPos)
{
eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*) linked_ptr;
if (linked_fe->m_inuse)
{
- int ocsw = -1,
+ long ocsw = -1,
oucsw = -1,
oToneburst = -1;
linked_fe->m_frontend->getData(eDVBFrontend::CSW, ocsw);
// else
// eDebug("OK .. can tune this transponder with linked tuner in use :)");
}
- linked_fe->m_frontend->getData(direction, linked_ptr);
+ linked_fe->m_frontend->getData(direction, (long&)linked_ptr);
}
int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id )
lnb_param.m_satellites.find(sat.orbital_position);
if ( sit != lnb_param.m_satellites.end())
{
- int band=0,
+ long band=0,
linked_prev_ptr=-1,
linked_next_ptr=-1,
satpos_depends_ptr=-1,
{
int begin = turn_speed >> 16; // high word is start time
int end = turn_speed&0xFFFF; // low word is end time
- time_t now_time = eDVBLocalTimeHandler::getInstance()->nowTime();
+ time_t now_time = ::time(0);
tm nowTime;
localtime_r(&now_time, &nowTime);
int now = (nowTime.tm_hour + 1) * 60 + nowTime.tm_min + 1;
#define VOLTAGE(x) (lnb_param.m_increased_voltage ? iDVBFrontend::voltage##x##_5 : iDVBFrontend::voltage##x)
-RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id)
+RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id, unsigned int tunetimeout)
{
for (int idx=0; idx <= m_lnbidx; ++idx )
{
{
eDVBSatelliteSwitchParameters &sw_param = sit->second;
bool doSetFrontend = true;
- bool doSetVoltageToneFrontend = m_not_linked_slot_mask & slot_id;
+ bool doSetVoltageToneFrontend = true;
bool allowDiseqc1_2 = true;
- int band=0,
+ long band=0,
voltage = iDVBFrontend::voltageOff,
tone = iDVBFrontend::toneOff,
csw = di_param.m_committed_cmd,
frontend.getData(eDVBFrontend::ROTOR_POS, curRotorPos);
frontend.getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satposDependPtr);
- if (satposDependPtr != -1 && !doSetVoltageToneFrontend)
- {
+ if (satposDependPtr != -1 && !(m_not_linked_slot_mask & slot_id))
allowDiseqc1_2 = false;
- doSetVoltageToneFrontend = true;
- }
if ( sat.frequency > lnb_param.m_lof_threshold )
band |= 1;
eDebugNoNewLine("0");
eDebug("");
#endif
-
if (doSetVoltageToneFrontend)
{
int RotorCmd=-1;
for ( int i = 0; i < loops;) // fill commands...
{
eDVBDiseqcCommand diseqc;
+ memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
diseqc.len = 4;
diseqc.data[0] = i ? 0xE1 : 0xE0;
diseqc.data[1] = 0x10;
}
}
- eDebug("RotorCmd %02x, lastRotorCmd %02x", RotorCmd, lastRotorCmd);
+ eDebug("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
{
eSecCommand::pair compare;
sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, m_params[DELAY_BETWEEN_SWITCH_AND_MOTOR_CMD]) ); // wait 700ms when diseqc changed
eDVBDiseqcCommand diseqc;
+ memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
diseqc.len = 3;
diseqc.data[0] = 0xE0;
diseqc.data[1] = 0x31; // positioner
if ( rotor_param.m_inputpower_parameters.m_use )
{ // use measure rotor input power to detect rotor state
+ bool turn_fast = need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed);
eSecCommand::rotor cmd;
eSecCommand::pair compare;
compare.voltage = VOLTAGE(18);
sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) ); // check if rotor has started
sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) ); // timeout .. we assume now the rotor is already at the correct position
sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) ); // goto loop start
- sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, +9 ) ); // timeout .. we assume now the rotor is already at the correct position
+ sec_sequence.push_back( eSecCommand(eSecCommand::IF_NO_MORE_ROTOR_DISEQC_RETRYS_GOTO, turn_fast ? 9 : 8 ) ); // timeout .. we assume now the rotor is already at the correct position
sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -8) ); // goto loop start
////////////////////
- if (need_turn_fast(rotor_param.m_inputpower_parameters.m_turning_speed))
+ if (turn_fast)
sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, VOLTAGE(18)) );
sec_sequence.push_back( eSecCommand(eSecCommand::SET_TIMEOUT, m_params[MOTOR_RUNNING_TIMEOUT]*20) ); // 2 minutes running timeout
// rotor running loop
sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50) ); // wait 50msec
sec_sequence.push_back( eSecCommand(eSecCommand::MEASURE_RUNNING_INPUTPOWER) );
cmd.direction=0; // check for stopped rotor
- cmd.steps=+4;
+ cmd.steps=+3;
sec_sequence.push_back( eSecCommand(eSecCommand::IF_INPUTPOWER_DELTA_GOTO, cmd ) );
- sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +3 ) ); // timeout ? this should never happen
+ sec_sequence.push_back( eSecCommand(eSecCommand::IF_TIMEOUT_GOTO, +2 ) ); // timeout ? this should never happen
sec_sequence.push_back( eSecCommand(eSecCommand::GOTO, -4) ); // running loop start
/////////////////////
sec_sequence.push_back( eSecCommand(eSecCommand::UPDATE_CURRENT_ROTORPARAMS) );
if (doSetFrontend)
{
- sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
+ sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) );
sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
}
frontend.setSecSequence(sec_sequence);
//reset some tuner configuration
for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
{
+ long tmp;
+ if (!strcmp(it->m_frontend->getDescription(), "BCM4501 (internal)") && !it->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp) && tmp != -1)
+ {
+ FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
+ if (!f || fwrite("B", 1, 1, f) != 1)
+ eDebug("set /proc/stb/tsmux/lnb_b_input to B failed!! (%m)");
+ else
+ {
+ eDebug("set /proc/stb/tsmux/lnb_b_input to B OK");
+ fclose(f);
+ }
+ }
it->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, -1);
it->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, -1);
it->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, -1);
eDebug("no more LNB free... cnt is %d", m_lnbidx);
return -ENOSPC;
}
- eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx-1);
+ eSecDebug("eDVBSatelliteEquipmentControl::addLNB(%d)", m_lnbidx);
return 0;
}
}
};
-PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int tu2)
+RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
{
- ePyObject ret;
-
+ eSecDebug("eDVBSatelliteEquipmentControl::setTunerLinked(%d, %d)", tu1, tu2);
if (tu1 != tu2)
{
eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
- int cnt=0;
- for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+
+ for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
{
- if (cnt == tu1)
+ if (it->m_frontend->getSlotID() == tu1)
p1 = *it;
- else if (cnt == tu2)
+ else if (it->m_frontend->getSlotID() == tu2)
p2 = *it;
}
-
if (p1 && p2)
{
- // check for linked tuners
-
- do
+ p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2);
+ p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1);
+ if (!strcmp(p1->m_frontend->getDescription(), p2->m_frontend->getDescription()) && !strcmp(p1->m_frontend->getDescription(), "BCM4501 (internal)"))
{
- int tmp;
- p1->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
- if (tmp != -1)
- p1 = (eDVBRegisteredFrontend*)tmp;
+ FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
+ if (!f || fwrite("A", 1, 1, f) != 1)
+ eDebug("set /proc/stb/tsmux/lnb_b_input to A failed!! (%m)");
else
- break;
- }
- while (true);
-
- do
- {
- int tmp;
- p2->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
- if (tmp != -1)
- p2 = (eDVBRegisteredFrontend*)tmp;
- else
- break;
- }
- while (true);
-
- if (p1 != p2)
- {
- int tmp1=-1;
- int tmp2=-1;
- // check for rotor dependency
- p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1);
- if (tmp1 != -1)
- p1 = (eDVBRegisteredFrontend*)tmp1;
- p2->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp2);
- if (tmp2 != -1)
- p2 = (eDVBRegisteredFrontend*)tmp2;
- if (p1 != p2)
{
- int tu1_mask = 1 << p1->m_frontend->getSlotID(),
- tu2_mask = 1 << p2->m_frontend->getSlotID();
- std::set<sat_compare> tu1sats, tu2sats;
- std::list<sat_compare> tu1difference, tu2difference;
- std::insert_iterator<std::list<sat_compare> > insert1(tu1difference, tu1difference.begin()),
- insert2(tu2difference, tu2difference.begin());
- for (int idx=0; idx <= m_lnbidx; ++idx )
- {
- eDVBSatelliteLNBParameters &lnb_param = m_lnbs[idx];
- for (std::map<int, eDVBSatelliteSwitchParameters>::iterator sit(lnb_param.m_satellites.begin());
- sit != lnb_param.m_satellites.end(); ++sit)
- {
- if ( lnb_param.slot_mask & tu1_mask )
- tu1sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi));
- if ( lnb_param.slot_mask & tu2_mask )
- tu2sats.insert(sat_compare(sit->first, lnb_param.m_lof_lo, lnb_param.m_lof_hi));
- }
- }
- std::set_difference(tu1sats.begin(), tu1sats.end(),
- tu2sats.begin(), tu2sats.end(),
- insert1);
- std::set_difference(tu2sats.begin(), tu2sats.end(),
- tu1sats.begin(), tu1sats.end(),
- insert2);
- if (!tu1sats.empty() || !tu2sats.empty())
- {
- int idx=0;
- ret = PyList_New(2+tu1difference.size()+tu2difference.size());
-
- PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu1difference.size()));
- for(std::list<sat_compare>::iterator it(tu1difference.begin()); it != tu1difference.end(); ++it)
- PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos));
-
- PyList_SET_ITEM(ret, idx++, PyInt_FromLong(tu2difference.size()));
- for(std::list<sat_compare>::iterator it(tu2difference.begin()); it != tu2difference.end(); ++it)
- PyList_SET_ITEM(ret, idx++, PyInt_FromLong(it->orb_pos));
- }
+ eDebug("set /proc/stb/tsmux/lnb_b_input to A OK");
+ fclose(f);
}
}
- }
- }
- if (!ret)
- {
- ret = PyList_New(2);
- PyList_SET_ITEM(ret, 0, PyInt_FromLong(0));
- PyList_SET_ITEM(ret, 1, PyInt_FromLong(0));
- }
- return ret;
-}
-
-RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
-{
- eSecDebug("eDVBSatelliteEquipmentControl::setTunerLinked(%d, %d)", tu1, tu2);
- if (tu1 != tu2)
- {
- eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
-
- int cnt=0;
- for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
- {
- if (cnt == tu1)
- p1 = *it;
- else if (cnt == tu2)
- p2 = *it;
- }
- if (p1 && p2)
- {
- p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)p2);
- p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)p1);
return 0;
}
}
eDVBRegisteredFrontend *p1=NULL, *p2=NULL;
- int cnt=0;
- for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it, ++cnt)
+ for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
{
- if (cnt == tu1)
+ if (it->m_frontend->getSlotID() == tu1)
p1 = *it;
- else if (cnt == tu2)
+ else if (it->m_frontend->getSlotID() == tu2)
p2 = *it;
}
if (p1 && p2)
{
- p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p2);
- p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (int)p1);
+ p1->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p2);
+ p2->m_frontend->setData(eDVBFrontend::SATPOS_DEPENDS_PTR, (long)p1);
return 0;
}
return -1;
git.cweiske.de / enigma2.git / blobdiff