X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.cpp;h=57188963cebd10f175d8425517f0b663b2ad26b9;hp=bd8f002876d45880bf3b660a9cf7dc398c77b094;hb=a4d95aed350cfe26a278ad7f9475bc8be77ff9ff;hpb=c95ebd0688c39d4fa6e22e85d84fe7d80e3da013

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index bd8f002..5718896 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -453,8 +453,8 @@ DEFINE_REF(eDVBFrontend);
 
 int eDVBFrontend::PriorityOrder=0;
 
-eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok, bool simulate)
-	:m_simulate(simulate), m_enabled(false), m_type(-1), m_dvbid(fe), m_slotid(fe)
+eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok, bool simulate, eDVBFrontend *simulate_fe)
+	:m_simulate(simulate), m_enabled(false), m_type(-1), m_simulate_fe(simulate_fe), m_dvbid(fe), m_slotid(fe)
 	,m_fd(-1), m_rotor_mode(false), m_need_rotor_workaround(false), m_can_handle_dvbs2(false)
 	,m_state(stateClosed), m_timeout(0), m_tuneTimer(0)
 #if HAVE_DVB_API_VERSION < 3
@@ -503,10 +503,10 @@ int eDVBFrontend::openFrontend()
 #else
 	dvb_frontend_info fe_info;
 #endif
-	eDebugNoSimulate("opening frontend %d", m_dvbid);
-	if (m_fd < 0)
+	if (!m_simulate)
 	{
-		if (!m_simulate || m_type == -1)
+		eDebug("opening frontend %d", m_dvbid);
+		if (m_fd < 0)
 		{
 			m_fd = ::open(m_filename, O_RDWR|O_NONBLOCK);
 			if (m_fd < 0)
@@ -515,70 +515,69 @@ int eDVBFrontend::openFrontend()
 				return -1;
 			}
 		}
-	}
-	else
-		eWarning("frontend %d already opened", m_dvbid);
-	if (m_type == -1)
-	{
-		if (::ioctl(m_fd, FE_GET_INFO, &fe_info) < 0)
+		else
+			eWarning("frontend %d already opened", m_dvbid);
+		if (m_type == -1)
 		{
-			eWarning("ioctl FE_GET_INFO failed");
-			::close(m_fd);
-			m_fd = -1;
-			return -1;
-		}
+			if (::ioctl(m_fd, FE_GET_INFO, &fe_info) < 0)
+			{
+				eWarning("ioctl FE_GET_INFO failed");
+				::close(m_fd);
+				m_fd = -1;
+				return -1;
+			}
 
-		switch (fe_info.type)
-		{
-		case FE_QPSK:
-			m_type = iDVBFrontend::feSatellite;
-			break;
-		case FE_QAM:
-			m_type = iDVBFrontend::feCable;
-			break;
-		case FE_OFDM:
-			m_type = iDVBFrontend::feTerrestrial;
-			break;
-		default:
-			eWarning("unknown frontend type.");
-			::close(m_fd);
-			m_fd = -1;
-			return -1;
+			switch (fe_info.type)
+			{
+			case FE_QPSK:
+				m_type = iDVBFrontend::feSatellite;
+				break;
+			case FE_QAM:
+				m_type = iDVBFrontend::feCable;
+				break;
+			case FE_OFDM:
+				m_type = iDVBFrontend::feTerrestrial;
+				break;
+			default:
+				eWarning("unknown frontend type.");
+				::close(m_fd);
+				m_fd = -1;
+				return -1;
+			}
+			if (m_simulate_fe)
+				m_simulate_fe->m_type = m_type;
+			eDebugNoSimulate("detected %s frontend", "satellite\0cable\0    terrestrial"+fe_info.type*10);
 		}
-		eDebugNoSimulate("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)
-			{
-				if (!m_simulate)
+		if (m_type == iDVBFrontend::feSatellite)
+		{
+				if (m_secfd < 0)
 				{
-					m_secfd = ::open(m_sec_filename, O_RDWR);
-					if (m_secfd < 0)
+					if (!m_simulate)
 					{
-						eWarning("failed! (%s) %m", m_sec_filename);
-						::close(m_fd);
-						m_fd=-1;
-						return -1;
+						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);
-	}
+				else
+					eWarning("sec %d already opened", m_dvbid);
+		}
 #endif
 
-	setTone(iDVBFrontend::toneOff);
-	setVoltage(iDVBFrontend::voltageOff);
-
-	if (!m_simulate)
-	{
 		m_sn = eSocketNotifier::create(eApp, m_fd, eSocketNotifier::Read, false);
 		CONNECT(m_sn->activated, eDVBFrontend::feEvent);
 	}
 
+	setTone(iDVBFrontend::toneOff);
+	setVoltage(iDVBFrontend::voltageOff);
+
 	return 0;
 }
 
@@ -813,7 +812,7 @@ int eDVBFrontend::readFrontendData(int type)
 					float fval1 = SDS_SNRE / 268435456.0,
 						  fval2, fval3, fval4;
 
-					if (parm_u_qpsk_fec_inner <= FEC_S2_QPSK_9_10) // DVB-S2 QPSK
+					if (oparm.sat.modulation == eDVBFrontendParametersSatellite::Modulation_QPSK)
 					{
 						fval2 = 6.76;
 						fval3 = 4.35;
@@ -906,6 +905,19 @@ int eDVBFrontend::readFrontendData(int type)
 			}
 			else if (strstr(m_description, "BCM4506") || strstr(m_description, "BCM4505"))
 				ret = (snr * 100) >> 8;
+			else if (!strcmp(m_description, "CXD1981"))
+			{
+				int mse = (~snr) & 0xFF;
+				switch (parm_u_qam_modulation) {
+					case QAM_16:
+					case QAM_64:
+					case QAM_256: ret = (int)(-950 * log(((double)mse) / 760)); break;
+					case QAM_32:
+					case QAM_128: ret = (int)(-875 * log(((double)mse) / 650)); break;
+
+					default: break;
+				}
+			}
 
 			if (type == signalQuality)
 			{
@@ -1076,6 +1088,7 @@ static void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &
 	case FEC_AUTO: tmp = eDVBFrontendParametersSatellite::FEC_Auto; break;
 	default: eDebug("got unsupported FEC from frontend! report as FEC_AUTO!\n");
 	}
+	PutToDict(dict, "fec_inner", tmp);
 
 	switch (p[0].u.data)
 	{
@@ -1124,7 +1137,7 @@ static void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &
 	PutToDict(dict, "orbital_position", orb_pos);
 	PutToDict(dict, "polarization", polarization);
 
-	switch(parm_u_qpsk_fec_inner)
+	switch((int)parm_u_qpsk_fec_inner)
 	{
 	case FEC_1_2: tmp = eDVBFrontendParametersSatellite::FEC_1_2; break;
 	case FEC_2_3: tmp = eDVBFrontendParametersSatellite::FEC_2_3; break;
@@ -1458,9 +1471,11 @@ int eDVBFrontend::readInputpower()
 		return 0;
 	int power=m_slotid;  // this is needed for read inputpower from the correct tuner !
 	char proc_name[64];
-	sprintf(proc_name, "/proc/stb/fp/lnb_sense%d", m_slotid);
-	FILE *f=fopen(proc_name, "r");
-	if (f)
+	char proc_name2[64];
+	sprintf(proc_name, "/proc/stb/frontend/%d/lnb_sense", m_slotid);
+	sprintf(proc_name2, "/proc/stb/fp/lnb_sense%d", m_slotid);
+	FILE *f;
+	if ((f=fopen(proc_name, "r")) || (f=fopen(proc_name2, "r")))
 	{
 		if (fscanf(f, "%d", &power) != 1)
 			eDebug("read %s failed!! (%m)", proc_name);
@@ -1844,11 +1859,11 @@ int eDVBFrontend::tuneLoopInt()  // called by m_tuneTimer
 						int slotid = sec_fe->m_slotid;
 						// FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
 						if (slotid < 2)
-							sprintf(dev, "/dev/i2c/%d", slotid);
+							sprintf(dev, "/dev/i2c-%d", slotid);
 						else if (slotid == 2)
-							sprintf(dev, "/dev/i2c/2"); // first nim socket on DM8000 use /dev/i2c/2
+							sprintf(dev, "/dev/i2c-2"); // first nim socket on DM8000 use /dev/i2c-2
 						else if (slotid == 3)
-							sprintf(dev, "/dev/i2c/4"); // second nim socket on DM8000 use /dev/i2c/4
+							sprintf(dev, "/dev/i2c-4"); // second nim socket on DM8000 use /dev/i2c-4
 						int fd = ::open(dev, O_RDWR);
 
 						unsigned char data[2];
@@ -2095,8 +2110,8 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm,
 					return -EINVAL;
 			}
 #if HAVE_DVB_API_VERSION < 5
-			parm_inversion |= (feparm.rolloff << 2); // Hack.. we use bit 2..3 of inversion param for rolloff
-			parm_inversion |= (feparm.pilot << 4); // Hack.. we use bit 4..5 of inversion param for pilot
+			parm_inversion = (fe_spectral_inversion_t)((feparm.rolloff << 2) | parm_inversion); // Hack.. we use bit 2..3 of inversion param for rolloff
+			parm_inversion = (fe_spectral_inversion_t)((feparm.pilot << 4) | parm_inversion); // Hack.. we use bit 4..5 of inversion param for pilot
 			if (feparm.modulation == eDVBFrontendParametersSatellite::Modulation_8PSK) 
 			{
 				parm_u_qpsk_fec_inner = (fe_code_rate_t)((int)parm_u_qpsk_fec_inner+9);
@@ -2684,17 +2699,23 @@ int eDVBFrontend::isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)
 
 bool eDVBFrontend::setSlotInfo(ePyObject obj)
 {
-	ePyObject Id, Descr, Enabled, IsDVBS2;
-	if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 4)
+	ePyObject Id, Descr, Enabled, IsDVBS2, frontendId;
+	if (!PyTuple_Check(obj) || PyTuple_Size(obj) != 5)
 		goto arg_error;
 	Id = PyTuple_GET_ITEM(obj, 0);
 	Descr = PyTuple_GET_ITEM(obj, 1);
 	Enabled = PyTuple_GET_ITEM(obj, 2);
 	IsDVBS2 = PyTuple_GET_ITEM(obj, 3);
-	if (!PyInt_Check(Id) || !PyString_Check(Descr) || !PyBool_Check(Enabled) || !PyBool_Check(IsDVBS2))
+	frontendId = PyTuple_GET_ITEM(obj, 4);
+	m_slotid = PyInt_AsLong(Id);
+	if (!PyInt_Check(Id) || !PyString_Check(Descr) || !PyBool_Check(Enabled) || !PyBool_Check(IsDVBS2) || !PyInt_Check(frontendId))
 		goto arg_error;
 	strcpy(m_description, PyString_AS_STRING(Descr));
-	m_slotid = PyInt_AsLong(Id);
+	if (PyInt_AsLong(frontendId) == -1 || PyInt_AsLong(frontendId) != m_dvbid) {
+//		eDebugNoSimulate("skip slotinfo for slotid %d, descr %s",
+//			m_slotid, m_description);
+		return false;
+	}
 	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") ||