Changeset 2104

Timestamp:

04/16/10 15:39:03 (14 years ago)

Author:

_network

Message:

modular: add compiling without debug messages

Location:

branches/modular

Files:

• config.sh (modified) (2 diffs)
• globals.h (modified) (4 diffs)
• oscam-config.h (modified) (2 diffs)
• oscam-log.c (modified) (6 diffs)
• oscam-types.h (modified) (1 diff)

branches/modular/config.sh

@@ -13 +13 @@
 fi
 
-addons="WEBIF HAVE_DVBAPI IRDETO_GUESSING"
+addons="WEBIF HAVE_DVBAPI IRDETO_GUESSING WITH_DEBUG"
 protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_RADEGAST MODULE_SERIAL MODULE_MONITOR"
 readers="WITH_CARDREADER READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE"
@@ -63 +63 @@
         HAVE_DVBAPI     "DVB-API"       $(check_test "HAVE_DVBAPI") \
         IRDETO_GUESSING "Irdeto Guessing"   $(check_test "IRDETO_GUESSING") \
+        WITH_DEBUG      "Debug messages"    $(check_test "WITH_DEBUG") \
         2> ${tempfile}
 

branches/modular/globals.h

@@ -41 +41 @@
 #endif
 
+#include "oscam-config.h"
+
+#ifdef WITH_DEBUG
 #define call(arg) \
     if (arg) { \
@@ -46 +49 @@
         return ERROR; \
     }
-
-#include "oscam-config.h"
+#else
+#define call(arg) arg
+#endif
+
 #ifndef USE_CMAKE
 #  include "oscam-ostype.h"
@@ -1039 +1044 @@
 extern void cs_write_log(char *);
 extern void cs_log(char *,...);
+#ifdef WITH_DEBUG
 extern void cs_debug(char *,...);
 extern void cs_debug_nolf(char *,...);
@@ -1044 +1050 @@
 extern void cs_ddump(uchar *, int, char *, ...);
 extern void cs_ddump_mask(unsigned short, uchar *, int, char *, ...);
+#else
+#define cs_debug(...)
+#define cs_debug_mask(...)
+#define cs_debug_nolf(...)
+#define cs_ddump(...)
+#define cs_ddump_mask(...)
+#endif
 extern void cs_close_log(void);
 extern int  cs_init_statistics(char *);

branches/modular/oscam-config.h

@@ -9 +9 @@
 #ifndef IRDETO_GUESSING
 //#define IRDETO_GUESSING
+#endif
+
+#ifndef WITH_DEBUG
+#define WITH_DEBUG
 #endif
 
@@ -52 +56 @@
 #ifdef WITH_CARDREADER
 #ifndef READER_NAGRA
-//#define READER_NAGRA
+#define READER_NAGRA
 #endif
 

branches/modular/oscam-log.c

@@ -226 +226 @@
     fp=(FILE *)0;
 }
-
+#ifdef WITH_DEBUG
 void cs_debug(char *fmt,...)
 {
+
     char txt[256];
 
@@ -241 +242 @@
         write_to_log(-1, txt);
     }
+
 }
 
 void cs_debug_mask(unsigned short mask, char *fmt,...)
 {
+
     char txt[256];
     if (client[cs_idx].dbglvl & mask)
@@ -255 +258 @@
         write_to_log(-1, txt);
     }
+
 }
 
@@ -275 +279 @@
     }
 }
-
+#endif
 void cs_dump(uchar *buf, int n, char *fmt, ...)
 {
@@ -299 +303 @@
     }
 }
-
+#ifdef WITH_DEBUG
 void cs_ddump(uchar *buf, int n, char *fmt, ...)
 {
@@ -355 +359 @@
     }
 }
-
+#endif
 int cs_init_statistics(char *file) 
 {

branches/modular/oscam-types.h

@@ -20 +20 @@
  #ifdef OS_MACOSX
     #include <machine/endian.h>
+    #define __BYTE_ORDER __DARWIN_BYTE_ORDER 
+    #define __BIG_ENDIAN    __DARWIN_BIG_ENDIAN 
+    #define __LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN
  #else
     #include <endian.h>