X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1ddd7d76f3b08ebfd0788f9301dda12161ee4f48..76fe69e113637a200aafdc2d6dede772706e4b09:/lib/dvb_ci/dvbci_mmi.cpp

diff --git a/lib/dvb_ci/dvbci_mmi.cpp b/lib/dvb_ci/dvbci_mmi.cpp
index 9032f2df..c39d0edd 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,29 +19,49 @@ 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)
 {
-	printf("SESSION(%d)/MMI %02x %02x %02x: ", session_nb, tag[0], tag[1],tag[2]);
+	eDebugNoNewLine("SESSION(%d)/MMI %02x %02x %02x: ", session_nb, tag[0], tag[1],tag[2]);
 	for (int i=0; i<len; i++)
-		printf("%02x ", ((const unsigned char*)data)[i]);
-	printf("\n");
+		eDebugNoNewLine("%02x ", ((const unsigned char*)data)[i]);
+	eDebug("");
 
 	if ((tag[0]==0x9f) && (tag[1]==0x88))
 	{
 		switch (tag[2])
 		{
-			case 0x01:
-			printf("MMI display control\n");
+		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 (d[3] > 1)
+				eDebug("mmi close tag incorrect.. byte 4 should be 0 or 1");
+			eDVBCI_UI::getInstance()->mmiScreenClose(slot->getSlotID(), timeout);
+			break;
+		}
+		case 0x01:
+			eDebug("MMI display control");
 			if (((unsigned char*)data)[0] != 1)
-				printf("kann ich nicht. aber das sag ich dem modul nicht.\n");
+				eDebug("kann ich nicht. aber das sag ich dem modul nicht.");
 			state=stateDisplayReply;
 			return 1;
 		case 0x07:		//Tmenu_enq
@@ -48,9 +69,8 @@ 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");
+			eDebug("in enq");
 			
 			if ((d+2) > max)
 				break;
@@ -58,7 +78,7 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 			int blind = *d++ & 1;
 			int alen = *d++;
 
-			printf("%d bytes text\n", textlen);
+			eDebug("%d bytes text", textlen);
 			if ((d+textlen) > max)
 				break;
 			
@@ -66,9 +86,9 @@ int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
 			memcpy(str, ((char*)d), textlen);
 			str[textlen] = '\0';
 			
-			printf("enq-text: %s\n",str);
+			eDebug("enq-text: %s",str);
 			
-			eDVBCI_UI::getInstance()->mmiScreenEnq(0, blind, alen, str);
+			eDVBCI_UI::getInstance()->mmiScreenEnq(slot->getSlotID(), blind, alen, (char*)convertDVBUTF8(str).c_str());
 
 			break;		
 		}
@@ -78,31 +98,30 @@ 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 pos = 0;
-			printf("Tmenu_last\n");
+			eDebug("Tmenu_last");
 			if (d > max)
 				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;
 			else
 				n++;
-			printf("%d texts\n", n);
+			eDebug("%d texts", n);
 			for (int i=0; i < (n+3); ++i)
 			{
 				int textlen;
 				if ((d+3) > max)
 					break;
-				printf("text tag: %02x %02x %02x\n", d[0], d[1], d[2]);
+				eDebug("text tag: %02x %02x %02x", d[0], d[1], d[2]);
 				d+=3;
 				d+=parseLengthField(d, textlen);
-				printf("%d bytes text\n", textlen);
+				eDebug("%d bytes text", textlen);
 				if ((d+textlen) > max)
 					break;
 					
@@ -110,18 +129,17 @@ 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");
+					eDebugNoNewLine("%c", *d++);
+				eDebug("");
 			}
-			//FIXME: slotid
-			eDVBCI_UI::getInstance()->mmiScreenFinish(0);
+			eDVBCI_UI::getInstance()->mmiScreenFinish(slot->getSlotID());
 			break;
 		}
 		default:
-			printf("unknown APDU tag 9F 88 %02x\n", tag[2]);
+			eDebug("unknown APDU tag 9F 88 %02x", tag[2]);
 			break;
 		}
 	}
@@ -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:
@@ -162,7 +181,7 @@ int eDVBCIMMISession::doAction()
 
 int eDVBCIMMISession::stopMMI()
 {
-	printf("eDVBCIMMISession::stopMMI()\n");
+	eDebug("eDVBCIMMISession::stopMMI()");
 
 	unsigned char tag[]={0x9f, 0x88, 0x00};
 	unsigned char data[]={0x00};
@@ -173,7 +192,7 @@ int eDVBCIMMISession::stopMMI()
 
 int eDVBCIMMISession::answerText(int answer)
 {
-	printf("eDVBCIMMISession::answerText(%d)\n",answer);
+	eDebug("eDVBCIMMISession::answerText(%d)",answer);
 
 	unsigned char tag[]={0x9f, 0x88, 0x0B};
 	unsigned char data[]={0x00};
@@ -183,12 +202,27 @@ int eDVBCIMMISession::answerText(int answer)
 	return 0;
 }
 
+int eDVBCIMMISession::answerEnq(char *answer)
+{
+	unsigned int len = strlen(answer);
+	eDebug("eDVBCIMMISession::answerEnq(%d bytes)", 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()
 {
-	printf("eDVBCIMMISession::cancelEnq()\n");
+	eDebug("eDVBCIMMISession::cancelEnq()");
 
 	unsigned char tag[]={0x9f, 0x88, 0x08};
-	unsigned char data[]={0x00};
+	unsigned char data[]={0x00}; // canceled
 	sendAPDU(tag, data, 1);
 	
 	return 0;