X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3eba2c632cc9515a424a2986d6bdeb690f15fd81..d43e4676bd757d1de73b8dd669154ffd42192b10:/lib/dvb_ci/dvbci.h

diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index 1921ad7f..7605a6d9 100644
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -4,12 +4,30 @@
 #include <lib/base/ebase.h>
 
 #include <set>
+#include <queue>
 
 class eDVBCISession;
 class eDVBCIApplicationManagerSession;
 class eDVBCICAManagerSession;
 class eDVBCIMMISession;
 class eDVBServicePMTHandler;
+class eDVBCISlot;
+
+struct queueData
+{
+	__u8 prio;
+	unsigned char *data;
+	unsigned int len;
+	queueData( unsigned char *data, unsigned int len, __u8 prio = 0 )
+		:prio(prio), data(data), len(len)
+	{
+
+	}
+	bool operator < ( const struct queueData &a ) const
+	{
+		return prio < a.prio;
+	}
+};
 
 class eDVBCISlot: public iObject, public Object
 {
@@ -21,21 +39,31 @@ private:
 	eSocketNotifier *notifier;
 
 	int state;
-	enum {stateRemoved, stateInserted};
-	uint8_t prev_sent_capmt_version;
+	std::map<uint16_t, uint8_t> running_services;
+	eDVBCIApplicationManagerSession *application_manager;
+	eDVBCICAManagerSession *ca_manager;
+	eDVBCIMMISession *mmi_session;
+	std::priority_queue<queueData> sendqueue;
 public:
+	enum {stateRemoved, stateInserted, stateInvalid, stateResetted};
+	int use_count;
+
 	eDVBCISlot(eMainloop *context, int nr);
 	~eDVBCISlot();
 	
 	int send(const unsigned char *data, size_t len);
-	
-	eDVBCIApplicationManagerSession *application_manager;
-	eDVBCICAManagerSession *ca_manager;
-	eDVBCIMMISession *mmi_session;
-	
+
+	void setAppManager( eDVBCIApplicationManagerSession *session );
+	void setMMIManager( eDVBCIMMISession *session );
+	void setCAManager( eDVBCICAManagerSession *session );
+
+	eDVBCIApplicationManagerSession *getAppManager() { return application_manager; }
+	eDVBCIMMISession *getMMIManager() { return mmi_session; }
+	eDVBCICAManagerSession *getCAManager() { return ca_manager; }
+
+	int getState() { return state; }
 	int getSlotID();
 	int reset();
-	int initialize();
 	int startMMI();
 	int stopMMI();
 	int answerText(int answer);
@@ -43,44 +71,50 @@ public:
 	int cancelEnq();
 	int getMMIState();
 	int sendCAPMT(eDVBServicePMTHandler *ptr, const std::vector<uint16_t> &caids=std::vector<uint16_t>());
-	uint8_t getPrevSentCAPMTVersion() const { return prev_sent_capmt_version; }
-	void resetPrevSentCAPMTVersion() { prev_sent_capmt_version = 0xFF; }
+	void removeService(uint16_t program_number=0xFFFF);
+	int getNumOfServices() { return running_services.size(); }
+	
+	int enableTS(int enable, int tuner=0);
+
 };
 
 struct CIPmtHandler
 {
 	eDVBServicePMTHandler *pmthandler;
-	eDVBCISlot *usedby;
+	eDVBCISlot *cislot;
 	CIPmtHandler()
-		:pmthandler(NULL), usedby(NULL)
+		:pmthandler(NULL), cislot(NULL)
 	{}
 	CIPmtHandler( const CIPmtHandler &x )
-		:pmthandler(x.pmthandler), usedby(x.usedby)
+		:pmthandler(x.pmthandler), cislot(x.cislot)
 	{}
 	CIPmtHandler( eDVBServicePMTHandler *ptr )
-		:pmthandler(ptr), usedby(NULL)
+		:pmthandler(ptr), cislot(NULL)
 	{}
-	bool operator<(const CIPmtHandler &x) const { return x.pmthandler < pmthandler; }
+	bool operator==(const CIPmtHandler &x) const { return x.pmthandler == pmthandler; }
 };
 
-typedef std::set<CIPmtHandler> PMTHandlerSet;
+typedef std::list<CIPmtHandler> PMTHandlerList;
 
 class eDVBCIInterfaces
 {
 DECLARE_REF(eDVBCIInterfaces);
 	static eDVBCIInterfaces *instance;
 private:
-	eSmartPtrList<eDVBCISlot>	m_slots;
+	eSmartPtrList<eDVBCISlot> m_slots;
 	eDVBCISlot *getSlot(int slotid);
 
-	PMTHandlerSet m_pmt_handlers; 
+	PMTHandlerList m_pmt_handlers; 
 public:
 	eDVBCIInterfaces();
 	~eDVBCIInterfaces();
 
 	void addPMTHandler(eDVBServicePMTHandler *pmthandler);
 	void removePMTHandler(eDVBServicePMTHandler *pmthandler);
+	void recheckPMTHandlers();
 	void gotPMT(eDVBServicePMTHandler *pmthandler);
+	void ciRemoved(eDVBCISlot *slot);
+	int getSlotState(int slot);
 
 	static eDVBCIInterfaces *getInstance();
 	
@@ -92,6 +126,8 @@ public:
 	int answerEnq(int slot, char *value);
 	int cancelEnq(int slot);
 	int getMMIState(int slot);
+	int enableTS(int slot, int enable);
+	int sendCAPMT(int slot);
 };
 
 #endif