Changeset 7167
- Timestamp:
- 07/11/12 15:02:34 (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/ifd_phoenix.c
r7145 r7167 70 70 set_gpio_input(reader); 71 71 } 72 72 73 73 rdr_debug_mask(reader, D_IFD, "Initializing reader type=%d", reader->typ); 74 74 75 75 /* Default serial port settings */ 76 76 if (reader->atr[0] == 0) { … … 108 108 109 109 int32_t Phoenix_Reset (struct s_reader * reader, ATR * atr) 110 { 110 { 111 111 rdr_debug_mask(reader, D_IFD, "Resetting card"); 112 112 int32_t ret; … … 124 124 for(i=0; i<3; i++) { 125 125 #if !defined(__CYGWIN__) 126 /* 126 /* 127 127 * Pause for 200ms as this might help with the PL2303. 128 128 * Some users reporting that this breaks cygwin, so we exclude this. … … 141 141 IO_Serial_RTS_Set(reader); 142 142 #if defined(__CYGWIN__) 143 /* 143 /* 144 144 * Pause for 200ms as this might help with the PL2303. 145 145 * Some users reporting that this breaks cygwin, so we went back to 50ms. … … 183 183 //END OF PLAYGROUND 184 184 */ 185 185 186 186 return ret; 187 187 } … … 195 195 /* Calculate number of bytes to send */ 196 196 to_send = MIN(size, MAX_TRANSMIT); 197 197 198 198 /* Send data */ 199 199 if ((sent == 0) && (block_delay != char_delay)) … … 231 231 call (IO_Serial_SetBitrate (reader, baudrate, &tio)); 232 232 #if !defined(__CYGWIN__) 233 /* 233 /* 234 234 * Pause for 200ms as this might help with the PL2303. 235 235 * Some users reporting that this breaks cygwin, so we exclude this. … … 239 239 call (IO_Serial_SetProperties(reader, tio)); 240 240 #if !defined(__CYGWIN__) 241 /* 241 /* 242 242 * Pause for 200ms as this might help with the PL2303. 243 243 * Some users reporting that this breaks cygwin, so we exclude this. … … 265 265 } 266 266 267 267 /* 268 268 int32_t Phoenix_FastReset (struct s_reader * reader, int32_t delay) 269 269 { … … 283 283 284 284 IO_Serial_Ioctl_Lock(reader, 0); 285 285 286 286 cs_sleepms(50); 287 287 … … 290 290 291 291 } 292 292 */ 293 293 static int32_t mouse_init(struct s_reader *reader) { 294 294 rdr_log(reader, "mouse_test init"); … … 315 315 } 316 316 317 void cardreader_mouse(struct s_cardreader *crdr) 317 void cardreader_mouse(struct s_cardreader *crdr) 318 318 { 319 319 crdr->desc = "mouse_test"; -
trunk/module-dvbapi.c
r7156 r7167 2194 2194 2195 2195 for (j=0; j<demux[i].ECMpidcount; j++) 2196 if ((demux[i].ECMpids[j].CAID == er->caid || demux[i].ECMpids[j].CAID == er->ocaid) && demux[i].ECMpids[j].ECM_PID == er->pid )2196 if ((demux[i].ECMpids[j].CAID == er->caid || demux[i].ECMpids[j].CAID == er->ocaid) && demux[i].ECMpids[j].ECM_PID == er->pid && demux[i].ECMpids[j].PROVID == er->prid) 2197 2197 break; 2198 2198 if (j==demux[i].ECMpidcount) continue; … … 2295 2295 demux[i].ECMpids[t].status = 0; 2296 2296 } 2297 demux[i].tries = 0;2297 demux[i].tries = 3; 2298 2298 demux[i].curindex = 0; 2299 2299 demux[i].pidindex = -1; -
trunk/oscam.c
r7165 r7167 5097 5097 arm_led->start_time = time((time_t)0); 5098 5098 arm_led->led = led; 5099 arm_led->action = action; 5099 arm_led->action = action; } 5100 5100 if ( ! arm_led_actions ) { 5101 5101 arm_led_actions = ll_create("arm_led_actions"); … … 5107 5107 pthread_kill(arm_led_thread, OSCAM_SIGNAL_WAKEUP); 5108 5108 } 5109 } 5109 5110 5110 } 5111 5111 #endif
Note:
See TracChangeset
for help on using the changeset viewer.