git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
translations
[enigma2.git]
/
lib
/
dvb_ci
/
dvbci.cpp
diff --git
a/lib/dvb_ci/dvbci.cpp
b/lib/dvb_ci/dvbci.cpp
index 22da5187a1984d4588bcc78fc3a0dbb433c03c45..e3fd93849b9fe41e49272cc4d0eb25cccb77d0fd 100644
(file)
--- a/
lib/dvb_ci/dvbci.cpp
+++ b/
lib/dvb_ci/dvbci.cpp
@@
-116,14
+116,24
@@
int eDVBCIInterfaces::answerText(int slotid, int answer)
return slot->answerText(answer);
}
return slot->answerText(answer);
}
-int eDVBCIInterfaces::answerEnq(int slotid,
int answer,
char *value)
+int eDVBCIInterfaces::answerEnq(int slotid, char *value)
{
eDVBCISlot *slot;
if( (slot = getSlot(slotid)) == 0 )
return -1;
{
eDVBCISlot *slot;
if( (slot = getSlot(slotid)) == 0 )
return -1;
- return slot->answerEnq(answer, value);
+ return slot->answerEnq(value);
+}
+
+int eDVBCIInterfaces::cancelEnq(int slotid)
+{
+ eDVBCISlot *slot;
+
+ if( (slot = getSlot(slotid)) == 0 )
+ return -1;
+
+ return slot->cancelEnq();
}
void eDVBCIInterfaces::addPMTHandler(eDVBServicePMTHandler *pmthandler)
}
void eDVBCIInterfaces::addPMTHandler(eDVBServicePMTHandler *pmthandler)
@@
-189,8
+199,7
@@
void eDVBCIInterfaces::gotPMT(eDVBServicePMTHandler *pmthandler)
// HACK this assigns ALL RUNNING SERVICES to the first free CI !!!
for (eSmartPtrList<eDVBCISlot>::iterator ci_it(m_slots.begin()); ci_it != m_slots.end(); ++ci_it)
{
// HACK this assigns ALL RUNNING SERVICES to the first free CI !!!
for (eSmartPtrList<eDVBCISlot>::iterator ci_it(m_slots.begin()); ci_it != m_slots.end(); ++ci_it)
{
- /*
- eDVBCISlot **usedby = &it->usedby;
+/* eDVBCISlot **usedby = &it->usedby;
*usedby = ci_it;
(*usedby)->resetPrevSentCAPMTVersion();
break;
*usedby = ci_it;
(*usedby)->resetPrevSentCAPMTVersion();
break;
@@
-368,9
+377,19
@@
int eDVBCISlot::getMMIState()
return 0;
}
return 0;
}
-int eDVBCISlot::answerEnq(
int answer,
char *value)
+int eDVBCISlot::answerEnq(char *value)
{
{
- printf("edvbcislot: answerMMI(%d,%s)\n", answer, value);
+ printf("edvbcislot: answerENQ(%s)\n", value);
+ return 0;
+}
+
+int eDVBCISlot::cancelEnq()
+{
+ printf("edvbcislot: cancelENQ\n");
+
+ if(mmi_session)
+ mmi_session->cancelEnq();
+
return 0;
}
return 0;
}
@@
-412,7
+431,7
@@
int eDVBCISlot::sendCAPMT(eDVBServicePMTHandler *pmthandler, const std::vector<u
int i=0;
int lenbytes = raw_data[3] & ~0x80;
while(i < lenbytes)
int i=0;
int lenbytes = raw_data[3] & ~0x80;
while(i < lenbytes)
- wp
|= (raw_data[4+i] << (8 * i++))
;
+ wp
= (wp << 8) | raw_data[4 + i++]
;
wp+=4;
wp+=lenbytes;
hlen = 4 + lenbytes;
wp+=4;
wp+=lenbytes;
hlen = 4 + lenbytes;