if (m_sn)
return -1; // already opened
- m_state=0;
+ m_state=stateIdle;
m_tuning=0;
#if HAVE_DVB_API_VERSION < 3
setTone(iDVBFrontend::toneOff);
setVoltage(iDVBFrontend::voltageOff);
- m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read);
+ m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read, false);
CONNECT(m_sn->activated, eDVBFrontend::feEvent);
return 0;
}
-int eDVBFrontend::closeFrontend()
+int eDVBFrontend::closeFrontend(bool force)
{
- eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)m_data[LINKED_NEXT_PTR];
- while (linked_fe != (eDVBRegisteredFrontend*)-1)
+ if (!force && m_data[CUR_VOLTAGE] != -1 && m_data[CUR_VOLTAGE] != iDVBFrontend::voltageOff)
{
- if (linked_fe->m_inuse)
+ long tmp = m_data[LINKED_NEXT_PTR];
+ while (tmp != -1)
{
- eDebug("dont close frontend %d until the linked frontend %d in slot %d is still in use",
- m_dvbid, linked_fe->m_frontend->getDVBID(), linked_fe->m_frontend->getSlotID());
- return -1;
+ eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)tmp;
+ if (linked_fe->m_inuse)
+ {
+ eDebug("dont close frontend %d until the linked frontend %d in slot %d is still in use",
+ m_dvbid, linked_fe->m_frontend->getDVBID(), linked_fe->m_frontend->getSlotID());
+ return -1;
+ }
+ linked_fe->m_frontend->getData(LINKED_NEXT_PTR, tmp);
}
- linked_fe->m_frontend->getData(LINKED_NEXT_PTR, (long&)linked_fe);
}
if (m_fd >= 0)
{
#endif
delete m_sn;
m_sn=0;
+ m_state = stateClosed;
return 0;
}
eDVBFrontend::~eDVBFrontend()
{
+ m_data[LINKED_PREV_PTR] = m_data[LINKED_NEXT_PTR] = -1;
closeFrontend();
delete m_timeout;
delete m_tuneTimer;
state = stateTuning;
else
{
+ eDVBFrontend *sec_fe = this;
+ long tmp = m_data[LINKED_PREV_PTR];
+
eDebug("stateLostLock");
state = stateLostLock;
- m_data[CSW] = m_data[UCSW] = m_data[TONEBURST] = -1; // reset diseqc
+
+ while (tmp != -1)
+ {
+ eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)tmp;
+ sec_fe = linked_fe->m_frontend;
+ sec_fe->getData(LINKED_NEXT_PTR, tmp);
+ }
+ sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = -1; // reset diseqc
}
}
if (m_state != state)
void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe)
{
long freq_offset=0;
- long csw=0;
const char *tmp=0;
- fe->getData(eDVBFrontend::CSW, csw);
fe->getData(eDVBFrontend::FREQ_OFFSET, freq_offset);
int frequency = parm_frequency + freq_offset;
PutToDict(dict, "frequency", frequency);
if (dest && PyDict_Check(dest))
{
const char *tmp=0;
- PutToDict(dest, "tuner_number", m_dvbid);
+ PutToDict(dest, "tuner_number", m_slotid);
switch(m_type)
{
case feSatellite:
FILE *f=fopen(proc_name, "r");
if (f)
{
- if (fscanf(f, "%08x", &power) != 1)
+ if (fscanf(f, "%d", &power) != 1)
eDebug("read %s failed!! (%m)", proc_name);
else
eDebug("%s is %d\n", proc_name, power);
return true;
}
-void eDVBFrontend::setRotorData(int pos, int cmd)
+void eDVBFrontend::tuneLoop() // called by m_tuneTimer
{
- m_data[ROTOR_CMD] = cmd;
- m_data[ROTOR_POS] = pos;
- if ( m_data[SATPOS_DEPENDS_PTR] != -1 )
- {
- eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) m_data[SATPOS_DEPENDS_PTR];
- satpos_depends_to_fe->m_frontend->m_data[ROTOR_CMD] = cmd;
- satpos_depends_to_fe->m_frontend->m_data[ROTOR_POS] = pos;
- }
- else
- {
- eDVBRegisteredFrontend *next = (eDVBRegisteredFrontend *)m_data[LINKED_NEXT_PTR];
- while ( (long)next != -1 )
- {
- next->m_frontend->m_data[ROTOR_CMD] = cmd;
- next->m_frontend->m_data[ROTOR_POS] = pos;
- next = (eDVBRegisteredFrontend *)next->m_frontend->m_data[LINKED_NEXT_PTR];
- }
- eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)m_data[LINKED_PREV_PTR];
- while ( (long)prev != -1 )
- {
- prev->m_frontend->m_data[ROTOR_CMD] = cmd;
- prev->m_frontend->m_data[ROTOR_POS] = pos;
- prev = (eDVBRegisteredFrontend *)prev->m_frontend->m_data[LINKED_PREV_PTR];
+ int delay=0;
+ eDVBFrontend *sec_fe = this;
+ eDVBRegisteredFrontend *regFE = 0;
+ long tmp = m_data[LINKED_PREV_PTR];
+ while ( tmp != -1 )
+ {
+ eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)tmp;
+ sec_fe = prev->m_frontend;
+ tmp = prev->m_frontend->m_data[LINKED_PREV_PTR];
+ if (tmp == -1 && sec_fe != this && !prev->m_inuse) {
+ int state = sec_fe->m_state;
+ if (state != eDVBFrontend::stateIdle && state != stateClosed)
+ {
+ sec_fe->closeFrontend(true);
+ state = sec_fe->m_state;
+ }
+ if (state == eDVBFrontend::stateClosed)
+ {
+ regFE = prev;
+ prev->inc_use();
+ }
}
}
-}
-void eDVBFrontend::tuneLoop() // called by m_tuneTimer
-{
- int delay=0;
if ( m_sec_sequence && m_sec_sequence.current() != m_sec_sequence.end() )
{
+ long *sec_fe_data = sec_fe->m_data;
// eDebug("tuneLoop %d\n", m_sec_sequence.current()->cmd);
switch (m_sec_sequence.current()->cmd)
{
{
int voltage = m_sec_sequence.current()++->voltage;
eDebug("[SEC] setVoltage %d", voltage);
- setVoltage(voltage);
+ sec_fe->setVoltage(voltage);
break;
}
case eSecCommand::IF_VOLTAGE_GOTO:
{
eSecCommand::pair &compare = m_sec_sequence.current()->compare;
- if ( compare.voltage == m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )
+ if ( compare.voltage == sec_fe_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )
break;
++m_sec_sequence.current();
break;
case eSecCommand::IF_NOT_VOLTAGE_GOTO:
{
eSecCommand::pair &compare = m_sec_sequence.current()->compare;
- if ( compare.voltage != m_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )
+ if ( compare.voltage != sec_fe_data[CUR_VOLTAGE] && setSecSequencePos(compare.steps) )
break;
++m_sec_sequence.current();
break;
case eSecCommand::IF_TONE_GOTO:
{
eSecCommand::pair &compare = m_sec_sequence.current()->compare;
- if ( compare.tone == m_data[CUR_TONE] && setSecSequencePos(compare.steps) )
+ if ( compare.tone == sec_fe_data[CUR_TONE] && setSecSequencePos(compare.steps) )
break;
++m_sec_sequence.current();
break;
case eSecCommand::IF_NOT_TONE_GOTO:
{
eSecCommand::pair &compare = m_sec_sequence.current()->compare;
- if ( compare.tone != m_data[CUR_TONE] && setSecSequencePos(compare.steps) )
+ if ( compare.tone != sec_fe_data[CUR_TONE] && setSecSequencePos(compare.steps) )
break;
++m_sec_sequence.current();
break;
}
case eSecCommand::SET_TONE:
eDebug("[SEC] setTone %d", m_sec_sequence.current()->tone);
- setTone(m_sec_sequence.current()++->tone);
+ sec_fe->setTone(m_sec_sequence.current()++->tone);
break;
case eSecCommand::SEND_DISEQC:
- sendDiseqc(m_sec_sequence.current()->diseqc);
+ sec_fe->sendDiseqc(m_sec_sequence.current()->diseqc);
eDebugNoNewLine("[SEC] sendDiseqc: ");
for (int i=0; i < m_sec_sequence.current()->diseqc.len; ++i)
eDebugNoNewLine("%02x", m_sec_sequence.current()->diseqc.data[i]);
break;
case eSecCommand::SEND_TONEBURST:
eDebug("[SEC] sendToneburst: %d", m_sec_sequence.current()->toneburst);
- sendToneburst(m_sec_sequence.current()++->toneburst);
+ sec_fe->sendToneburst(m_sec_sequence.current()++->toneburst);
break;
case eSecCommand::SET_FRONTEND:
eDebug("[SEC] setFrontend");
int idx = m_sec_sequence.current()++->val;
if ( idx == 0 || idx == 1 )
{
- m_idleInputpower[idx] = readInputpower();
+ m_idleInputpower[idx] = sec_fe->readInputpower();
eDebug("[SEC] idleInputpower[%d] is %d", idx, m_idleInputpower[idx]);
}
else
int idx = compare.val;
if ( idx == 0 || idx == 1 )
{
- int idle = readInputpower();
+ int idle = sec_fe->readInputpower();
int diff = abs(idle-m_idleInputpower[idx]);
if ( diff > 0)
{
break;
}
case eSecCommand::MEASURE_RUNNING_INPUTPOWER:
- m_runningInputpower = readInputpower();
+ m_runningInputpower = sec_fe->readInputpower();
eDebug("[SEC] runningInputpower is %d", m_runningInputpower);
++m_sec_sequence.current();
break;
case eSecCommand::IF_INPUTPOWER_DELTA_GOTO:
{
- int idleInputpower = m_idleInputpower[ (m_data[CUR_VOLTAGE]&1) ? 0 : 1];
+ int idleInputpower = m_idleInputpower[ (sec_fe_data[CUR_VOLTAGE]&1) ? 0 : 1];
eSecCommand::rotor &cmd = m_sec_sequence.current()->measure;
const char *txt = cmd.direction ? "running" : "stopped";
eDebug("[SEC] waiting for rotor %s %d, idle %d, delta %d",
break;
}
case eSecCommand::IF_ROTORPOS_VALID_GOTO:
- if (m_data[ROTOR_CMD] != -1 && m_data[ROTOR_POS] != -1)
+ if (sec_fe_data[ROTOR_CMD] != -1 && sec_fe_data[ROTOR_POS] != -1)
setSecSequencePos(m_sec_sequence.current()->steps);
else
++m_sec_sequence.current();
break;
case eSecCommand::INVALIDATE_CURRENT_ROTORPARMS:
eDebug("[SEC] invalidate current rotorparams");
- setRotorData(-1,-1);
+ sec_fe_data[ROTOR_CMD] = -1;
+ sec_fe_data[ROTOR_POS] = -1;
++m_sec_sequence.current();
break;
case eSecCommand::UPDATE_CURRENT_ROTORPARAMS:
- setRotorData(m_data[NEW_ROTOR_POS], m_data[NEW_ROTOR_CMD]);
- eDebug("[SEC] update current rotorparams %d %04lx %ld", m_timeoutCount, m_data[ROTOR_CMD], m_data[ROTOR_POS]);
+ sec_fe_data[ROTOR_CMD] = sec_fe_data[NEW_ROTOR_CMD];
+ sec_fe_data[ROTOR_POS] = sec_fe_data[NEW_ROTOR_POS];
+ eDebug("[SEC] update current rotorparams %d %04lx %ld", m_timeoutCount, sec_fe_data[ROTOR_CMD], sec_fe_data[ROTOR_POS]);
++m_sec_sequence.current();
break;
case eSecCommand::SET_ROTOR_DISEQC_RETRYS:
case eSecCommand::SET_POWER_LIMITING_MODE:
{
char proc_name[64];
- sprintf(proc_name, "/proc/stb/frontend/%d/static_current_limiting", m_dvbid);
+ sprintf(proc_name, "/proc/stb/frontend/%d/static_current_limiting", sec_fe->m_dvbid);
FILE *f=fopen(proc_name, "w");
if (f) // new interface exist?
{
eDebug("[SEC] set %s current limiting", slimiting ? "static" : "dynamic");
fclose(f);
}
- else if (m_need_rotor_workaround)
+ else if (sec_fe->m_need_rotor_workaround)
{
char dev[16];
-
+ int slotid = sec_fe->m_slotid;
// FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
- if (m_slotid < 2)
- sprintf(dev, "/dev/i2c/%d", m_slotid);
- else if (m_slotid == 2)
+ if (slotid < 2)
+ sprintf(dev, "/dev/i2c/%d", slotid);
+ else if (slotid == 2)
sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2
- else if (m_slotid == 3)
+ else if (slotid == 3)
sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4
int fd = ::open(dev, O_RDWR);
}
m_tuneTimer->start(delay,true);
}
+ if (regFE)
+ regFE->dec_use();
}
void eDVBFrontend::setFrontend()
switch (voltage)
{
case voltageOff:
- for (int i=0; i < 3; ++i) // reset diseqc
- m_data[i]=-1;
+ m_data[CSW]=m_data[UCSW]=m_data[TONEBURST]=-1; // reset diseqc
vlt = SEC_VOLTAGE_OFF;
break;
case voltage13_5:
git.cweiske.de / enigma2.git / blobdiff