From 4c7bb5c05eb6106cd343b73bbfe6a9674a6d8e7d Mon Sep 17 00:00:00 2001
From: leslie <unknown>
Date: Thu, 14 Aug 2008 21:01:12 +0800
Subject: [PATCH] update testing

---
 testing/Makefile    | 11 ++++++-----
 testing/compat.c    |  9 +++++++++
 testing/testECM.c   |  3 +++
 testing/testEMM.c   |  3 +++
 testing/testExtAU.c |  3 +++
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/testing/Makefile b/testing/Makefile
index fe3e178..1a339c7 100644
--- a/testing/Makefile
+++ b/testing/Makefile
@@ -23,7 +23,8 @@ DEFINES  = -DAPIVERSNUM=$(APIVERSNUM) -DAPIVERSION='"$(APIVERSION)"' -DSCAPIVERS
 
 OBJS = misc.o log.o data.o crypto.o parse.o system.o system-common.o smartcard.o network.o filter.o version.o
 SHAREDOBJS = compat.o $(VDRDIR)/tools.o $(VDRDIR)/thread.o
-LIBS = -lpthread -ljpeg -ldl -lcrypto
+LIBS = -lpthread -ljpeg -lcrypto
+DYNLIBS = -ldl $(VDRDIR)/libsi/libsi.a
 
 NOBJS  = $(patsubst %.o,../%.o,$(OBJS))
 
@@ -44,11 +45,11 @@ all: testECM testEMM testN1Emu testN2Emu testN2RunEmu testTPS testExtAU
 
 testECM.o: testECM.c compat.h
 testECM: testECM.o $(SHAREDOBJS) $(NOBJS)
-	$(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) -o $@
+	$(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) $(DYNLIBS) -o $@
 
 testEMM.o: testEMM.c compat.h
 testEMM: testEMM.o $(SHAREDOBJS) $(NOBJS)
-	$(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) -o $@
+	$(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) $(DYNLIBS) -o $@
 
 testN1Emu.o: testN1Emu.c ../systems/nagra/nagra.c ../systems/nagra/nagra1.c ../systems/nagra/cpu.c ../systems/nagra/log-nagra.h
 testN1Emu: testN1Emu.o $(SHAREDOBJS) $(NOBJS)
@@ -70,12 +71,12 @@ testTPS: testTPS.o $(SHAREDOBJS) $(NOBJS)
 
 testExtAU.o: testExtAU.c compat.h
 testExtAU: testExtAU.o $(SHAREDOBJS) $(NOBJS)
-	$(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) -o $@
+	$(CXX) $(CXXFLAGS) -rdynamic $^ $(LIBS) $(DYNLIBS) -o $@
 
 filterhelper: filterhelper.o
 	$(CXX) $(CXXFLAGS) $^ -o $@
 clean:
 	@-rm -f *.o core* *~
-	@-rm -f testECM testEMM testN1Emu testN2Emu testN2RunEmu testTPS
+	@-rm -f testECM testEMM testN1Emu testN2Emu testN2RunEmu testTPS testExtAU
 	@-rm -f filterhelper
 	@-rm -f dump.txt
diff --git a/testing/compat.c b/testing/compat.c
index f6074bc..e731e91 100644
--- a/testing/compat.c
+++ b/testing/compat.c
@@ -50,6 +50,7 @@ void InitAll(const char *cfgdir)
   logcfg.logCon=1;
   logcfg.noTimestamp=1;
   cSystems::ConfigParse("Cardclient.Immediate","0");
+  cSystems::ConfigParse("Viaccess.TpsAU","1");
 
   filemaps.SetCfgDir(cfgdir);
   cStructLoaders::SetCfgDir(cfgdir);
@@ -482,3 +483,11 @@ int cChannel::Transponder(int Frequency, char Polarization)
     }
   return Frequency;
 }
+
+//
+//
+
+int GetCaDescriptors(int Source, int Transponder, int ServiceId, const int *CaSystemIds, int BufSize, uchar *Data, bool &StreamFlag)
+{
+  return 0;
+}
diff --git a/testing/testECM.c b/testing/testECM.c
index 2d61379..24334bb 100644
--- a/testing/testECM.c
+++ b/testing/testECM.c
@@ -8,6 +8,9 @@
 #include "compat.h"
 #include <vdr/sources.h>
 
+#include <libsi/section.h>
+SI::TOT __dummy;
+
 int main(int argc, char *argv[])
 {
   if(argc<6) {
diff --git a/testing/testEMM.c b/testing/testEMM.c
index 5c59c98..9724b77 100644
--- a/testing/testEMM.c
+++ b/testing/testEMM.c
@@ -6,6 +6,9 @@
 #include "system.h"
 #include "compat.h"
 
+#include <libsi/section.h>
+SI::TOT __dummy;
+
 int main(int argc, char *argv[])
 {
   if(argc<4) {
diff --git a/testing/testExtAU.c b/testing/testExtAU.c
index c375d97..ace70df 100644
--- a/testing/testExtAU.c
+++ b/testing/testExtAU.c
@@ -7,6 +7,9 @@
 #include "scsetup.h"
 #include "compat.h"
 
+#include <libsi/section.h>
+SI::TOT __dummy;
+
 void cPlainKeys::TestExternalUpdate(void)
 {
   Lock();
-- 
2.39.5