DEFINE_REF(eDVBFrontend);
+int eDVBFrontend::PriorityOrder=0;
+
eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok)
- :m_type(-1), m_dvbid(fe), m_slotid(fe)
+ :m_enabled(false), m_type(-1), m_dvbid(fe), m_slotid(fe)
,m_fd(-1), m_need_rotor_workaround(false), m_sn(0), m_timeout(0), m_tuneTimer(0)
#if HAVE_DVB_API_VERSION < 3
,m_secfd(-1)
{
case FE_QPSK:
m_type = iDVBFrontend::feSatellite;
-#if HAVE_DVB_API_VERSION < 3
- if (m_secfd < 0)
- {
- m_secfd = ::open(m_sec_filename, O_RDWR);
- if (m_secfd < 0)
- {
- eWarning("failed! (%s) %m", m_sec_filename);
- ::close(m_fd);
- m_fd=-1;
- return -1;
- }
- }
- else
- eWarning("sec %d already opened", m_dvbid);
-#endif
break;
case FE_QAM:
m_type = iDVBFrontend::feCable;
eDebug("detected %s frontend", "satellite\0cable\0 terrestrial"+fe_info.type*10);
}
+#if HAVE_DVB_API_VERSION < 3
+ if (m_type == iDVBFrontend::feSatellite)
+ {
+ if (m_secfd < 0)
+ {
+ m_secfd = ::open(m_sec_filename, O_RDWR);
+ if (m_secfd < 0)
+ {
+ eWarning("failed! (%s) %m", m_sec_filename);
+ ::close(m_fd);
+ m_fd=-1;
+ return -1;
+ }
+ }
+ else
+ eWarning("sec %d already opened", m_dvbid);
+ }
+#endif
+
setTone(iDVBFrontend::toneOff);
setVoltage(iDVBFrontend::voltageOff);
eDebug("FE_READ_BER failed (%m)");
return ber;
}
- case signalPower:
+ case signalQuality:
{
uint16_t snr=0;
if (ioctl(m_fd, FE_READ_SNR, &snr) < 0 && errno != ERANGE)
eDebug("FE_READ_SNR failed (%m)");
return snr;
}
- case signalPowerdB: /* this will move into the driver */
+ case signalQualitydB: /* this will move into the driver */
{
uint16_t snr=0;
if (ioctl(m_fd, FE_READ_SNR, &snr) < 0 && errno != ERANGE)
{
float snr_in_db=(snr-39075)/1764.7;
return (int)(snr_in_db * 100.0);
- }
- else
- eDebug("no SNR dB caluclation for frontendtype %s yet", m_description);
+ } else if (!strcmp(m_description, "Alps BSBE2"))
+ {
+ return (int)((snr >> 7) * 10.0);
+ } /* else
+ eDebug("no SNR dB calculation for frontendtype %s yet", m_description); */
return 0x12345678;
}
- case signalQuality:
+ case signalPower:
{
uint16_t strength=0;
if (ioctl(m_fd, FE_READ_SIGNAL_STRENGTH, &strength) < 0 && errno != ERANGE)
PutToDict(dest, "tuner_locked", readFrontendData(locked));
PutToDict(dest, "tuner_synced", readFrontendData(synced));
PutToDict(dest, "tuner_bit_error_rate", readFrontendData(bitErrorRate));
- PutToDict(dest, "tuner_signal_power", readFrontendData(signalPower));
- int sigPowerdB = readFrontendData(signalPowerdB);
- if (sigPowerdB == 0x12345678) // not support yet
+ PutToDict(dest, "tuner_signal_quality", readFrontendData(signalQuality));
+ int sigQualitydB = readFrontendData(signalQualitydB);
+ if (sigQualitydB == 0x12345678) // not support yet
{
ePyObject obj=Py_None;
Py_INCREF(obj);
- PutToDict(dest, "tuner_signal_power_db", obj);
+ PutToDict(dest, "tuner_signal_quality_db", obj);
}
else
- PutToDict(dest, "tuner_signal_power_db", sigPowerdB);
- PutToDict(dest, "tuner_signal_quality", readFrontendData(signalQuality));
+ PutToDict(dest, "tuner_signal_quality_db", sigQualitydB);
+ PutToDict(dest, "tuner_signal_power", readFrontendData(signalPower));
}
}
int eDVBFrontend::readInputpower()
{
int power=m_slotid; // this is needed for read inputpower from the correct tuner !
-
- // open front prozessor
- int fp=::open("/dev/dbox/fp0", O_RDWR);
- if (fp < 0)
+ char proc_name[64];
+ sprintf(proc_name, "/proc/stb/fp/lnb_sense%d", m_slotid);
+ FILE *f=fopen(proc_name, "r");
+ if (f)
{
- eDebug("couldn't open fp");
- return -1;
+ if (fscanf(f, "%08x", &power) != 1)
+ eDebug("read %s failed!! (%m)", proc_name);
+ else
+ eDebug("%s is %d\n", proc_name, power);
+ fclose(f);
}
- static bool old_fp = (::ioctl(fp, FP_IOCTL_GET_ID) < 0);
- if ( ioctl( fp, old_fp ? 9 : 0x100, &power ) < 0 )
+ else
{
- eDebug("FP_IOCTL_GET_LNB_CURRENT failed (%m)");
- return -1;
+ // open front prozessor
+ int fp=::open("/dev/dbox/fp0", O_RDWR);
+ if (fp < 0)
+ {
+ eDebug("couldn't open fp");
+ return -1;
+ }
+ static bool old_fp = (::ioctl(fp, FP_IOCTL_GET_ID) < 0);
+ if ( ioctl( fp, old_fp ? 9 : 0x100, &power ) < 0 )
+ {
+ eDebug("FP_IOCTL_GET_LNB_CURRENT failed (%m)");
+ return -1;
+ }
+ ::close(fp);
}
- ::close(fp);
return power;
}
break;
case eSecCommand::SET_POWER_LIMITING_MODE:
{
- if (!m_need_rotor_workaround)
- break;
-
- char dev[16];
-
- // FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
- if (m_slotid < 2)
- sprintf(dev, "/dev/i2c/%d", m_slotid);
- else if (m_slotid == 2)
- sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2
- else if (m_slotid == 3)
- sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4
- int fd = ::open(dev, O_RDWR);
-
- unsigned char data[2];
- ::ioctl(fd, I2C_SLAVE_FORCE, 0x10 >> 1);
- if(::read(fd, data, 1) != 1)
- eDebug("[SEC] error read lnbp (%m)");
- if ( m_sec_sequence.current()->mode == eSecCommand::modeStatic )
+ if (m_need_rotor_workaround)
{
- data[0] |= 0x80; // enable static current limiting
- eDebug("[SEC] set static current limiting");
- }
- else
- {
- data[0] &= ~0x80; // enable dynamic current limiting
- eDebug("[SEC] set dynamic current limiting");
+ char dev[16];
+
+ // FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
+ if (m_slotid < 2)
+ sprintf(dev, "/dev/i2c/%d", m_slotid);
+ else if (m_slotid == 2)
+ sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2
+ else if (m_slotid == 3)
+ sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4
+ int fd = ::open(dev, O_RDWR);
+
+ unsigned char data[2];
+ ::ioctl(fd, I2C_SLAVE_FORCE, 0x10 >> 1);
+ if(::read(fd, data, 1) != 1)
+ eDebug("[SEC] error read lnbp (%m)");
+ if ( m_sec_sequence.current()->mode == eSecCommand::modeStatic )
+ {
+ data[0] |= 0x80; // enable static current limiting
+ eDebug("[SEC] set static current limiting");
+ }
+ else
+ {
+ data[0] &= ~0x80; // enable dynamic current limiting
+ eDebug("[SEC] set dynamic current limiting");
+ }
+ if(::write(fd, data, 1) != 1)
+ eDebug("[SEC] error write lnbp (%m)");
+ ::close(fd);
}
- if(::write(fd, data, 1) != 1)
- eDebug("[SEC] error write lnbp (%m)");
- ::close(fd);
++m_sec_sequence.current();
break;
}
int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
{
int type;
- if (feparm->getSystem(type) || type != m_type)
+ if (feparm->getSystem(type) || type != m_type || !m_enabled)
return 0;
if (m_type == eDVBFrontend::feSatellite)
return 1;
}
-void eDVBFrontend::setSlotInfo(ePyObject obj)
+bool eDVBFrontend::setSlotInfo(ePyObject obj)
{
- ePyObject Id, Descr;
- if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 2)
+ ePyObject Id, Descr, Enabled;
+ if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 3)
goto arg_error;
Id = PyTuple_GET_ITEM(obj, 0);
Descr = PyTuple_GET_ITEM(obj, 1);
- if (!PyInt_Check(Id) || !PyString_Check(Descr))
+ Enabled = PyTuple_GET_ITEM(obj, 2);
+ if (!PyInt_Check(Id) || !PyString_Check(Descr) || !PyBool_Check(Enabled))
goto arg_error;
strcpy(m_description, PyString_AS_STRING(Descr));
m_slotid = PyInt_AsLong(Id);
-
+ m_enabled = Enabled == Py_True;
// HACK.. the rotor workaround is neede for all NIMs with LNBP21 voltage regulator...
- m_need_rotor_workaround = !!strstr(m_description, "Alps BSBE1") || !!strstr(m_description, "Alps -S");
-
- eDebug("setSlotInfo for dvb frontend %d to slotid %d, descr %s, need rotorworkaround %s",
- m_dvbid, m_slotid, m_description, m_need_rotor_workaround ? "Yes" : "No");
- return;
+ m_need_rotor_workaround = !!strstr(m_description, "Alps BSBE1") ||
+ !!strstr(m_description, "Alps BSBE2") ||
+ !!strstr(m_description, "Alps -S");
+ eDebug("setSlotInfo for dvb frontend %d to slotid %d, descr %s, need rotorworkaround %s, enabled %s",
+ m_dvbid, m_slotid, m_description, m_need_rotor_workaround ? "Yes" : "No", m_enabled ? "Yes" : "No" );
+ return true;
arg_error:
PyErr_SetString(PyExc_StandardError,
- "eDVBFrontend::setSlotInfo must get a tuple with first param slotid and second param slot description");
+ "eDVBFrontend::setSlotInfo must get a tuple with first param slotid, second param slot description and third param enabled boolean");
+ return false;
}
git.cweiske.de / enigma2.git / blobdiff