From: leslie <unknown>
Date: Thu, 8 Sep 2011 23:58:42 +0000 (+0800)
Subject: sasc: fix calling SetCaDescr
X-Git-Tag: upstream/620~24
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=38dafc9ae0f0747f91a490ed5dbf47558a5ed48c;p=sasc-ng.git

sasc: fix calling SetCaDescr
---

diff --git a/cam.c b/cam.c
index 6fc59f4..8f4f6d3 100644
--- a/cam.c
+++ b/cam.c
@@ -2561,9 +2561,9 @@ void cCam::WriteCW(int index, unsigned char *cw, bool force)
 
 bool cCam::SetCaDescr(ca_descr_t *ca_descr, bool initial)
 {
-#ifndef SASC
   if(!softcsa || (fullts && ca_descr->index==0))
     return devplugin->SetCaDescr(device,ca_descr,initial);
+#ifndef SASC
   else if(decsa)
     return decsa->SetDescr(ca_descr,initial);
 #endif //!SASC
@@ -2572,9 +2572,9 @@ bool cCam::SetCaDescr(ca_descr_t *ca_descr, bool initial)
 
 bool cCam::SetCaPid(ca_pid_t *ca_pid)
 {
-#ifndef SASC
   if(!softcsa || (fullts && ca_pid->index==0))
     return devplugin->SetCaPid(device,ca_pid);
+#ifndef SASC
   else if(decsa)
     return decsa->SetCaPid(ca_pid);
 #endif //!SASC
@@ -2583,9 +2583,7 @@ bool cCam::SetCaPid(ca_pid_t *ca_pid)
 
 void cCam::DumpAV7110(void)
 {
-#ifndef SASC
   devplugin->DumpAV(device);
-#endif //!SASC
 }
 
 int cCam::GetFreeIndex(void)
diff --git a/contrib/sasc-ng/sc/sasccam.cpp b/contrib/sasc-ng/sc/sasccam.cpp
index 277176b..0704aa5 100644
--- a/contrib/sasc-ng/sc/sasccam.cpp
+++ b/contrib/sasc-ng/sc/sasccam.cpp
@@ -35,9 +35,6 @@
 #define DVBDEVICE cDvbDevice
 #define OWN_SETCA
 #include "device-tmpl.c"
-#undef SCDEVICE
-#undef DVBDEVICE
-#undef OWN_SETCA
 
 extern void _SetCaDescr(int adapter, ca_descr_t *ca_descr);
 extern void _SetCaPid(int adapter, ca_pid_t *ca_pid);