fixes for support more than one CI

[enigma2.git] / lib / dvb_ci / dvbci_mmi.cpp

diff --git a/lib/dvb_ci/dvbci_mmi.cpp b/lib/dvb_ci/dvbci_mmi.cpp
index a6a0c8b4ad4591b4b013704f30b7f7b1e7e52095..d3f564d92faa2b53c03b8653534bb618aedd7b9a 100644 (file)
--- a/lib/dvb_ci/dvbci_mmi.cpp
+++ b/lib/dvb_ci/dvbci_mmi.cpp
@@ -19,12 +19,12 @@ return list;
 eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot)
 {
        slot = tslot;
-       slot->mmi_session = this;
+       slot->setMMIManager(this);
 }
 
 eDVBCIMMISession::~eDVBCIMMISession()
 {
-       slot->mmi_session = 0;
+       slot->setMMIManager(NULL);
 }
 
 int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, int len)
@@ -49,7 +49,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");
                        
@@ -69,7 +68,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, (char*)convertDVBUTF8(str).c_str());
+                       eDVBCI_UI::getInstance()->mmiScreenEnq(slot->getSlotID(), blind, alen, (char*)convertDVBUTF8(str).c_str());
 
                        break;          
                }
@@ -84,11 +83,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;
@@ -111,14 +109,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++, (char*)convertDVBUTF8(str).c_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:
@@ -141,8 +138,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:
@@ -184,12 +182,27 @@ int eDVBCIMMISession::answerText(int answer)
        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()
 {
        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;