frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved resetting CAM connections

This commit is contained in:
Klaus Schmidinger 2005-06-04 11:59:19 +02:00
parent eecf0b6616
commit a8599c451e
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1187,6 +1187,7 @@ Marco Schl
level from being set to a wrong value level from being set to a wrong value
for fixing a possible hangup when ending a replay session while cIndexFile::CatchUp() for fixing a possible hangup when ending a replay session while cIndexFile::CatchUp()
is waiting is waiting
for improving resetting CAM connections
Jürgen Schmitz <j.schmitz@web.de> Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP for reporting a bug in displaying the current channel when switching via the SVDRP

3
HISTORY
View File

@ -3578,9 +3578,10 @@ Video Disk Recorder Revision History
- Added cThread::SetPriority() and using it in cSectionHandler::Action() to - Added cThread::SetPriority() and using it in cSectionHandler::Action() to
reduce the priority of the section handler threads (as suggested by Georg Acher). reduce the priority of the section handler threads (as suggested by Georg Acher).
2005-06-03: Version 1.3.26 2005-06-04: Version 1.3.26
- Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed handling 'summary.vdr' files with more than two empty lines (thanks to - Fixed handling 'summary.vdr' files with more than two empty lines (thanks to
Christian Jacobsen for reporting this one). Christian Jacobsen for reporting this one).
- Improved resetting CAM connections (thanks to Marco Schlüßler).

21
ci.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: ci.c 1.23 2004/07/17 14:36:11 kls Exp $ * $Id: ci.c 1.24 2005/06/04 11:57:05 kls Exp $
*/ */
#include "ci.h" #include "ci.h"
@ -287,6 +287,7 @@ public:
int RecvData(void); int RecvData(void);
const uint8_t *Data(int &Length); const uint8_t *Data(int &Length);
//XXX Close() //XXX Close()
void Reset(void);
}; };
cCiTransportConnection::cCiTransportConnection(void) cCiTransportConnection::cCiTransportConnection(void)
@ -428,6 +429,11 @@ int cCiTransportConnection::Poll(void)
return ERROR; return ERROR;
} }
void cCiTransportConnection::Reset(void)
{
Init(-1, 0, 0);
}
// --- cCiTransportLayer ----------------------------------------------------- // --- cCiTransportLayer -----------------------------------------------------
#define MAX_CI_CONNECT 16 // maximum possible value is 254 #define MAX_CI_CONNECT 16 // maximum possible value is 254
@ -440,7 +446,7 @@ private:
public: public:
cCiTransportLayer(int Fd, int NumSlots); cCiTransportLayer(int Fd, int NumSlots);
cCiTransportConnection *NewConnection(int Slot); cCiTransportConnection *NewConnection(int Slot);
bool ResetSlot(int Slot); bool ResetSlot(int Slot, bool Wait = false);
bool ModuleReady(int Slot); bool ModuleReady(int Slot);
cCiTransportConnection *Process(int Slot); cCiTransportConnection *Process(int Slot);
}; };
@ -451,6 +457,7 @@ cCiTransportLayer::cCiTransportLayer(int Fd, int NumSlots)
numSlots = NumSlots; numSlots = NumSlots;
for (int s = 0; s < numSlots; s++) for (int s = 0; s < numSlots; s++)
ResetSlot(s); ResetSlot(s);
cCondWait::SleepMs(2000);
} }
cCiTransportConnection *cCiTransportLayer::NewConnection(int Slot) cCiTransportConnection *cCiTransportLayer::NewConnection(int Slot)
@ -467,10 +474,16 @@ cCiTransportConnection *cCiTransportLayer::NewConnection(int Slot)
return NULL; return NULL;
} }
bool cCiTransportLayer::ResetSlot(int Slot) bool cCiTransportLayer::ResetSlot(int Slot, bool Wait)
{ {
for (int i = 0; i < MAX_CI_CONNECT; i++) {
if (tc[i].State() != stIDLE && tc[i].Slot() == Slot)
tc[i].Reset();
}
dbgprotocol("Resetting slot %d...", Slot); dbgprotocol("Resetting slot %d...", Slot);
if (ioctl(fd, CA_RESET, 1 << Slot) != -1) { if (ioctl(fd, CA_RESET, 1 << Slot) != -1) {
if (Wait)
cCondWait::SleepMs(2000);
dbgprotocol("ok.\n"); dbgprotocol("ok.\n");
return true; return true;
} }
@ -1602,5 +1615,5 @@ bool cCiHandler::Reset(int Slot)
{ {
cMutexLock MutexLock(&mutex); cMutexLock MutexLock(&mutex);
CloseAllSessions(Slot); CloseAllSessions(Slot);
return tpl->ResetSlot(Slot); return tpl->ResetSlot(Slot, true);
} }