Ignore:
Timestamp:
11/22/09 02:16:41 (12 years ago)
Author:
smurzch2
Message:

Merge drecrypt stuff in the Merlin branch.

This should merge the commits 491, 492, 497, 498, 501 and 521.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/merlin/src/CAM/common.c

    r395 r532  
    88#include "CAM/viaccess.h"
    99#include "CAM/videoguard.h"
     10#include "CAM/drecrypt.h"
    1011
    1112#include "reader/common.h"
     
    2425    CAM_SECA,
    2526    CAM_VIACCESS,
    26     CAM_VIDEOGUARD
     27    CAM_VIDEOGUARD,
     28    CAM_DRECRYPT,
    2729} cam_common_card_system;
    2830
     
    5052        card_system = CAM_VIDEOGUARD;
    5153        log_normal("CAM: Videoguard detected");
     54    } else if (cam_drecrypt_detect(atr, atr_size)) {
     55        card_system = CAM_DRECRYPT;
     56        log_normal("CAM: Drecrypt detected");
    5257    } else {
    5358        log_normal("CAM: Card system not supported !");
     
    8489        case CAM_VIDEOGUARD:
    8590            rc = cam_videoguard_load_card();
     91            break;
     92        case CAM_DRECRYPT:
     93            rc = cam_drecrypt_load_card();
    8694            break;
    8795    }
     
    119127            rc = cam_videoguard_process_ecm(er);
    120128            break;
     129        case CAM_DRECRYPT:
     130            rc = cam_drecrypt_process_ecm(er);
     131            break;
    121132    }
    122133
     
    146157        case CAM_VIDEOGUARD:
    147158            rc = cam_videoguard_process_emm(ep);
     159            break;
     160        case CAM_DRECRYPT:
     161            rc = cam_drecrypt_process_emm(ep);
    148162            break;
    149163    }
Note: See TracChangeset for help on using the changeset viewer.