Changeset 8454
- Timestamp:
- 03/02/13 22:37:12 (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r8445 r8454 1398 1398 uint8_t bulcrypt_version; 1399 1399 uint8_t griffin_cmd_base; // Griffin command base, depends on the card 1400 uint8_t emm_reassembly; 1400 1401 1401 1402 struct s_reader *next; -
trunk/oscam-config-reader.c
r8450 r8454 787 787 DEF_OPT_INT8("ccchop" , OFS(cc_hop), 0 ), 788 788 #endif 789 DEF_OPT_UINT8("emmreassembly" , OFS(emm_reassembly), 1 ), 789 790 DEF_OPT_INT8("deprecated" , OFS(deprecated), 0 ), 790 791 DEF_OPT_INT8("audisabled" , OFS(audisabled), 0 ), … … 817 818 "readnano", "resetcycle", "smargopatch", "sc8in1_dtrrts_patch", "boxid", 818 819 "fix9993", "rsakey", "ins7e", "ins7e11", "force_irdeto", "boxkey", 819 "atr", "detect", "nagra_read", "mhz", "cardmhz", 820 "atr", "detect", "nagra_read", "mhz", "cardmhz", "emmreassembly", 820 821 #ifdef WITH_AZBOX 821 822 "mode", -
trunk/oscam-emm.c
r8452 r8454 324 324 } 325 325 326 if (aureader->csystem.do_emm_reassembly && !aureader->csystem.do_emm_reassembly(aureader, ep)) 327 return; 326 if (aureader->emm_reassembly && aureader->csystem.do_emm_reassembly) { 327 if (!aureader->csystem.do_emm_reassembly(aureader, ep)) 328 return; 329 } 328 330 329 331 rdr_debug_mask_sensitive(aureader, D_EMM, "emmtype %s. Reader serial {%s}.", typtext[ep->type], -
trunk/reader-cryptoworks.c
r8441 r8454 738 738 case 0x86: // emm-sb 739 739 cs_debug_mask(D_DVBAPI, "[cryptoworks] shared emm (EMM-SB): %s" , cs_hexdump(0, buffer, *len, dumpbuf, sizeof(dumpbuf))); 740 if (!reader->reassemble_emm_len) return 1;740 if (!reader->reassemble_emm_len) return 0; 741 741 742 742 // we keep the first 12 bytes of the 0x84 emm (EMM-SH) … … 785 785 // error in emm assembly 786 786 cs_debug_mask(D_DVBAPI, "[cryptoworks] Error assembling Cryptoworks EMM-S"); 787 return 0; 787 788 } 788 789 break; -
trunk/reader-viaccess.c
r8441 r8454 1014 1014 reader->reassemble_emm_len=*len; 1015 1015 //cs_ddump_mask(D_READER, buffer, len, "viaccess global emm:"); 1016 break;1016 return 0; 1017 1017 1018 1018 case 0x8e: 1019 1019 // emm-s part 2 1020 if (!reader->reassemble_emm_len) return 1;1020 if (!reader->reassemble_emm_len) return 0; 1021 1021 1022 1022 //extract nanos from emm-gh and emm-s
Note:
See TracChangeset
for help on using the changeset viewer.