From: leslie <unknown>
Date: Sat, 6 Sep 2008 04:39:28 +0000 (+0800)
Subject: irdeto: fix CAID range and priority
X-Git-Tag: 0.9.1~27
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=ca9dd7ea0f1c9ae748e1b49f64c30c73baff80f2;p=sasc-ng.git

irdeto: fix CAID range and priority
---

diff --git a/systems/irdeto/irdeto.h b/systems/irdeto/irdeto.h
index cd95caa..2a6f0aa 100644
--- a/systems/irdeto/irdeto.h
+++ b/systems/irdeto/irdeto.h
@@ -24,8 +24,9 @@
 #define SYSTEM_BETA          0x1700
 
 #define SYSTEM_NAME          "Irdeto"
-#define SYSTEM_NAME2         "Irdeto2"
 #define SYSTEM_PRI           -10
+#define SYSTEM_NAME2         "Irdeto2"
+#define SYSTEM_PRI2          -8
 
 #define TYPE_I1   0
 #define TYPE_OP   1
diff --git a/systems/irdeto/irdeto1.c b/systems/irdeto/irdeto1.c
index b3285fd..a54b17c 100644
--- 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 8259128..56b6df6 100644
--- 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();
 }