Changeset 10575
- Timestamp:
- 02/22/15 05:07:57 (9 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/icc_async.c
r10574 r10575 69 69 int32_t ICC_Async_Device_Init(struct s_reader *reader) 70 70 { 71 struct s_cardreader *crdr_ops = &reader->crdr;71 struct s_cardreader *crdr_ops = reader->crdr; 72 72 if (!crdr_ops) return ERROR; 73 73 reader->fdmc = -1; … … 93 93 while((rdr = ll_iter_next(&itr))) 94 94 { 95 struct s_cardreader *crdr_ops = &rdr->crdr;95 struct s_cardreader *crdr_ops = rdr->crdr; 96 96 if (!crdr_ops || !crdr_ops->lock_init) continue; 97 97 crdr_ops->lock_init(rdr); … … 102 102 int32_t ICC_Async_GetStatus(struct s_reader *reader, int32_t *card) 103 103 { 104 struct s_cardreader *crdr_ops = &reader->crdr;104 struct s_cardreader *crdr_ops = reader->crdr; 105 105 if (!crdr_ops) return ERROR; 106 106 if (reader->typ == R_SMART && reader->smartdev_found >= 4) { … … 135 135 rdr_log_dbg(reader, D_IFD, "Activating card"); 136 136 137 struct s_cardreader *crdr_ops = &reader->crdr;137 struct s_cardreader *crdr_ops = reader->crdr; 138 138 if (!crdr_ops) return ERROR; 139 139 … … 191 191 int32_t ICC_Async_CardWrite(struct s_reader *reader, unsigned char *command, uint16_t command_len, unsigned char *rsp, uint16_t *lr) 192 192 { 193 struct s_cardreader *crdr_ops = &reader->crdr;193 struct s_cardreader *crdr_ops = reader->crdr; 194 194 if (!crdr_ops) return ERROR; 195 195 int32_t ret; … … 278 278 int32_t ICC_Async_Transmit(struct s_reader *reader, uint32_t size, uint32_t expectedlen, unsigned char *data, uint32_t delay, uint32_t timeout) 279 279 { 280 struct s_cardreader *crdr_ops = &reader->crdr;280 struct s_cardreader *crdr_ops = reader->crdr; 281 281 if (!crdr_ops) return ERROR; 282 282 … … 306 306 int32_t ICC_Async_Receive(struct s_reader *reader, uint32_t size, unsigned char *data, uint32_t delay, uint32_t timeout) 307 307 { 308 struct s_cardreader *crdr_ops = &reader->crdr;308 struct s_cardreader *crdr_ops = reader->crdr; 309 309 if (!crdr_ops) return ERROR; 310 310 … … 319 319 int32_t ICC_Async_Close(struct s_reader *reader) 320 320 { 321 struct s_cardreader *crdr_ops = &reader->crdr;321 struct s_cardreader *crdr_ops = reader->crdr; 322 322 if (!crdr_ops) return ERROR; 323 323 … … 335 335 void ICC_Async_DisplayMsg(struct s_reader *reader, char *msg) 336 336 { 337 struct s_cardreader *crdr_ops = &reader->crdr;337 struct s_cardreader *crdr_ops = reader->crdr; 338 338 if (!crdr_ops || !crdr_ops->display_msg) return; 339 339 crdr_ops->display_msg(reader, msg); … … 344 344 int32_t (*rdr_get_cardsystem)(struct s_reader *, struct s_ATR *)) 345 345 { 346 struct s_cardreader *crdr_ops = &reader->crdr;346 struct s_cardreader *crdr_ops = reader->crdr; 347 347 if (!crdr_ops || !crdr_ops->do_reset) return 0; 348 348 return crdr_ops->do_reset(reader, atr, rdr_activate_card, rdr_get_cardsystem); … … 587 587 static int32_t PPS_Exchange(struct s_reader *reader, unsigned char *params, uint32_t *length) 588 588 { 589 struct s_cardreader *crdr_ops = &reader->crdr;589 struct s_cardreader *crdr_ops = reader->crdr; 590 590 if (!crdr_ops) return ERROR; 591 591 … … 651 651 static int32_t ICC_Async_SetParity(struct s_reader *reader, uint16_t parity) 652 652 { 653 struct s_cardreader *crdr_ops = &reader->crdr;653 struct s_cardreader *crdr_ops = reader->crdr; 654 654 if (!crdr_ops) return ERROR; 655 655 … … 664 664 static int32_t SetRightParity(struct s_reader *reader) 665 665 { 666 struct s_cardreader *crdr_ops = &reader->crdr;666 struct s_cardreader *crdr_ops = reader->crdr; 667 667 if (!crdr_ops) return ERROR; 668 668 … … 684 684 static int32_t InitCard(struct s_reader *reader, ATR *atr, unsigned char FI, uint32_t D, unsigned char N, uint16_t deprecated) 685 685 { 686 struct s_cardreader *crdr_ops = &reader->crdr;686 struct s_cardreader *crdr_ops = reader->crdr; 687 687 if (!crdr_ops) return ERROR; 688 688 -
trunk/csctapi/ifd_phoenix.c
r10573 r10575 67 67 IO_Serial_RTS_Set(reader); 68 68 69 struct s_cardreader *crdr_ops = &reader->crdr;69 struct s_cardreader *crdr_ops = reader->crdr; 70 70 if (!crdr_ops) return ERROR; 71 71 … … 118 118 call(IO_Serial_SetBaudrate(reader, DEFAULT_BAUDRATE)); 119 119 120 struct s_cardreader *crdr_ops = &reader->crdr;120 struct s_cardreader *crdr_ops = reader->crdr; 121 121 if (!crdr_ops) return ERROR; 122 122 … … 203 203 static int32_t mouse_init(struct s_reader *reader) 204 204 { 205 struct s_cardreader *crdr_ops = &reader->crdr;205 struct s_cardreader *crdr_ops = reader->crdr; 206 206 if (!crdr_ops) return ERROR; 207 207 208 208 if(detect_db2com_reader(reader)) 209 209 { 210 cardreader_db2com( &reader->crdr);210 cardreader_db2com(reader->crdr); 211 211 return crdr_ops->reader_init(reader); 212 212 } -
trunk/csctapi/ifd_sc8in1.c
r10573 r10575 1245 1245 static int32_t sc8in1_activate(struct s_reader *reader, struct s_ATR *atr) 1246 1246 { 1247 struct s_cardreader *crdr_ops = &reader->crdr;1247 struct s_cardreader *crdr_ops = reader->crdr; 1248 1248 if (!crdr_ops) return ERROR; 1249 1249 -
trunk/csctapi/ifd_sci.c
r10574 r10575 249 249 if(buf[7] == 0x70 && buf[8] == 0x70 && (buf[9]&0x0F) >= 10) 250 250 { 251 struct s_cardreader *crdr_ops = &reader->crdr;251 struct s_cardreader *crdr_ops = reader->crdr; 252 252 if (!crdr_ops) return ERROR; 253 253 int8_t nxtr = 0; -
trunk/csctapi/ifd_stinger.c
r10573 r10575 94 94 bool Stinger_IO_Serial_Write(struct s_reader *reader, uint32_t delay, uint32_t timeout, uint32_t size, const unsigned char *data) 95 95 { 96 struct s_cardreader *crdr_ops = &reader->crdr;96 struct s_cardreader *crdr_ops = reader->crdr; 97 97 if (!crdr_ops) return ERROR; 98 98 … … 247 247 IO_Serial_RTS_Set(reader); 248 248 249 struct s_cardreader *crdr_ops = &reader->crdr;249 struct s_cardreader *crdr_ops = reader->crdr; 250 250 if (!crdr_ops) return ERROR; 251 251 … … 274 274 IO_Serial_SetParams(reader, DEFAULT_BAUDRATE, 8, PARITY_NONE, 2, NULL, NULL); 275 275 276 struct s_cardreader *crdr_ops = &reader->crdr;276 struct s_cardreader *crdr_ops = reader->crdr; 277 277 if (!crdr_ops) return ERROR; 278 278 … … 330 330 unsigned int clock_mhz = 0; 331 331 332 struct s_cardreader *crdr_ops = &reader->crdr;332 struct s_cardreader *crdr_ops = reader->crdr; 333 333 if (!crdr_ops) return ERROR; 334 334 335 335 if(detect_db2com_reader(reader)) 336 336 { 337 cardreader_db2com( &reader->crdr);337 cardreader_db2com(reader->crdr); 338 338 return crdr_ops->reader_init(reader); 339 339 } -
trunk/csctapi/io_serial.c
r10573 r10575 78 78 bool IO_Serial_DTR_RTS(struct s_reader *reader, int32_t *dtr, int32_t *rts) 79 79 { 80 struct s_cardreader *crdr_ops = &reader->crdr;80 struct s_cardreader *crdr_ops = reader->crdr; 81 81 if (!crdr_ops) return ERROR; 82 82 … … 489 489 bool IO_Serial_Write(struct s_reader *reader, uint32_t delay, uint32_t timeout, uint32_t size, const unsigned char *data) 490 490 { 491 struct s_cardreader *crdr_ops = &reader->crdr;491 struct s_cardreader *crdr_ops = reader->crdr; 492 492 if (!crdr_ops) return ERROR; 493 493 -
trunk/globals.h
r10574 r10575 315 315 #define is_network_reader(__X) (__X->typ & R_IS_NETWORK) 316 316 #define is_cascading_reader(__X) (__X->typ & R_IS_CASCADING) 317 #define is_smargo_reader(__X) ( strcmp(__X->crdr.desc, "smargo") == 0)317 #define is_smargo_reader(__X) (__X->crdr && strcmp(__X->crdr->desc, "smargo") == 0) 318 318 319 319 //ECM rc codes: … … 1341 1341 int8_t deprecated; //if 0 ATR obeyed, if 1 default speed (9600) is chosen; for devices that cannot switch baudrate 1342 1342 struct s_module ph; 1343 struct s_cardreader crdr;1343 struct s_cardreader *crdr; 1344 1344 void *crdr_data; // Private card reader data 1345 1345 bool crdr_flush; // sci readers may disable flush per reader -
trunk/oscam-config-reader.c
r10557 r10575 116 116 if(streq(value, cardreaders[i].desc)) 117 117 { 118 rdr->crdr = cardreaders[i];118 rdr->crdr = &cardreaders[i]; 119 119 rdr->typ = cardreaders[i].typ; 120 120 return; -
trunk/oscam-log-reader.c
r10565 r10575 30 30 if(reader->csystem.desc) 31 31 { return reader->csystem.desc; } 32 else if(reader->crdr .desc)33 { return reader->crdr .desc; }32 else if(reader->crdr && reader->crdr->desc) 33 { return reader->crdr->desc; } 34 34 else if(reader->ph.desc) 35 35 { return reader->ph.desc; } -
trunk/oscam-reader.c
r10572 r10575 483 483 { 484 484 const char *desc = "unknown"; 485 if(rdr->crdr .desc)486 { return rdr->crdr .desc; }485 if(rdr->crdr && rdr->crdr->desc) 486 { return rdr->crdr->desc; } 487 487 if(is_network_reader(rdr) || rdr->typ == R_SERIAL) 488 488 { -
trunk/reader-nagra.c
r10573 r10575 759 759 } 760 760 reader->card_atr_length = 23; 761 struct s_cardreader *crdr_ops = &reader->crdr;761 struct s_cardreader *crdr_ops = reader->crdr; 762 762 if (!crdr_ops) return ERROR; 763 763 call(crdr_ops->activate(reader, newatr)); //read nagra atr
Note:
See TracChangeset
for help on using the changeset viewer.