Origin commit data
------------------
Branch: master
Commit: 76c498c2a9
Author: max_10 <max_10@gmx.de>
Date: 2014-06-04 (Wed, 04 Jun 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2014-06-04 22:07:42 +02:00
parent 401d0984ec
commit 6fcb08c58f
4 changed files with 5 additions and 4 deletions

View File

@@ -26,7 +26,6 @@ hw_caps_t *get_hwcaps(void)
memset(&caps, 0, sizeof(hw_caps_t)); memset(&caps, 0, sizeof(hw_caps_t));
initialized = 1; initialized = 1;
const char *tmp;
char buf[64]; char buf[64];
int len = -1; int len = -1;
int fd = open("/proc/stb/info/model", O_RDONLY); int fd = open("/proc/stb/info/model", O_RDONLY);

View File

@@ -36,7 +36,7 @@ int eDVBCICAManagerSession::receivedAPDU(const unsigned char *tag, const void *d
printf("%04x ", (((const unsigned char*)data)[i] << 8) | (((const unsigned char*)data)[i + 1])); printf("%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]));
} }
sort(caids.begin(), caids.end()); std::sort(caids.begin(), caids.end());
printf("\n"); printf("\n");
slot->pollConnection = false; slot->pollConnection = false;

View File

@@ -36,7 +36,7 @@ int eDVBCIResourceManagerSession::receivedAPDU(const unsigned char *tag, const v
state = stateFinal; state = stateFinal;
break; break;
default: default:
printf("%s %s unknown APDU tag 9F 80 %02x\n", tag[2], FILENAME, __FUNCTION__); printf("%s %s unknown APDU tag 9F 80 %02x\n", FILENAME, __FUNCTION__, tag[2]);
} }
} }
return 0; return 0;

View File

@@ -88,6 +88,7 @@ void eDVBCISession::sendSPDU(tSlot *slot, unsigned char tag, const void *data, i
if (apdu) if (apdu)
memcpy(ptr, apdu, alen); memcpy(ptr, apdu, alen);
ptr += alen; ptr += alen;
sendData(slot, pkt, ptr - pkt); sendData(slot, pkt, ptr - pkt);
} }
@@ -110,6 +111,7 @@ void eDVBCISession::recvCreateSessionResponse(const unsigned char *data)
void eDVBCISession::recvCloseSessionRequest(const unsigned char *data) void eDVBCISession::recvCloseSessionRequest(const unsigned char *data)
{ {
status = data[0];
state = stateInDeletion; state = stateInDeletion;
action = 1; action = 1;
printf("close Session Request\n"); printf("close Session Request\n");
@@ -145,7 +147,7 @@ eDVBCISession* eDVBCISession::createSession(tSlot *slot, const unsigned char *re
tag |= resource_identifier[2] << 8; tag |= resource_identifier[2] << 8;
tag |= resource_identifier[3]; tag |= resource_identifier[3];
printf("Tag: %08X\n", tag); printf("Tag: %08lx\n", tag);
switch (tag) switch (tag)
{ {