Changeset 94 for trunk/reader-common.c
- Timestamp:
- 05/30/09 17:35:30 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/reader-common.c
r71 r94 10 10 ushort cta_lr, atr_size=0; 11 11 static int cs_ptyp_orig; //reinit=1, 12 static int card_status=0;13 12 14 13 #define SC_IRDETO 1 … … 247 246 if (reader_card_inserted()) 248 247 { 249 if (!( card_status & CARD_INSERTED))248 if (!(reader[ridx].card_status & CARD_INSERTED)) 250 249 { 251 250 cs_log("card detected"); 252 card_status=CARD_INSERTED | (reader_reset() ? 0 : CARD_FAILURE); 253 if (card_status & CARD_FAILURE) 251 reader[ridx].card_status = CARD_NEED_INIT; 252 reader[ridx].card_status = CARD_INSERTED | (reader_reset() ? 0 : CARD_FAILURE); 253 if (reader[ridx].card_status & CARD_FAILURE) 254 { 254 255 cs_log("card initializing error"); 256 } 255 257 else 256 258 { 257 259 client[cs_idx].au=ridx; 258 reader[ridx].online=1;259 260 reader_card_info(); 260 261 } … … 270 271 else 271 272 { 272 if ( card_status&CARD_INSERTED)273 if (reader[ridx].card_status & CARD_INSERTED) 273 274 { 274 275 reader_nullcard(); … … 280 281 cs_log("card ejected"); 281 282 } 282 card_status=0;283 reader[ridx].card_status=0; 283 284 reader[ridx].online=0; 284 285 } 285 return (card_status==CARD_INSERTED);286 return reader[ridx].card_status==CARD_INSERTED; 286 287 } 287 288
Note:
See TracChangeset
for help on using the changeset viewer.