[vdr] [PATCH] CAM handling

[Hans-Peter Raschke <Hans-Peter.Raschke@Wintermann-DatenService.de>]

Hello,

I would like to post a patch which made my SkyCrypt-CAM working 
(decrypting) with the ll-version of the firmware. So it would be fine if 
CAM-owners (not only SkyCrypt) could test this patch and report their 
results to the list. Menue issues and communication problems of the CAM 
are not cured.

This patch is against plain vdr-1.2.2. The linuxdvb version is 1.0.0.

Hans-Peter
--- ./vdr-1.2.2-orig/dvbdevice.c	2003-05-24 15:23:51.000000000 +0200
+++ ./vdr-1.2.2-ll/dvbdevice.c	2003-08-23 21:49:37.000000000 +0200
@@ -274,15 +274,22 @@
                            int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), ciHandler->GetCaSystemIds(Slot), sizeof(buffer), buffer);
                            if (length > 0) {
                               cCiCaPmt CaPmt(channel.Sid());
-                              CaPmt.AddCaDescriptor(length, buffer);
-                              if (channel.Vpid())
+                              if (channel.Vpid()) {
                                  CaPmt.AddPid(channel.Vpid());
-                              if (channel.Apid1())
+                                 CaPmt.AddCaDescriptor(length, buffer);
+                                 }
+                              if (channel.Apid1()) {
                                  CaPmt.AddPid(channel.Apid1());
-                              if (channel.Apid2())
+                                 CaPmt.AddCaDescriptor(length, buffer);
+                                 }
+                              if (channel.Apid2()) {
                                  CaPmt.AddPid(channel.Apid2());
-                              if (channel.Dpid1())
+                                 CaPmt.AddCaDescriptor(length, buffer);
+                                 }
+                              if (channel.Dpid1()) {
                                  CaPmt.AddPid(channel.Dpid1());
+                                 CaPmt.AddCaDescriptor(length, buffer);
+                                 }
                               if (ciHandler->SetCaPmt(CaPmt, Slot)) {
                                  tunerStatus = tsCam;
                                  startTime = 0;