From: leslie <unknown>
Date: Wed, 22 Jul 2009 13:23:49 +0000 (+0800)
Subject: sc-nagra: fix CAID range (emunation)
X-Git-Tag: 0.9.3~14
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=b3bb4110df138fd286c1bd678f9948c917487b3c;p=sasc-ng.git

sc-nagra: fix CAID range (emunation)
---

diff --git a/systems/sc-nagra/sc-nagra.c b/systems/sc-nagra/sc-nagra.c
index 7a17be6..3ce16c5 100644
--- a/systems/sc-nagra/sc-nagra.c
+++ b/systems/sc-nagra/sc-nagra.c
@@ -32,11 +32,10 @@
 
 SCAPIVERSTAG();
 
-#define SYSTEM_NAGRA         0x1801
+#define SYSTEM_NAGRA         0x1800
 
 #define SYSTEM_NAME          "SC-Nagra"
 #define SYSTEM_PRI           -5
-#define SYSTEM_CAN_HANDLE(x) ((x)==SYSTEM_NAGRA)
 
 #define SC_NAME "Nagra"
 #define SC_ID   MAKE_SC_ID('N','a','g','r')
@@ -85,7 +84,7 @@ cSystemLinkScNagra::cSystemLinkScNagra(void)
 
 bool cSystemLinkScNagra::CanHandle(unsigned short SysId)
 {
-  return smartcards.HaveCard(SC_ID) && SYSTEM_CAN_HANDLE(SysId);
+  return smartcards.HaveCard(SC_ID) && ((SysId&SYSTEM_MASK)==SYSTEM_NAGRA && (SysId&0xFF)>0);
 }
 
 // -- cCamCryptNagra ------------------------------------------------------------------