Changeset 1160


Ignore:
Timestamp:
01/10/10 13:22:05 (12 years ago)
Author:
dingo35
Message:

Fix compiler errors

Location:
trunk/csctapi
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/csctapi/cardterminal.c

    r1137 r1160  
    208208{
    209209    char ret, aux;
    210     uint i;
     210    unsigned int i;
    211211   
    212212    ret = OK;
     
    245245}
    246246
    247 CT_Slot * CardTerminal_GetSlot (CardTerminal * ct, uint number)
     247CT_Slot * CardTerminal_GetSlot (CardTerminal * ct, unsigned int number)
    248248{
    249249    if (number < (ct->num_slots))
     
    601601    BYTE buffer[CARDTERMINAL_GETSTATUS_BUFFER_SIZE], p1, p2;
    602602    bool card, change;
    603     uint i;
     603    unsigned int i;
    604604    unsigned length;
    605605    char ret = OK;
     
    761761{
    762762    BYTE buffer[CARDTERMINAL_EJECTICC_BUFFER_SIZE], p1, p2;
    763     uint sn, timeout;
     763    unsigned int sn, timeout;
    764764    unsigned length;
    765765    bool card, change;
     
    817817    /* Get the card removal timeout */
    818818    if (APDU_Cmd_Lc (cmd) == 1)
    819         timeout = (uint) (*APDU_Cmd_Data (cmd));
     819        timeout = (unsigned int) (*APDU_Cmd_Data (cmd));
    820820    else
    821821        timeout = 0;
  • trunk/csctapi/cardterminal.h

    r1137 r1160  
    5151  IO_Serial * io;               /* Serial device */
    5252  CT_Slot * slots[CARDTERMINAL_MAX_SLOTS];  /* Array of CT_Slot's */
    53   uint num_slots;               /* Number of CT_Slot's */
     53  unsigned int num_slots;               /* Number of CT_Slot's */
    5454#ifdef HAVE_PTHREAD_H
    5555  pthread_mutex_t mutex;
     
    7676/* Return the reference to a slot */
    7777extern CT_Slot *
    78 CardTerminal_GetSlot (CardTerminal * ct, uint number);
     78CardTerminal_GetSlot (CardTerminal * ct, unsigned int number);
    7979
    8080/* Close a CardTerminal */
  • trunk/csctapi/config.h

    r1084 r1160  
    33
    44#include "../oscam-config.h"
    5 #include "../globals.h"
    65
    76/* Debug CT-API */
    87/* #undef DEBUG_CTAPI */
    9 // #define DEBUG_CTAPI 1
     8//#define DEBUG_CTAPI 1
    109
    1110/* Debug Integrated Circuit Card */
    1211/* #undef DEBUG_ICC */
    13 // #define DEBUG_ICC 1
     12#define DEBUG_ICC 1
    1413
    1514/* Debug Interface Device */
    1615/* #undef DEBUG_IFD */
    17 //#define DEBUG_IFD 1
     16#define DEBUG_IFD 1
    1817
    1918/* Debug IFD Handler */
    2019/* #undef DEBUG_IFDH */
    21 //#define DEBUG_IFDH 1
     20#define DEBUG_IFDH 1
    2221
    2322/* Debug Input/Output */
    2423/* #undef DEBUG_IO */
    25 // #define DEBUG_IO 1
     24#define DEBUG_IO 1
    2625
    2726/* Debug Protocol */
    2827/* #undef DEBUG_PROTOCOL */
    29 //#define DEBUG_PROTOCOL 1
     28#define DEBUG_PROTOCOL 1
    3029
    3130//#define PROTOCOL_T0_ISO 1
    32 //#define PROTOCOL_T1_ISO 1
     31#define PROTOCOL_T1_ISO 1
    3332
    3433
  • trunk/csctapi/ct_slot.h

    r1137 r1160  
    7373/* Check for card inserted */
    7474extern char
    75 CT_Slot_Check (CT_Slot * slot, uint timeout, bool * card, bool * change);
     75CT_Slot_Check (CT_Slot * slot, unsigned int timeout, bool * card, bool * change);
    7676
    7777/* Probe ICC type and protocol */
Note: See TracChangeset for help on using the changeset viewer.