Changeset 15365

Timestamp:

04/27/12 00:46:33 (11 years ago)

Author:

nit

Message:

cleanup

Location:

titan/titan

Files:

• struct.h (modified) (2 diffs)
• titan.c (modified) (1 diff)

titan/titan/struct.h

@@ -123 +123 @@
 #define EPGSCANLOG "/tmp/epgscan.log"
 #define MAXCHANNELHISTORY 6
-
-#define HTTPAUTH "aXBrLUdaRmg6RkhaVkJHaG56ZnZFaEZERlRHenVpZjU2NzZ6aGpHVFVHQk5Iam0="
+#define HILO(x) (x##_hi << 8 | x##_lo)
 
 //CA Defines
@@ -1152 +1151 @@
         unsigned char* buf2;
 } writeFBfile;
-        
-        
-#define HILO(x) (x##_hi << 8 | x##_lo)
-
-/*
-#define HILO2(x) (x##1 << 8 | x##2)
-#define HILO3(x) (x##1 << 16 | x##2 << 8 | x##3)
-#define HILO4(x) (x##4 << 24 | x##2 << 16 | x##3 << 8 | x##4)
-
-#define MjdToEpochTime(x) ((HILO(x)-40587)*86400)
-#define BcdTimeToSeconds(x) ((3600 * ((10*((x##_h & 0xF0)>>4)) + (x##_h & 0xF))) + \
-                             (60 * ((10*((x##_m & 0xF0)>>4)) + (x##_m & 0xF))) + \
-                             ((10*((x##_s & 0xF0)>>4)) + (x##_s & 0xF)))
-#define BcdTimeToMinutes(x) ((60 * ((10*((x##_h & 0xF0)>>4)) + (x##_h & 0xF))) + \
-                             (((10*((x##_m & 0xF0)>>4)) + (x##_m & 0xF))))
-#define BcdCharToInt(x) (10*((x & 0xF0)>>4) + (x & 0xF))
-#define CheckBcdChar(x) ((((x & 0xF0)>>4) <= 9) && \
-                         ((x & 0x0F) <= 9))
-#define CheckBcdSignedChar(x) ((((x & 0xF0)>>4) >= 0) && (((x & 0xF0)>>4) <= 9) && \
-                         ((x & 0x0F) >= 0) && ((x & 0x0F) <= 9))
-
-#define GetSectionLength(x) HILO(((si_tab_t *)(x))->section_length)
-#define GetServiceId(x) HILO(((eit_t *)(x))->service_id)
-#define GetLastTableId(x) ((eit_t *)(x))->segment_last_table_id
-#define GetSegmentLastSectionNumber(x) ((eit_t *)(x))->segment_last_section_number
-#define GetPrivateDataSpecifier(x) HILO4(((descr_private_data_specifier_t *)x)->private_data_specifier)
-*/
 
 struct eit

titan/titan/titan.c

@@ -5 +5 @@
 #include "sock.h"
 
-
 #define SYSCODE 0
+#define HTTPAUTH "aXBrLUdaRmg6RkhaVkJHaG56ZnZFaEZERlRHenVpZjU2NzZ6aGpHVFVHQk5Iam0="
 
 struct clist *config[LISTHASHSIZE] = {NULL};