summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-03-19 17:07:10 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2003-03-19 17:07:10 +0100
commite76f9858400b0fa0df8feadbd891ab9066f76a14 (patch)
tree82f43bc102b8a248546e25ee0ce588555b9921e0
parentefcb48432d0642bfd2fa751162e90b908829bf35 (diff)
downloadvdr-1.1.26.tar.gz
vdr-1.1.26.tar.bz2
Fixed support for Viaccess CAMs1.1.26
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY3
-rw-r--r--ci.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 799069ff..09a2bd6b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -87,6 +87,7 @@ Peter Hofmann <software@pxh.de>
Axel Gruber <axel@agm.de>
for his support in keeping the Premiere World channels up to date in 'channels.conf'
+ for helping to debug support for Viaccess CAMs
Arnold Niessen <niessen@iae.nl> <arnold.niessen@philips.com>
for translating OSD texts to the Dutch language
diff --git a/HISTORY b/HISTORY
index 71b7a79f..a5c70f0b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1971,7 +1971,7 @@ Video Disk Recorder Revision History
reporting this one).
- Broken CAM connections are now restored automatically.
-2003-03-16: Version 1.1.26
+2003-03-19: Version 1.1.26
- Removed signal handling and usleep(5000) from cDvbOsd::Cmd() (apparently this
is no longer necessary with DVB driver 1.0.0pre2 or later).
@@ -1986,3 +1986,4 @@ Video Disk Recorder Revision History
Torsten Herz for reporting this one).
- Modified the EPG scanner to avoid CPU load peaks (thanks to Steffen Becker for
reporting this one).
+- Fixed support for Viaccess CAMs (thanks to Axel Gruber for helping to debug this).
diff --git a/ci.c b/ci.c
index d345a3ef..62bbed7e 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: ci.c 1.7 2003/02/16 11:20:55 kls Exp $
+ * $Id: ci.c 1.8 2003/03/16 22:32:47 kls Exp $
*/
/* XXX TODO
@@ -1232,7 +1232,7 @@ cCiCaPmt::cCiCaPmt(int ProgramNumber)
capmt[length++] = CPLM_ONLY;
capmt[length++] = (ProgramNumber >> 8) & 0xFF;
capmt[length++] = ProgramNumber & 0xFF;
- capmt[length++] = 0x00; //XXX version_number, current_next_indicator - apparently may be 0x00
+ capmt[length++] = 0x01; // version_number, current_next_indicator - apparently vn doesn't matter, but cni must be 1
esInfoLengthPos = length;
capmt[length++] = 0x00; // program_info_length H (at program level)
capmt[length++] = 0x00; // program_info_length L