git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NimManager.py: another fix of satellite sort order .. now we sort from the westernmos...
[enigma2.git]
/
lib
/
dvb_ci
/
dvbci_camgr.cpp
diff --git
a/lib/dvb_ci/dvbci_camgr.cpp
b/lib/dvb_ci/dvbci_camgr.cpp
index cd10ae33e4ce4e3e6b737bc3e1f98ab73a418f84..42317b3e58a0a97e8884db6a2057cc2e3bbb1afc 100644
(file)
--- a/
lib/dvb_ci/dvbci_camgr.cpp
+++ b/
lib/dvb_ci/dvbci_camgr.cpp
@@
-1,5
+1,6
@@
/* DVB CI CA Manager */
/* DVB CI CA Manager */
+#include <lib/base/eerror.h>
#include <lib/dvb_ci/dvbci_camgr.h>
eDVBCICAManagerSession::eDVBCICAManagerSession(eDVBCISlot *tslot)
#include <lib/dvb_ci/dvbci_camgr.h>
eDVBCICAManagerSession::eDVBCICAManagerSession(eDVBCISlot *tslot)
@@
-15,27
+16,28
@@
eDVBCICAManagerSession::~eDVBCICAManagerSession()
int eDVBCICAManagerSession::receivedAPDU(const unsigned char *tag, const void *data, int len)
{
int eDVBCICAManagerSession::receivedAPDU(const unsigned char *tag, const void *data, int len)
{
-
printf
("SESSION(%d)/CA %02x %02x %02x: ", session_nb, tag[0], tag[1],tag[2]);
+
eDebugNoNewLine
("SESSION(%d)/CA %02x %02x %02x: ", session_nb, tag[0], tag[1],tag[2]);
for (int i=0; i<len; i++)
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 0x31:
if ((tag[0]==0x9f) && (tag[1]==0x80))
{
switch (tag[2])
{
case 0x31:
-
printf("ca info:\n
");
+
eDebug("ca info:
");
for (int i=0; i<len; i+=2)
{
for (int i=0; i<len; i+=2)
{
-
printf
("%04x ", (((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
+
eDebugNoNewLine
("%04x ", (((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
caids.push_back((((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
}
caids.push_back((((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
}
- slot->resendCAPMT();
- printf("\n");
+ std::sort(caids.begin(), caids.end());
+ eDebug("");
+ eDVBCIInterfaces::getInstance()->recheckPMTHandlers();
break;
default:
break;
default:
-
printf("unknown APDU tag 9F 80 %02x\n
", tag[2]);
+
eDebug("unknown APDU tag 9F 80 %02x
", tag[2]);
break;
}
}
break;
}
}
@@
-54,7
+56,7
@@
int eDVBCICAManagerSession::doAction()
return 0;
}
case stateFinal:
return 0;
}
case stateFinal:
-
printf("stateFinal und action! kann doch garnicht sein ;)\n
");
+
eDebug("stateFinal und action! kann doch garnicht sein ;)
");
default:
return 0;
}
default:
return 0;
}
@@
-64,8
+66,8
@@
int eDVBCICAManagerSession::sendCAPMT(unsigned char *data, int len)
{
const unsigned char tag[3]={0x9F, 0x80, 0x32}; // ca_pmt
{
const unsigned char tag[3]={0x9F, 0x80, 0x32}; // ca_pmt
- sendAPDU(tag, data, len);
-
+
sendAPDU(tag, data, len);
+
return 0;
}
return 0;
}