add the missing ca-mgr code ;)

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

diff --git a/lib/dvb_ci/dvbci_session.cpp b/lib/dvb_ci/dvbci_session.cpp
index b0bef25ccda570d74bd71cb898fa64a184b295d0..ab997e5d827a857580e098e3e15f869b837ac24f 100644 (file)
--- a/lib/dvb_ci/dvbci_session.cpp
+++ b/lib/dvb_ci/dvbci_session.cpp
@@ -2,6 +2,8 @@
 
 #include <lib/dvb_ci/dvbci_session.h>
 #include <lib/dvb_ci/dvbci_resmgr.h>
 
 #include <lib/dvb_ci/dvbci_session.h>
 #include <lib/dvb_ci/dvbci_resmgr.h>

+#include <lib/dvb_ci/dvbci_appmgr.h>
+#include <lib/dvb_ci/dvbci_camgr.h>

 
 int eDVBCISession::buildLengthField(unsigned char *pkt, int len)
 {
 
 int eDVBCISession::buildLengthField(unsigned char *pkt, int len)
 {


@@ -54,6 +56,11 @@ void eDVBCISession::sendAPDU(const unsigned char *tag, const void *data, int len
        sendSPDU(0x90, 0, 0, pkt, len+3+l);
 }
 
        sendSPDU(0x90, 0, 0, pkt, len+3+l);
 }
 

+void eDVBCISession::sendSPDU(unsigned char tag, const void *data, int len, const void *apdu, int alen)
+{
+       sendSPDU(slot, tag, data, len, session_nb, apdu, alen);
+}
+

 void eDVBCISession::sendSPDU(eDVBCISlot *slot, unsigned char tag, const void *data, int len, unsigned short session_nb, const void *apdu,int alen)
 {
        unsigned char pkt[4096];
 void eDVBCISession::sendSPDU(eDVBCISlot *slot, unsigned char tag, const void *data, int len, unsigned short session_nb, const void *apdu,int alen)
 {
        unsigned char pkt[4096];


@@ -123,11 +130,11 @@ eDVBCISession *eDVBCISession::createSession(eDVBCISlot *slot, const unsigned cha
                printf("RESOURCE MANAGER\n");
                break;
        case 0x00020041:
                printf("RESOURCE MANAGER\n");
                break;
        case 0x00020041:

-//             session=eDVBCIModule::getInstance()->application_manager = new eDVBCIApplicationManagerSession;
+               session=slot->application_manager = new eDVBCIApplicationManagerSession;

                printf("APPLICATION MANAGER\n");
                break;
        case 0x00030041:
                printf("APPLICATION MANAGER\n");
                break;
        case 0x00030041:

-//             session=eDVBCIModule::getInstance()->ca_manager=new eDVBCICAManagerSession;
+               session=slot->ca_manager=new eDVBCICAManagerSession;

                printf("CA MANAGER\n");
                break;
        case 0x00240041:
                printf("CA MANAGER\n");
                break;
        case 0x00240041: