X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.cpp;h=519b5fee87255b9874bb8da20eb8d99f1932d552;hb=3cc82828e92d2e8b5125de590ddc9e693a2a2ea0;hp=c0263fb4024daf1b43d5e91e3f0bf7e5b5fbb85e;hpb=f3a30a79a5dda5f33a9241de575bbf9fa66b4170;p=vuplus_dvbapp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index c0263fb..519b5fe 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -455,7 +455,7 @@ 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)
-	,m_fd(-1), m_need_rotor_workaround(false), m_can_handle_dvbs2(false)
+	,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
 	,m_secfd(-1)
@@ -483,6 +483,13 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok, bool simulate)
 	closeFrontend();
 }
 
+void eDVBFrontend::reopenFrontend()
+{
+	sleep(1);
+	m_type = -1;
+	openFrontend();
+}
+
 int eDVBFrontend::openFrontend()
 {
 	if (m_state != stateClosed)
@@ -692,7 +699,8 @@ void eDVBFrontend::feEvent(int w)
 			{
 				eDebug("stateLostLock");
 				state = stateLostLock;
-				sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = -1; // reset diseqc
+				if (!m_rotor_mode)
+					sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = -1; // reset diseqc
 			}
 		}
 		if (m_state != state)
@@ -1045,6 +1053,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)
 	{
@@ -1093,7 +1102,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;
@@ -1427,9 +1436,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);
@@ -2343,6 +2354,20 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			res = -EINVAL;
 			goto tune_error;
 		}
+		if (m_rotor_mode != feparm.no_rotor_command_on_tune && !feparm.no_rotor_command_on_tune)
+		{
+			eDVBFrontend *sec_fe = this;
+			long tmp = m_data[LINKED_PREV_PTR];
+			while (tmp != -1)
+			{
+				eDVBRegisteredFrontend *linked_fe = (eDVBRegisteredFrontend*)tmp;
+				sec_fe = linked_fe->m_frontend;
+				sec_fe->getData(LINKED_NEXT_PTR, tmp);
+			}
+			eDebug("(fe%d) reset diseqc after leave rotor mode!", m_dvbid);
+			sec_fe->m_data[CSW] = sec_fe->m_data[UCSW] = sec_fe->m_data[TONEBURST] = sec_fe->m_data[ROTOR_CMD] = sec_fe->m_data[ROTOR_POS] = -1; // reset diseqc
+		}
+		m_rotor_mode = feparm.no_rotor_command_on_tune;
 		if (!m_simulate)
 			m_sec->setRotorMoving(m_slotid, false);
 		res=prepare_sat(feparm, timeout);