Ignore:
Timestamp:
02/26/10 17:04:59 (11 years ago)
Author:
merek
Message:

Merge from UMP r1791/1792

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/csctapi/icc_async.c

    r1658 r1719  
    661661#if defined(LIBUSB)
    662662        case R_SMART:
    663             reader[ridx].sr_config.inv= (convention == ATR_CONVENTION_INVERSE) ? 1: 0;
    664             reader[ridx].sr_config.parity=parity;
    665             call (SR_SetParity(&reader[ridx]));
     663            call (SR_SetParity(&reader[ridx], parity));
    666664            break;
    667665#endif
     
    855853#if defined(LIBUSB)
    856854    if (reader[ridx].typ == R_SMART)
    857         SR_WriteSettings(&reader[ridx], (unsigned short) atr_f_table[FI], (BYTE)d, (BYTE)EGT, (BYTE)protocol_type);
     855        SR_WriteSettings(&reader[ridx], (unsigned short) atr_f_table[FI], (BYTE)d, (BYTE)EGT, (BYTE)protocol_type, convention);
    858856#endif
    859857    cs_log("Maximum frequency for this card is formally %i Mhz, clocking it to %.2f Mhz", atr_fs_table[FI] / 1000000, (float) reader[ridx].mhz / 100);
Note: See TracChangeset for help on using the changeset viewer.