Changeset 509
- Timestamp:
- 11/15/09 20:13:33 (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/reader-common.c
r506 r509 257 257 static int reader_get_cardsystem(void) 258 258 { 259 if (irdeto_card_init(atr, atr_size)) reader[ridx].card_system=SC_IRDETO;260 if (conax_card_init(atr, atr_size)) reader[ridx].card_system=SC_CONAX;261 if (cryptoworks_card_init(atr, atr_size)) reader[ridx].card_system=SC_CRYPTOWORKS; 262 if (seca_card_init(atr, atr_size)) reader[ridx].card_system=SC_SECA; 263 if (viaccess_card_init(atr, atr_size)) reader[ridx].card_system=SC_VIACCESS; 264 if (videoguard_card_init(atr, atr_size)) reader[ridx].card_system=SC_VIDEOGUARD2; 265 if (nds_card_init(atr, atr_size)) reader[ridx].card_system=SC_NDS; 266 if (dre_card_init(atr, atr_size)) reader[ridx].card_system=SC_DRE; 267 if (!reader[ridx].card_system)cs_ri_log("card system not supported");259 if (irdeto_card_init(atr, atr_size)) reader[ridx].card_system=SC_IRDETO; else 260 if (conax_card_init(atr, atr_size)) reader[ridx].card_system=SC_CONAX; else 261 if (cryptoworks_card_init(atr, atr_size)) reader[ridx].card_system=SC_CRYPTOWORKS; else 262 if (seca_card_init(atr, atr_size)) reader[ridx].card_system=SC_SECA; else 263 if (viaccess_card_init(atr, atr_size)) reader[ridx].card_system=SC_VIACCESS; else 264 if (videoguard_card_init(atr, atr_size)) reader[ridx].card_system=SC_VIDEOGUARD2; else 265 if (nds_card_init(atr, atr_size)) reader[ridx].card_system=SC_NDS; else 266 if (dre_card_init(atr, atr_size)) reader[ridx].card_system=SC_DRE; else 267 cs_ri_log("card system not supported"); 268 268 cs_ri_brk(1); 269 269 -
trunk/reader-videoguard2.c
r503 r509 398 398 cmd2[4]=1; 399 399 if(!read_cmd(cmd2,NULL) || cta_res[1] != 0x90 || cta_res[2] != 0x00) { 400 cs_ log("failed to read %02x%02x cmd length (%02x %02x)",cmd[1],cmd[2],cta_res[1],cta_res[2]);400 cs_debug("failed to read %02x%02x cmd length (%02x %02x)",cmd[1],cmd[2],cta_res[1],cta_res[2]); 401 401 return -1; 402 402 } … … 488 488 unsigned char atr_yes[] = { 0x3F, 0xFF, 0x13, 0x25, 0x03, 0x10, 0x80, 0x33, 0xB0, 0x11, 0x69, 0xFF, 0x4A, 0x50, 0x50, 0x00, 0x00, 0x47, 0x54, 0x01, 0x00, 0x00 }; 489 489 unsigned char atr_viasat_new[] = { 0x3F, 0x7D, 0x11, 0x25, 0x02, 0x41, 0xB0, 0x03, 0x69, 0xFF, 0x4A, 0x50, 0xF0, 0x80, 0x00, 0x56, 0x54, 0x03}; 490 unsigned char atr_premiere[] = { 0x3F, 0xFF, 0x11, 0x25, 0x03, 0x10, 0x80, 0x41, 0xB0, 0x07, 0x69, 0xFF, 0x4A, 0x50, 0x70, 0x00, 0x00, 0x50, 0x31, 0x01, 0x00, 0x11 }; 490 491 491 492 if ((atrsize == sizeof (atr_bskyb)) && (memcmp (atr, atr_bskyb, atrsize) == 0)) … … 531 532 cs_log("Warning: for Sky Italia currently only 'mhz = 357' is known to work! Device %s has mhz = %i",reader[ridx].device,reader[ridx].mhz); 532 533 } 533 else 534 else if ((atrsize == sizeof (atr_premiere)) && (memcmp (atr, atr_premiere, atrsize) == 0)) 534 535 { 535 /* not a known videoguard */ 536 cs_log("Type: Videoguard Sky Germany"); 537 } 538 /* else 539 { 540 // not a known videoguard 536 541 return (0); 537 } 542 }*/ 543 //a non videoguard2/NDS card will fail on read_cmd_len(ins7401) 544 //this way also unknown videoguard2/NDS cards will work 545 538 546 539 547 #ifdef OS_LINUX … … 583 591 unsigned char ins7401[5] = { 0xD0,0x74,0x01,0x00,0x00 }; 584 592 int l; 585 if((l=read_cmd_len(ins7401))<0) return 0; 593 if((l=read_cmd_len(ins7401))<0) return 0; //not a videoguard2/NDS card or communication error 586 594 ins7401[4]=l; 587 595 if(!read_cmd(ins7401,NULL) || !status_ok(cta_res+l)) {
Note:
See TracChangeset
for help on using the changeset viewer.