Changeset 1584
- Timestamp:
- 02/16/10 14:31:04 (14 years ago)
- Location:
- trunk
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/defines.h
r1503 r1584 30 30 31 31 #include "../oscam-config.h" 32 33 /* Define to 1 if you have the `nanosleep' function. */34 #if !defined(OS_AIX) && !defined(OS_SOLARIS) && !defined(OS_OSF5)35 #define HAVE_NANOSLEEP 136 #endif37 38 32 39 33 /* -
trunk/csctapi/ifd_cool.c
r1478 r1584 65 65 call (!ATR_InitFromArray (atr, buf, n) == ATR_OK); 66 66 { 67 struct timespec req_ts; 68 req_ts.tv_sec = 0; 69 req_ts.tv_nsec = 50000000; 70 nanosleep (&req_ts, NULL); 67 cs_sleepms(50); 71 68 return OK; 72 69 } -
trunk/csctapi/ifd_phoenix.c
r1552 r1584 111 111 int i; 112 112 int parity[3] = {PARITY_EVEN, PARITY_ODD, PARITY_NONE}; 113 #ifdef HAVE_NANOSLEEP114 struct timespec req_ts;115 req_ts.tv_sec = 0;116 req_ts.tv_nsec = 50000000;117 #endif118 119 113 call (Phoenix_SetBaudrate (DEFAULT_BAUDRATE)); 120 121 114 for(i=0; i<3; i++) { 122 115 IO_Serial_Flush(); … … 124 117 125 118 ret = ERROR; 126 usleep (500000); //smartreader in mouse mode needs this119 cs_sleepms(500); //smartreader in mouse mode needs this 127 120 IO_Serial_Ioctl_Lock(1); 128 121 #ifdef USE_GPIO … … 132 125 #endif 133 126 IO_Serial_RTS_Set(); 134 #ifdef HAVE_NANOSLEEP 135 nanosleep (&req_ts, NULL); 136 #else 137 usleep (50000L); 138 #endif 127 cs_sleepms(50); 139 128 #ifdef USE_GPIO //felix: set card reset hi (inactive) 140 129 if (gpio_detect) { -
trunk/csctapi/ifd_sci.c
r1583 r1584 117 117 call(!ATR_InitFromArray (atr, buf, n) == ATR_OK); 118 118 { 119 struct timespec req_ts; 120 req_ts.tv_sec = 0; 121 req_ts.tv_nsec = 50000000; 122 nanosleep (&req_ts, NULL); 119 cs_sleepms(50); 123 120 call (ioctl(reader[ridx].handle, IOCTL_SET_ATR_READY)<0); 124 121 return OK; … … 166 163 167 164 if(in) 168 { 169 struct timespec req_ts; 170 req_ts.tv_sec = 0; 171 req_ts.tv_nsec = 50000000; 172 nanosleep (&req_ts, NULL); 173 return OK; 174 } 165 cs_sleepms(50); 175 166 else 176 167 return ERROR; -
trunk/csctapi/ifd_smartreader.c
r1566 r1584 194 194 // so if we have a base freq of 6.00MHz : 40000/6000000 = .0066666666666666 seconds, aka 6ms 195 195 // here were doing 200ms .. is it too much ? 196 usleep(200000);196 cs_sleepms(200); 197 197 198 198 //Set the DTR HIGH and RTS LOW 199 199 smartreader_setdtr_rts(reader, 1, 0); 200 200 201 usleep(200000);201 cs_sleepms(200); 202 202 sched_yield(); 203 203 … … 384 384 ret = smartreader_set_line_property2(reader, BITS_8, STOP_BIT_2, parity, BREAK_ON); 385 385 // send break for 350ms, also comes from JoePub debugging. 386 usleep(350000);386 cs_sleepms(350); 387 387 ret = smartreader_set_line_property2(reader, BITS_8, STOP_BIT_2, parity, BREAK_OFF); 388 388 … … 1093 1093 gettimeofday(&now,NULL); 1094 1094 timersub(&now, &start, &dif); 1095 usleep(50); 1095 struct timespec req_ts; 1096 req_ts.tv_sec = 0; 1097 req_ts.tv_nsec = 50000; 1098 nanosleep (&req_ts, NULL);//behaves better to signals than usleep and sleep 1096 1099 sched_yield(); 1097 1100 } … … 1181 1184 break; 1182 1185 } 1183 usleep(udelay); 1186 struct timespec req_ts; 1187 req_ts.tv_sec = 0; 1188 req_ts.tv_nsec = udelay * 1000; 1189 nanosleep (&req_ts, NULL); //behaves better with signals than usleep 1184 1190 } 1185 1191 } -
trunk/csctapi/io_serial.c
r1394 r1584 79 79 { 80 80 while (*oscam_sem) 81 usleep((reader[ridx].typ)*2000); //FIXME is this right ?!?! 81 if (reader[ridx].typ == R_DB2COM1) 82 cs_sleepms(6); 83 else 84 cs_sleepms(8); 82 85 *oscam_sem=reader[ridx].typ; 83 usleep(1000);86 cs_sleepms(1); 84 87 } 85 88 } … … 576 579 577 580 if (delay_ms > 0) 578 { 579 #ifdef HAVE_NANOSLEEP 580 struct timespec req_ts; 581 582 req_ts.tv_sec = delay_ms / 1000; 583 req_ts.tv_nsec = (delay_ms % 1000) * 1000000L; 584 nanosleep (&req_ts, NULL); 585 #else 586 usleep (delay_ms * 1000L); 587 #endif 588 } 581 cs_sleepms (delay_ms); 589 582 590 583 in_fd=reader[ridx].handle; … … 634 627 635 628 if (delay_ms > 0) 636 { 637 #ifdef HAVE_NANOSLEEP 638 struct timespec req_ts; 639 640 req_ts.tv_sec = delay_ms / 1000; 641 req_ts.tv_nsec = (delay_ms % 1000) * 1000000L; 642 nanosleep (&req_ts, NULL); 643 #else 644 usleep (delay_ms * 1000L); 645 #endif 646 } 629 cs_sleepms(delay_ms); 647 630 648 631 out_fd=reader[ridx].handle; -
trunk/csctapi/protocol_t0.c
r1581 r1584 443 443 444 444 if(cmd_raw[0] == 0x02 && cmd_raw[1] == 0x09) 445 { 446 #ifdef HAVE_NANOSLEEP 447 struct timespec req_ts; 448 449 // req_ts.tv_sec = 1; 450 // req_ts.tv_nsec = 500000000; 451 req_ts.tv_sec = 2; 452 req_ts.tv_nsec = 500000000; 453 nanosleep (&req_ts, NULL); //FIXME why wait 2,5 sec? 454 #else 455 usleep (999999L); 456 #endif 457 } 445 cs_sleepms(2500); //FIXME why wait? 458 446 call (ICC_Async_Receive (8, buffer)); //Read one procedure byte 459 447 recv = (long)buffer[7]; -
trunk/globals.h
r1583 r1584 744 744 extern int boundary(int, int); 745 745 extern void cs_ftime(struct timeb *); 746 extern void cs_sleepms( int);746 extern void cs_sleepms(unsigned int); 747 747 extern int bytes_available(int); 748 748 extern void cs_setpriority(int); -
trunk/module-cccam.c
r1579 r1584 317 317 { 318 318 reader[ridx].tcp_connected = 0; 319 usleep(200000);319 cs_sleepms(200); 320 320 close(pfd); 321 321 client[cs_idx].udp_fd = 0; 322 usleep(100000);322 cs_sleepms(100); 323 323 ph->c_init(); 324 324 } … … 602 602 //cur_er->rc = 1; 603 603 //cur_er->rcEx = 0; 604 usleep(100000);604 cs_sleepms(100); 605 605 write_ecm_answer(fd_c2m, cur_er); 606 606 //reader[ridx].last_s = reader[ridx].last_g; -
trunk/module-dvbapi.c
r1430 r1584 523 523 dvbapi_get_single_ecm(demux_index, demux[demux_index].ECMpids[n].CA_System_ID, demux[demux_index].ECMpids[n].CA_PID, provid); 524 524 525 sleep(3); //try next if no cw for .. secs525 cs_sleepms(3000); //try next if no cw for .. secs 526 526 } 527 527 } … … 566 566 return 0; 567 567 568 sleep(10);568 cs_sleepms(10000); 569 569 } 570 570 … … 974 974 while(1) 975 975 { 976 sleep(1); // check every second976 cs_sleepms(1000); // check every second 977 977 //cs_debug("dvbapi: check zap"); 978 978 -
trunk/module-monitor.c
r1237 r1584 88 88 if (!client[idx].udp_fd) 89 89 return(-1); 90 usleep(500L); // avoid lost udp-pakets .. 90 struct timespec req_ts; 91 req_ts.tv_sec = 0; 92 req_ts.tv_nsec = 500000; 93 nanosleep (&req_ts, NULL);//avoid lost udp-pakkets 91 94 if (!client[idx].crypted) 92 95 return(sendto(client[idx].udp_fd, txt, strlen(txt), 0, -
trunk/module-newcamd.c
r1557 r1584 120 120 if ((len = des_decrypt(netbuf, len, deskey)) < 11 ) { // 15(newcamd525) or 11 ??? 121 121 cs_debug("nmr: can't decrypt, invalid des key?"); 122 sleep(2);122 cs_sleepms(2000); 123 123 return -1; 124 124 } -
trunk/module-serial.c
r1090 r1584 885 885 oscam_ser_server(); 886 886 else 887 sleep(60); // retry in 1 min. (USB-Device ?)887 cs_sleepms(60000); // retry in 1 min. (USB-Device ?) 888 888 if (pfd) close(pfd); 889 889 } -
trunk/oscam-reader.c
r1513 r1584 602 602 { 603 603 cs_log("FATAL: %s-protocol not supporting cascading", reader[ridx].ph.desc); 604 sleep(1);604 cs_sleepms(1000); 605 605 cs_exit(1); 606 606 } … … 614 614 client[cs_idx].ip=cs_inet_addr("127.0.0.1"); 615 615 while (reader_device_init(reader[ridx].device)==2) 616 sleep(60); // wait 60 secs and try again616 cs_sleepms(60000); // wait 60 secs and try again 617 617 } 618 618 -
trunk/oscam-simples.c
r1484 r1584 313 313 } 314 314 315 void cs_sleepms(int msec) 316 { 317 struct timeval tv; 318 tv.tv_sec = msec / 1000; 319 tv.tv_usec = (msec % 1000) * 1000; 320 select(0, 0, 0, 0, &tv); 315 void cs_sleepms(unsigned int msec) 316 { 317 //does not interfere with signals like sleep and usleep do 318 struct timespec req_ts; 319 req_ts.tv_sec = msec/1000; 320 req_ts.tv_nsec = (msec % 1000) * 1000000L; 321 nanosleep (&req_ts, NULL); 321 322 } 322 323 -
trunk/oscam.c
r1580 r1584 829 829 cs_log("%s: Bind request failed, waiting another %d seconds", 830 830 ph->desc, timeout); 831 sleep(1);831 cs_sleepms(1000); 832 832 } 833 833 else … … 974 974 } 975 975 #endif 976 sleep(1); // wait for reader976 cs_sleepms(1000); // wait for reader 977 977 while(1) 978 978 { … … 984 984 cs_exit(0); 985 985 else 986 sleep(1);986 cs_sleepms(1000); 987 987 // sleep(cfg->resolvedelay); 988 988 } … … 1004 1004 cs_exit(0); 1005 1005 else 1006 sleep(1);1006 cs_sleepms(1000); 1007 1007 1008 1008 if (master_pid!=getppid()) … … 1063 1063 int i; 1064 1064 for (i=0; (i<1000) && (client[cs_idx].pid!=getpid()); i++) 1065 usleep(1000L);1065 cs_sleepms(1); 1066 1066 if (client[cs_idx].pid!=getpid()) 1067 1067 { … … 2413 2413 int card_init_done; 2414 2414 cs_log("waiting for local card init"); 2415 sleep(3); // short sleep for card detect to work proberly2415 cs_sleepms(3000); // short sleep for card detect to work proberly 2416 2416 do { 2417 2417 card_init_done = 1; -
trunk/reader-common.c
r1583 r1584 147 147 #endif 148 148 // cs_ri_log("ATR: %s", cs_hexdump(1, atr, atr_size));//FIXME 149 sleep(1);149 cs_sleepms(1000); 150 150 return(1); 151 151 }
Note:
See TracChangeset
for help on using the changeset viewer.