Changeset 3280
- Timestamp:
- 09/28/10 02:54:20 (14 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/reader-videoguard-common.c
r3216 r3280 7 7 #include "reader-videoguard-common.h" 8 8 9 void set_known_card_info(struct s_reader * reader )9 void set_known_card_info(struct s_reader * reader, const unsigned char * atr, const unsigned int *atr_size) 10 10 { 11 11 /* Set to sensible default values */ … … 56 56 0x00, 0x4E, 0x5A, 0x01, 0x00, 0x00 }, 57 57 22, 1992, 0, NDS2, "VideoGuard Sky New Zealand (096A)"}, 58 {{ 0x3F, 0xFD, 0x11, 0x25, 0x02, 0x50, 0x80, 0x0F, 0x41, 0xB0, 0x03, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 59 0x80, 0x00, 0x46, 0x44, 0x03 }, 60 20, 2000, 0, NDS2, "VideoGuard Foxtel Australia (096C)"}, 58 61 {{ 0x3F, 0x7F, 0x13, 0x25, 0x04, 0x33, 0xB0, 0x02, 0x69, 0xFF, 0x4A, 0x50, 0xE0, 0x00, 0x00, 0x54, 59 62 0x42, 0x00, 0x00, 0x00 }, … … 98 101 int i=0; 99 102 while(nds_atr_table[i].desc) { 100 if (( reader->atrlen== nds_atr_table[i].atr_len)101 && (memcmp ( reader->atr, nds_atr_table[i].atr, nds_atr_table[i].atr_len) == 0)) {103 if ((*atr_size == nds_atr_table[i].atr_len) 104 && (memcmp (atr, nds_atr_table[i].atr, nds_atr_table[i].atr_len) == 0)) { 102 105 reader->card_baseyear=nds_atr_table[i].base_year; 103 106 reader->card_tierstart=nds_atr_table[i].tier_start; -
trunk/reader-videoguard-common.h
r3205 r3280 53 53 unsigned char *cw, unsigned char * cta_res); 54 54 extern void rev_date_calc(const unsigned char *Date, int *year, int *mon, int *day, int *hh, int *mm, int *ss, int base_year); 55 extern void set_known_card_info(struct s_reader * reader );55 extern void set_known_card_info(struct s_reader * reader, const unsigned char *atr, const unsigned int *atr_size); 56 56 57 57 #endif // __NDS_COMMON__ -
trunk/reader-videoguard1.c
r3204 r3280 92 92 def_resp; 93 93 94 // Copy the atr info into the reader, can we not do this in reader-common.c?95 reader->atrlen = atr_size;96 memcpy(reader->atr,atr,atr_size);97 98 94 /* set information on the card stored in reader-videoguard-common.c */ 99 set_known_card_info(reader );95 set_known_card_info(reader,atr,&atr_size); 100 96 101 97 if((reader->ndsversion != NDS1) && ((reader->card_system_version != NDS1) || (reader->ndsversion != NDSAUTO))) { -
trunk/reader-videoguard12.c
r3204 r3280 44 44 def_resp; 45 45 46 // Copy the atr info into the reader, can we not do this in reader-common.c?47 reader->atrlen = atr_size;48 memcpy(reader->atr,atr,atr_size);49 50 46 /* set information on the card stored in reader-videoguard-common.c */ 51 set_known_card_info(reader );47 set_known_card_info(reader,atr,&atr_size); 52 48 53 49 if((reader->ndsversion != NDS12) && ((reader->card_system_version != NDS12) || (reader->ndsversion != NDSAUTO))) { -
trunk/reader-videoguard2.c
r3205 r3280 60 60 unsigned short tier_id = (cta_res[2] << 8) | cta_res[3]; 61 61 char *tier_name = get_tiername(tier_id, reader->caid[0]); 62 if( (starttier = reader->card_tierstart)== -1){62 if(reader->card_tierstart == -1){ 63 63 cs_ri_log(reader, "[videoguard2-reader] tier-number: 0x%02x, tier: %04x",i,tier_id); 64 64 } … … 73 73 if ((hist_size < 7) || (hist[1] != 0xB0) || (hist[4] != 0xFF) || (hist[5] != 0x4A) || (hist[6] != 0x50)) 74 74 return ERROR; 75 cs_log("[videoguard2-reader] in videoguard2_card_init"); 75 76 76 77 get_atr; 77 78 def_resp; 78 79 79 // Copy the atr info into the reader, can we not do this in reader-common.c?80 reader->atrlen = atr_size;81 memcpy(reader->atr,atr,atr_size);82 83 80 /* set information on the card stored in reader-videoguard-common.c */ 84 set_known_card_info(reader );81 set_known_card_info(reader,atr,&atr_size); 85 82 86 83 if((reader->ndsversion != NDS2) &&
Note:
See TracChangeset
for help on using the changeset viewer.