git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add evEnd to (p)core
[enigma2.git]
/
lib
/
dvb_ci
/
dvbci_mmi.cpp
diff --git
a/lib/dvb_ci/dvbci_mmi.cpp
b/lib/dvb_ci/dvbci_mmi.cpp
index 75ca63d850df62efc32ca36e9ad14ff124e0ff72..0efe6b824f1c5f469f5f0a2fffdb35eeac1b58a4 100644
(file)
--- a/
lib/dvb_ci/dvbci_mmi.cpp
+++ b/
lib/dvb_ci/dvbci_mmi.cpp
@@
-19,12
+19,12
@@
return list;
eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot)
{
slot = tslot;
eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot)
{
slot = tslot;
- slot->
mmi_session = this
;
+ slot->
setMMIManager(this)
;
}
eDVBCIMMISession::~eDVBCIMMISession()
{
}
eDVBCIMMISession::~eDVBCIMMISession()
{
- slot->
mmi_session = 0
;
+ slot->
setMMIManager(NULL)
;
}
int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, int len)
}
int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, int len)
@@
-49,7
+49,6
@@
int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
unsigned char *d=(unsigned char*)data;
unsigned char *max=((unsigned char*)d) + len;
int textlen = len - 2;
unsigned char *d=(unsigned char*)data;
unsigned char *max=((unsigned char*)d) + len;
int textlen = len - 2;
- int i;
printf("in enq\n");
printf("in enq\n");
@@
-69,7
+68,7
@@
int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
printf("enq-text: %s\n",str);
printf("enq-text: %s\n",str);
- eDVBCI_UI::getInstance()->mmiScreenEnq(0, blind, alen, convertDVBUTF8(str).c_str());
+ eDVBCI_UI::getInstance()->mmiScreenEnq(0, blind, alen,
(char*)
convertDVBUTF8(str).c_str());
break;
}
break;
}
@@
-111,7
+110,7
@@
int eDVBCIMMISession::receivedAPDU(const unsigned char *tag, const void *data, i
memcpy(str, ((char*)d), textlen);
str[textlen] = '\0';
memcpy(str, ((char*)d), textlen);
str[textlen] = '\0';
- eDVBCI_UI::getInstance()->mmiScreenAddText(0, pos++, convertDVBUTF8(str).c_str());
+ eDVBCI_UI::getInstance()->mmiScreenAddText(0, pos++,
(char*)
convertDVBUTF8(str).c_str());
while (textlen--)
printf("%c", *d++);
while (textlen--)
printf("%c", *d++);
@@
-141,8
+140,9
@@
int eDVBCIMMISession::doAction()
unsigned char tag[]={0x9f, 0x88, 0x02};
unsigned char data[]={0x01, 0x01};
sendAPDU(tag, data, 2);
unsigned char tag[]={0x9f, 0x88, 0x02};
unsigned char data[]={0x01, 0x01};
sendAPDU(tag, data, 2);
- state=stateFakeOK;
- return 1;
+ state=stateIdle;
+ //state=stateFakeOK;
+ //return 1;
break;
}
case stateFakeOK:
break;
}
case stateFakeOK: