irdeto: fix CAID range and priority

diff --git a/systems/irdeto/irdeto.h b/systems/irdeto/irdeto.h
index cd95caaeb682555916be961b6760e20841d86dcf..2a6f0aaabf94f6b2485b3ef5887cbab6333e6964 100644 (file)
--- a/systems/irdeto/irdeto.h
+++ b/systems/irdeto/irdeto.h
@@ -24,8 +24,9 @@
 #define SYSTEM_BETA          0x1700\r
 \r
 #define SYSTEM_NAME          "Irdeto"\r
-#define SYSTEM_NAME2         "Irdeto2"\r
 #define SYSTEM_PRI           -10\r
+#define SYSTEM_NAME2         "Irdeto2"\r
+#define SYSTEM_PRI2          -8\r
 \r
 #define TYPE_I1   0\r
 #define TYPE_OP   1\r

diff --git a/systems/irdeto/irdeto1.c b/systems/irdeto/irdeto1.c
index b3285fdded22752a65f2f1fa1c081a0b56f5d33d..a54b17c652ecf38d06a5a9b8649da677490b913f 100644 (file)
--- a/systems/irdeto/irdeto1.c
+++ b/systems/irdeto/irdeto1.c
@@ -254,7 +254,7 @@ bool cSystemIrd::ProcessECM(const cEcmInfo *ecm, unsigned char *source)
     index+=len;
     }
   if(data==0 || date==-1) {
-    PRINTF(L_SYS_ECM,"incomplete ECM structure");
+    if(doLog) PRINTF(L_SYS_ECM,"incomplete ECM structure");
     return false;
     }
 
@@ -462,5 +462,5 @@ cSystemLinkIrd::cSystemLinkIrd(void)
 
 bool cSystemLinkIrd::CanHandle(unsigned short SysId)
 {
-  return SysId==SYSTEM_IRDETO || (SysId&SYSTEM_MASK)==SYSTEM_BETA;
+  return (SysId&SYSTEM_MASK)==SYSTEM_IRDETO || (SysId&SYSTEM_MASK)==SYSTEM_BETA;
 }

diff --git a/systems/irdeto/irdeto2.c b/systems/irdeto/irdeto2.c
index 82591282f03ccf3de9dd1c54abb4a2661cfa9abe..56b6df6a2ce0d20b5250a16904e4284df7b746f6 100644 (file)
--- a/systems/irdeto/irdeto2.c
+++ b/systems/irdeto/irdeto2.c
@@ -127,7 +127,7 @@ public:
   };
 
 cSystemIrd2::cSystemIrd2(void)
-:cSystem(SYSTEM_NAME2,SYSTEM_PRI)
+:cSystem(SYSTEM_NAME2,SYSTEM_PRI2)
 {
   hasLogger=true;
 }
@@ -273,7 +273,7 @@ public:
 static cSystemLinkIrd2 staticInit2;
 
 cSystemLinkIrd2::cSystemLinkIrd2(void)
-:cSystemLink(SYSTEM_NAME2,SYSTEM_PRI)
+:cSystemLink(SYSTEM_NAME2,SYSTEM_PRI2)
 {
   Feature.NeedsKeyFile();
 }