change get/setData to use long instead of int, to match pointer size on all systems

5 files changed, 32 insertions, 32 deletions

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 6f72cb17..f5eadda0 100644
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -242,8 +242,8 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
 			{
 				if (prev_dvbt_frontend)
 				{
-					prev_dvbt_frontend->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)new_fe);
-					frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)&(*prev_dvbt_frontend));
+					prev_dvbt_frontend->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)new_fe);
+					frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)&(*prev_dvbt_frontend));
 				}
 				prev_dvbt_frontend = new_fe;
 			}
@@ -322,7 +322,7 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
 			// check if another slot linked to this is in use
 			eDVBRegisteredFrontend *satpos_depends_to_fe =
 				(eDVBRegisteredFrontend*) i->m_frontend->m_data[eDVBFrontend::SATPOS_DEPENDS_PTR];
-			if ( (int)satpos_depends_to_fe != -1 )
+			if ( (long)satpos_depends_to_fe != -1 )
 			{
 				if (satpos_depends_to_fe->m_inuse)
 				{
@@ -335,7 +335,7 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
 			{
 				eDVBRegisteredFrontend *next =
 					(eDVBRegisteredFrontend *) i->m_frontend->m_data[eDVBFrontend::LINKED_NEXT_PTR];
-				while ( (int)next != -1 )
+				while ( (long)next != -1 )
 				{
 					if (next->m_inuse)
 					{
@@ -347,7 +347,7 @@ RESULT eDVBResourceManager::allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend>
 				}
 				eDVBRegisteredFrontend *prev = (eDVBRegisteredFrontend *)
 					i->m_frontend->m_data[eDVBFrontend::LINKED_PREV_PTR];
-				while ( (int)prev != -1 )
+				while ( (long)prev != -1 )
 				{
 					if (prev->m_inuse)
 					{
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index c6a52056..5f28a829 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -506,7 +506,7 @@ int eDVBFrontend::closeFrontend()
 				m_dvbid, linked_fe->m_frontend->getDVBID(), linked_fe->m_frontend->getSlotID());
 			return -1;
 		}
-		linked_fe->m_frontend->getData(LINKED_NEXT_PTR, (int&)linked_fe);
+		linked_fe->m_frontend->getData(LINKED_NEXT_PTR, (long&)linked_fe);
 	}
 	if (m_fd >= 0)
 	{
@@ -751,8 +751,8 @@ void PutToDict(ePyObject &dict, const char*key, const char *value)
 
 void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe)
 {
-	int freq_offset=0;
-	int csw=0;
+	long freq_offset=0;
+	long csw=0;
 	const char *tmp=0;
 	fe->getData(eDVBFrontend::CSW, csw);
 	fe->getData(eDVBFrontend::FREQ_OFFSET, freq_offset);
@@ -1224,14 +1224,14 @@ void eDVBFrontend::setRotorData(int pos, int cmd)
 	else
 	{
 		eDVBRegisteredFrontend *next = (eDVBRegisteredFrontend *)m_data[LINKED_NEXT_PTR];
-		while ( (int)next != -1 )
+		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 ( (int)prev != -1 )
+		while ( (long)prev != -1 )
 		{
 			prev->m_frontend->m_data[ROTOR_CMD] = cmd;
 			prev->m_frontend->m_data[ROTOR_POS] = pos;
@@ -2113,7 +2113,7 @@ RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list)
 	return 0;
 }
 
-RESULT eDVBFrontend::getData(int num, int &data)
+RESULT eDVBFrontend::getData(int num, long &data)
 {
 	if ( num < NUM_DATA_ENTRIES )
 	{
@@ -2123,7 +2123,7 @@ RESULT eDVBFrontend::getData(int num, int &data)
 	return -EINVAL;
 }
 
-RESULT eDVBFrontend::setData(int num, int val)
+RESULT eDVBFrontend::setData(int num, long val)
 {
 	if ( num < NUM_DATA_ENTRIES )
 	{
diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 6055da0b..477ddf6a 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -82,7 +82,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
 		NUM_DATA_ENTRIES
 	};
 
-	int m_data[NUM_DATA_ENTRIES];
+	long m_data[NUM_DATA_ENTRIES];
 
 	int m_idleInputpower[2];  // 13V .. 18V
 	int m_runningInputpower;
@@ -115,8 +115,8 @@ public:
 	RESULT sendToneburst(int burst);
 	RESULT setSEC(iDVBSatelliteEquipmentControl *sec);
 	RESULT setSecSequence(const eSecCommandList &list);
-	RESULT getData(int num, int &data);
-	RESULT setData(int num, int val);
+	RESULT getData(int num, long &data);
+	RESULT setData(int num, long val);
 
 	int readFrontendData(int type); // bitErrorRate, signalPower, signalQualitydB, signalQuality, locked, synced
 	void getFrontendStatus(ePyObject dest);
diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index d16c9b48..36f580ca 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -470,8 +470,8 @@ public:
 	virtual void getTransponderData(SWIG_PYOBJECT(ePyObject) dest, bool original)=0;
 	virtual void getFrontendData(SWIG_PYOBJECT(ePyObject) dest)=0;
 #ifndef SWIG
-	virtual RESULT getData(int num, int &data)=0;
-	virtual RESULT setData(int num, int val)=0;
+	virtual RESULT getData(int num, long &data)=0;
+	virtual RESULT setData(int num, long val)=0;
 		/* 0 means: not compatible. other values are a priority. */
 	virtual int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)=0;
 #endif
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 5db56b6a..655f64fc 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -114,12 +114,12 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 	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);
@@ -145,7 +145,7 @@ static void checkLinkedParams(int direction, int &linked_ptr, int &ret, const eD
 //		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 )
@@ -166,7 +166,7 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite
 				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,
@@ -298,7 +298,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 			bool doSetFrontend = true;
 			bool doSetVoltageToneFrontend = m_not_linked_slot_mask & slot_id;
 			bool allowDiseqc1_2 = true;
-			int band=0,
+			long band=0,
 				voltage = iDVBFrontend::voltageOff,
 				tone = iDVBFrontend::toneOff,
 				csw = di_param.m_committed_cmd,
@@ -607,7 +607,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 						}
 					}
 
-					eDebug("RotorCmd %02x, lastRotorCmd %02x", RotorCmd, lastRotorCmd);
+					eDebug("RotorCmd %02x, lastRotorCmd %02lx", RotorCmd, lastRotorCmd);
 					if ( RotorCmd != -1 && RotorCmd != lastRotorCmd )
 					{
 						eSecCommand::pair compare;
@@ -814,7 +814,7 @@ RESULT eDVBSatelliteEquipmentControl::clear()
 	//reset some tuner configuration
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_frontends.begin()); it != m_avail_frontends.end(); ++it)
 	{
-		int tmp;
+		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");
@@ -1167,7 +1167,7 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t
 
 			do 
 			{
-				int tmp;
+				long tmp;
 				p1->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
 				if (tmp != -1)
 					p1 = (eDVBRegisteredFrontend*)tmp;
@@ -1178,7 +1178,7 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t
 
 			do 
 			{
-				int tmp;
+				long tmp;
 				p2->m_frontend->getData(eDVBFrontend::LINKED_PREV_PTR, tmp);
 				if (tmp != -1)
 					p2 = (eDVBRegisteredFrontend*)tmp;
@@ -1189,8 +1189,8 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t
 
 			if (p1 != p2)
 			{
-				int tmp1=-1;
-				int tmp2=-1;
+				long tmp1=-1;
+				long tmp2=-1;
 				// check for rotor dependency
 				p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1);
 				if (tmp1 != -1)
@@ -1267,8 +1267,8 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 		}
 		if (p1 && p2)
 		{
-			p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (int)p2);
-			p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (int)p1);
+			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)"))
 			{
 				FILE *f=fopen("/proc/stb/tsmux/lnb_b_input", "w");
@@ -1304,8 +1304,8 @@ RESULT eDVBSatelliteEquipmentControl::setTunerDepends(int tu1, int tu2)
 	}
 	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;