Merge branch 'bug_619_ask_for_scan_when_no_default_servicelists_are_avail'

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

diff --git a/lib/dvb_ci/dvbci_resmgr.cpp b/lib/dvb_ci/dvbci_resmgr.cpp
index 69ff611c8605f57c1fb95ad5f1d9c66f3d154903..167400c3f9f1f8df9d61278e370fea3294c1e08f 100644 (file)
--- a/lib/dvb_ci/dvbci_resmgr.cpp
+++ b/lib/dvb_ci/dvbci_resmgr.cpp
@@ -1,29 +1,30 @@
 /* DVB CI Resource Manager */
 
+#include <lib/base/eerror.h>
 #include <lib/dvb_ci/dvbci_resmgr.h>
 
 int eDVBCIResourceManagerSession::receivedAPDU(const unsigned char *tag,const void *data, int len)
 {
-       printf("SESSION(%d) %02x %02x %02x: ", session_nb, tag[0], tag[1], tag[2]);
+       eDebugNoNewLine("SESSION(%d) %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]==0x80))
        {
                switch (tag[2])
                {
                case 0x10:  // profile enquiry
-                       printf("cam fragt was ich kann.\n");
+                       eDebug("cam fragt was ich kann.");
                        state=stateProfileEnquiry;
                        return 1;
                        break;
                case 0x11: // Tprofile
-                       printf("mein cam kann: ");
+                       eDebugNoNewLine("mein cam kann: ");
                        if (!len)
-                               printf("nichts\n");
+                               eDebug("nichts");
                        else
                                for (int i=0; i<len; i++)
-                                       printf("%02x ", ((const unsigned char*)data)[i]);
+                                       eDebugNoNewLine("%02x ", ((const unsigned char*)data)[i]);
 
                        if (state == stateFirstProfileEnquiry)
                        {
@@ -33,7 +34,7 @@ int eDVBCIResourceManagerSession::receivedAPDU(const unsigned char *tag,const vo
                        state=stateFinal;
                        break;
                default:
-                       printf("unknown APDU tag 9F 80 %02x\n", tag[2]);
+                       eDebug("unknown APDU tag 9F 80 %02x", tag[2]);
                }
        }
        
@@ -58,11 +59,11 @@ int eDVBCIResourceManagerSession::doAction()
                state=stateProfileChange;
                return 0;
        }
-  case stateProfileChange:
-  {
-    printf("bla kaputt\n");
-    break;
-  }
+       case stateProfileChange:
+       {
+               eDebug("bla kaputt");
+               break;
+       }
        case stateProfileEnquiry:
        {
                const unsigned char tag[3]={0x9F, 0x80, 0x11};
@@ -71,17 +72,17 @@ int eDVBCIResourceManagerSession::doAction()
                                {0x00, 0x01, 0x00, 0x41},
                                {0x00, 0x02, 0x00, 0x41},
                                {0x00, 0x03, 0x00, 0x41},
-                               {0x00, 0x20, 0x00, 0x41},
+//                             {0x00, 0x20, 0x00, 0x41}, // host control
                                {0x00, 0x24, 0x00, 0x41},
                                {0x00, 0x40, 0x00, 0x41},
-                               {0x00, 0x10, 0x00, 0x41}, // auth.
+//                             {0x00, 0x10, 0x00, 0x41}, // auth.
                        };
                sendAPDU(tag, data, sizeof(data));
                state=stateFinal;
                return 0;
        }
        case stateFinal:
-               printf("stateFinal und action! kann doch garnicht sein ;)\n");
+               eDebug("stateFinal und action! kann doch garnicht sein ;)");
        default:
                break;
        }