X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/edc34b9bd8dcfec5c0509663a8e68e20b0066c78..c7a430797475bebdaf1e638f13bcae7b4026ee73:/lib/dvb_ci/dvbci_mmi.cpp

diff --git a/lib/dvb_ci/dvbci_mmi.cpp b/lib/dvb_ci/dvbci_mmi.cpp
index 90d2f9f5..29710660 100644
--- a/lib/dvb_ci/dvbci_mmi.cpp
+++ b/lib/dvb_ci/dvbci_mmi.cpp
@@ -2,6 +2,7 @@
 
 #include <lib/dvb_ci/dvbci_mmi.h>
 #include <lib/dvb_ci/dvbci_ui.h>
+#include <lib/base/estring.h>
 
 /*
 PyObject *list = PyList_New(len);
@@ -18,12 +19,13 @@ return list;
 eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot)
 {
 	slot = tslot;
-	slot->mmi_session = this;
+	slot->setMMIManager(this);
 }
 
 eDVBCIMMISession::~eDVBCIMMISession()
 {
-	slot->mmi_session = 0;
+	slot->setMMIManager(NULL);
+	eDVBCI_UI::getInstance()->mmiSessionDestroyed(slot->getSlotID());
 }
 
 int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, int len)
@@ -37,7 +39,26 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 	{
 		switch (tag[2])
 		{
-			case 0x01:
+		case 0x00:		//Tmmi_close
+		{
+			unsigned char *d=(unsigned char*)data;
+			int timeout=0;
+			if (d[3] == 1)
+			{
+				if (len > 4)
+					timeout = d[4];
+				else
+				{
+					eDebug("mmi close tag incorrect.. no timeout given.. assume 5 seconds");
+					timeout = 5;
+				}
+			}
+			else if (timeout>1)
+				eDebug("mmi close tag incorrect.. byte 4 should be 0 or 1");
+			eDVBCI_UI::getInstance()->mmiScreenClose(slot->getSlotID(), timeout);
+			break;
+		}
+		case 0x01:
 			printf("MMI display control\n");
 			if (((unsigned char*)data)[0] != 1)
 				printf("kann ich nicht. aber das sag ich dem modul nicht.\n");
@@ -48,7 +69,6 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 			unsigned char *d=(unsigned char*)data;
 			unsigned char *max=((unsigned char*)d) + len;
 			int textlen = len - 2;
-			int i;
 
 			printf("in enq\n");
 			
@@ -68,7 +88,7 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 			
 			printf("enq-text: %s\n",str);
 			
-			eDVBCI_UI::getInstance()->mmiScreenEnq(0, blind, alen, str);
+			eDVBCI_UI::getInstance()->mmiScreenEnq(slot->getSlotID(), blind, alen, (char*)convertDVBUTF8(str).c_str());
 
 			break;		
 		}
@@ -83,11 +103,10 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 				break;
 			int n=*d++;
 			
-			//FIXME: slotid
 			if(tag[2] == 0x09)	//menu
-				eDVBCI_UI::getInstance()->mmiScreenBegin(0, 0);
+				eDVBCI_UI::getInstance()->mmiScreenBegin(slot->getSlotID(), 0);
 			else								//list
-				eDVBCI_UI::getInstance()->mmiScreenBegin(0, 1);
+				eDVBCI_UI::getInstance()->mmiScreenBegin(slot->getSlotID(), 1);
 			
 			if (n == 0xFF)
 				n=0;
@@ -110,14 +129,13 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 				memcpy(str, ((char*)d), textlen);
 				str[textlen] = '\0';
 				
-				eDVBCI_UI::getInstance()->mmiScreenAddText(0, pos++, str);
+				eDVBCI_UI::getInstance()->mmiScreenAddText(slot->getSlotID(), pos++, (char*)convertDVBUTF8(str).c_str());
 					
 				while (textlen--)
 					printf("%c", *d++);
 				printf("\n");
 			}
-			//FIXME: slotid
-			eDVBCI_UI::getInstance()->mmiScreenFinish(0);
+			eDVBCI_UI::getInstance()->mmiScreenFinish(slot->getSlotID());
 			break;
 		}
 		default:
@@ -140,8 +158,9 @@ int eDVBCIMMISession::doAction()
 		unsigned char tag[]={0x9f, 0x88, 0x02};
 		unsigned char data[]={0x01, 0x01};
 		sendAPDU(tag, data, 2);
-		state=stateFakeOK;
-		return 1;
+		state=stateIdle;
+		//state=stateFakeOK;
+		//return 1;
 		break;
 	}
 	case stateFakeOK:
@@ -167,6 +186,8 @@ int eDVBCIMMISession::stopMMI()
 	unsigned char tag[]={0x9f, 0x88, 0x00};
 	unsigned char data[]={0x00};
 	sendAPDU(tag, data, 1);
+	
+	return 0;
 }
 
 int eDVBCIMMISession::answerText(int answer)
@@ -177,6 +198,23 @@ int eDVBCIMMISession::answerText(int answer)
 	unsigned char data[]={0x00};
 	data[0] = answer & 0xff;
 	sendAPDU(tag, data, 1);
+	
+	return 0;
+}
+
+int eDVBCIMMISession::answerEnq(char *answer)
+{
+	unsigned int len = strlen(answer);
+	printf("eDVBCIMMISession::answerEnq(%d bytes)\n", len);
+
+	unsigned char data[len+1];
+	data[0] = 0x01; // answer ok
+	memcpy(data+1, answer, len);
+
+	unsigned char tag[]={0x9f, 0x88, 0x08};
+	sendAPDU(tag, data, len+1);
+
+	return 0;
 }
 
 int eDVBCIMMISession::cancelEnq()
@@ -184,7 +222,9 @@ int eDVBCIMMISession::cancelEnq()
 	printf("eDVBCIMMISession::cancelEnq()\n");
 
 	unsigned char tag[]={0x9f, 0x88, 0x08};
-	unsigned char data[]={0x00};
+	unsigned char data[]={0x00}; // canceled
 	sendAPDU(tag, data, 1);
+	
+	return 0;
 }