Changeset 7870
- Timestamp:
- 11/06/12 13:49:32 (11 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/icc_async.c
r7867 r7870 844 844 static int32_t InitCard (struct s_reader * reader, ATR * atr, unsigned char FI, uint32_t D, unsigned char N, uint16_t deprecated) 845 845 { 846 uint32_t I, F, BGT , edc, GT = 0, WWT = 0, EGT = 0;846 uint32_t I, F, BGT = 0, edc, GT = 0, WWT = 0, EGT = 0; 847 847 unsigned char wi = 0; 848 848 … … 1012 1012 SetRightParity (reader); // some reader devices need to get set the right parity 1013 1013 1014 uint32_t ETU = 0; // for Irdeto T14 cards, do not set ETU 1015 if (!(atr->hbn >= 6 && !memcmp(atr->hb, "IRDETO", 6) && reader->protocol_type == ATR_PROTOCOL_TYPE_T14)) ETU = F / D; 1014 1016 if (reader->crdr.write_settings) { 1015 uint32_t ETU = 0; // for Irdeto T14 cards, do not set ETU1016 if (!(atr->hbn >= 6 && !memcmp(atr->hb, "IRDETO", 6) && reader->protocol_type == ATR_PROTOCOL_TYPE_T14)) ETU = F / D;1017 1017 call(reader->crdr.write_settings(reader, ETU, EGT, 5, I, (uint16_t) F, (unsigned char)D, N)); 1018 } else if (reader->crdr.write_settings2) { 1019 call(reader->crdr.write_settings2(reader, EGT, BGT)); 1020 } else if (reader->crdr.write_settings3) { 1021 call(reader->crdr.write_settings3(reader, ETU, WWT, (unsigned char)I)); 1018 1022 } 1019 1023 -
trunk/globals.h
r7845 r7870 678 678 int32_t (*close)(struct s_reader*); 679 679 int32_t (*set_parity)(struct s_reader*, uchar parity); 680 // FIXME: All parameters passed to write_settingsX should be put in a struct 680 681 int32_t (*write_settings)(struct s_reader*, 681 682 uint32_t ETU, … … 686 687 unsigned char Di, 687 688 unsigned char Ni); 689 // FIXME: write_settings2 is used by coolstream reader 690 int32_t (*write_settings2)(struct s_reader *, uint32_t EGT, uint32_t BGT); 691 // FIXME: write_settings3 is used by sci reader 692 int32_t (*write_settings3)(struct s_reader *, uint32_t ETU, uint32_t WWT, uint32_t I); 688 693 int32_t (*set_protocol)(struct s_reader*, 689 694 unsigned char * params,
Note:
See TracChangeset
for help on using the changeset viewer.