- Timestamp:
- 01/09/10 23:09:02 (14 years ago)
- Location:
- branches/monitor-improvement
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/monitor-improvement/Makefile
r1140 r1154 346 346 DS_ST=mips-sgi-irix6.5-strip 347 347 348 cross-mipsel-router-linux-uclibc: cross-mipsel-router-linux-uclibc929349 348 ###################################################################### 350 349 # … … 378 377 @-$(MAKE) --no-print-directory \ 379 378 -f Maketype TYP=$(subst cross-,,$@) \ 380 OS_LIBS="-l m" \379 OS_LIBS="-lcrypto -lm" \ 381 380 OS_CULI="-lncurses" \ 382 381 OS_PTLI="-lpthread" \ -
branches/monitor-improvement/README
r1117 r1154 30 30 CS_ANTICASC - enable anti-cascading 31 31 CS_LOGHISTORY - enable log history 32 CS_WITH_GBOX - enable gbox support 32 33 HAVE_DVBAPI - enable DVB API support 33 34 -
branches/monitor-improvement/oscam-config.c
r1149 r1154 31 31 TAG_CS357X, // camd 3.5x UDP 32 32 TAG_CS378X, // camd 3.5x TCP 33 #ifdef CS_WITH_GBOX 33 #ifdef CS_WITH_GBOX 34 34 TAG_GBOX, // gbox 35 35 #endif … … 41 41 } cs_proto_type_t; 42 42 43 static char *cctag[]={"global", "monitor", "camd33", "camd35", 43 static char *cctag[]={"global", "monitor", "camd33", "camd35", 44 44 "newcamd", "radegast", "serial", "cs357x", "cs378x", 45 #ifdef CS_WITH_GBOX 46 47 #endif 48 45 #ifdef CS_WITH_GBOX 46 "gbox", 47 #endif 48 "cccam", "dvbapi", 49 49 #ifdef CS_ANTICASC 50 50 "anticasc", … … 531 531 532 532 #ifdef CS_WITH_GBOX 533 void chk_t_gbox(char *token, char *value)533 static void chk_t_gbox(char *token, char *value) 534 534 { 535 535 // if (!strcmp(token, "password")) strncpy(cfg->gbox_pwd, i2b(4, a2i(value, 4)), 4); -
branches/monitor-improvement/oscam-simples.c
r1140 r1154 235 235 return ((b[0]<<16) | (b[1]<<8) | b[2]); 236 236 case 4: 237 return (( b[0]<<24) | (b[1]<<16) | (b[2]<<8) | b[3]);237 return (((b[0]<<24) | (b[1]<<16) | (b[2]<<8) | b[3]) & 0xffffffffL); 238 238 default: 239 239 cs_log("Error in b2i, n=%i",n); -
branches/monitor-improvement/reader-common.c
r1140 r1154 75 75 #ifdef HAVE_PCSC 76 76 if (reader[ridx].typ == R_PCSC) { 77 return pcsc_reader_do_api(&reader[ridx], buf, cta_res, &cta_lr,l);77 return (dad == 0) ? pcsc_reader_do_api(&reader[ridx], buf, cta_res, &cta_lr,l) : 0; 78 78 } 79 79
Note:
See TracChangeset
for help on using the changeset viewer.