Changeset 4998 for trunk/csctapi/ifd_phoenix.c
- Timestamp:
- 04/14/11 02:41:42 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/ifd_phoenix.c
r4994 r4998 15 15 #ifdef USE_GPIO //felix: definition of gpio functions 16 16 #define pin (1<<(reader->detect-4)) 17 int gpio_outen,gpio_out,gpio_in;18 unsigned int gpio;19 20 static void set_gpio(struct s_reader * reader, int level)17 int32_t gpio_outen,gpio_out,gpio_in; 18 unsigned int32_t gpio; 19 20 static void set_gpio(struct s_reader * reader, int32_t level) 21 21 { 22 22 read(gpio_outen, &gpio, sizeof(gpio)); … … 39 39 } 40 40 41 static int get_gpio(struct s_reader * reader)41 static int32_t get_gpio(struct s_reader * reader) 42 42 { 43 43 set_gpio_input(reader); … … 51 51 52 52 53 int Phoenix_Init (struct s_reader * reader)53 int32_t Phoenix_Init (struct s_reader * reader) 54 54 { 55 55 call (IO_Serial_InitPnP (reader)); … … 76 76 } 77 77 78 int Phoenix_GetStatus (struct s_reader * reader, int * status)78 int32_t Phoenix_GetStatus (struct s_reader * reader, int32_t * status) 79 79 { 80 80 #ifdef USE_GPIO //felix: detect card via defined gpio … … 84 84 #endif 85 85 { 86 u nsigned int modembits=0;86 uint32_t modembits=0; 87 87 if (ioctl(reader->handle, TIOCMGET, &modembits) < 0) { 88 88 cs_log("ERROR Phoenix_GetStatus: ioctl error in card detection for %s", reader->label); … … 103 103 } 104 104 105 int Phoenix_Reset (struct s_reader * reader, ATR * atr)105 int32_t Phoenix_Reset (struct s_reader * reader, ATR * atr) 106 106 { 107 107 cs_debug_mask (D_IFD, "IFD: Resetting card:\n"); 108 int ret;109 int i;108 int32_t ret; 109 int32_t i; 110 110 unsigned char buf[ATR_MAX_SIZE]; 111 int parity[3] = {PARITY_EVEN, PARITY_ODD, PARITY_NONE};111 int32_t parity[3] = {PARITY_EVEN, PARITY_ODD, PARITY_NONE}; 112 112 113 113 call (Phoenix_SetBaudrate (reader, DEFAULT_BAUDRATE)); … … 154 154 IO_Serial_Ioctl_Lock(reader, 0); 155 155 156 int n=0;156 int32_t n=0; 157 157 while(n<ATR_MAX_SIZE && !IO_Serial_Read(reader, ATR_TIMEOUT, 1, buf+n)) 158 158 n++; … … 182 182 } 183 183 184 int Phoenix_Transmit (struct s_reader * reader, BYTE * buffer, unsigned size, unsigned int block_delay, unsigned int char_delay)185 { 186 u nsignedsent=0, to_send = 0;184 int32_t Phoenix_Transmit (struct s_reader * reader, BYTE * buffer, uint32_t size, uint32_t block_delay, uint32_t char_delay) 185 { 186 uint32_t sent=0, to_send = 0; 187 187 188 188 for (sent = 0; sent < size; sent = sent + to_send) … … 203 203 } 204 204 205 int Phoenix_Receive (struct s_reader * reader, BYTE * buffer, unsigned size, unsigned int timeout)205 int32_t Phoenix_Receive (struct s_reader * reader, BYTE * buffer, uint32_t size, uint32_t timeout) 206 206 { 207 207 #define IFD_TOWITOKO_TIMEOUT 1000 … … 212 212 } 213 213 214 int Phoenix_SetBaudrate (struct s_reader * reader, uint32_t baudrate)214 int32_t Phoenix_SetBaudrate (struct s_reader * reader, uint32_t baudrate) 215 215 { 216 216 cs_debug_mask (D_IFD, "IFD: Phoenix Setting baudrate to %lu\n", baudrate); … … 239 239 } 240 240 241 int Phoenix_Close (struct s_reader * reader)241 int32_t Phoenix_Close (struct s_reader * reader) 242 242 { 243 243 cs_debug_mask (D_IFD, "IFD: Closing phoenix device %s", reader->device); … … 255 255 256 256 257 int Phoenix_FastReset (struct s_reader * reader, int delay)257 int32_t Phoenix_FastReset (struct s_reader * reader, int32_t delay) 258 258 { 259 259 IO_Serial_Ioctl_Lock(reader, 1); … … 284 284 } 285 285 286 static int mouse_init(struct s_reader *reader) {286 static int32_t mouse_init(struct s_reader *reader) { 287 287 cs_log("mouse_test init"); 288 288 reader->handle = open (reader->device, O_RDWR | O_NOCTTY| O_NONBLOCK); … … 299 299 } 300 300 301 static int mouse_receive(struct s_reader *reader, unsigned char *data, unsigned int size) {301 static int32_t mouse_receive(struct s_reader *reader, unsigned char *data, uint32_t size) { 302 302 return Phoenix_Receive(reader, data, size, reader->read_timeout); 303 303 } 304 304 305 static int mouse_transmit(struct s_reader *reader, unsigned char *sent, unsigned int size) {305 static int32_t mouse_transmit(struct s_reader *reader, unsigned char *sent, uint32_t size) { 306 306 return Phoenix_Transmit(reader, sent, size, reader->block_delay, reader->char_delay); 307 307 } 308 308 309 309 #if defined(WITH_STAPI) 310 static int stapi_init(struct s_reader *reader) {310 static int32_t stapi_init(struct s_reader *reader) { 311 311 return STReader_Open(reader->device, &reader->stsmart_handle); 312 312 } 313 313 314 static int stapi_getstatus(struct s_reader *reader, int *in) {314 static int32_t stapi_getstatus(struct s_reader *reader, int32_t *in) { 315 315 return STReader_GetStatus(reader->stsmart_handle, in); 316 316 } 317 317 318 static int stapi_reset(struct s_reader *reader, ATR *atr) {318 static int32_t stapi_reset(struct s_reader *reader, ATR *atr) { 319 319 return STReader_Reset(reader->stsmart_handle, atr); 320 320 } 321 321 322 static int stapi_transmit(struct s_reader *reader, unsigned char *sent, unsigned int size) {322 static int32_t stapi_transmit(struct s_reader *reader, unsigned char *sent, uint32_t size) { 323 323 return STReader_Transmit(reader->stsmart_handle, sent, size); 324 324 } 325 325 326 static int stapi_receive(struct s_reader *reader, unsigned char *data, unsigned int size) {326 static int32_t stapi_receive(struct s_reader *reader, unsigned char *data, uint32_t size) { 327 327 return STReader_Receive(reader->stsmart_handle, data, size); 328 328 } 329 329 330 static int stapi_close(struct s_reader *reader) {330 static int32_t stapi_close(struct s_reader *reader) { 331 331 return STReader_Close(reader->stsmart_handle); 332 332 } 333 333 334 static int stapi_setprotocol(struct s_reader *reader, unsigned char *params, unsigned *length, uint len_request) {334 static int32_t stapi_setprotocol(struct s_reader *reader, unsigned char *params, unsigned *length, uint32_t len_request) { 335 335 return STReader_SetProtocol(reader->stsmart_handle, params, length, len_request); 336 336 } 337 337 338 static int stapi_writesettings(struct s_reader *reader, unsigned long ETU, unsigned long EGT, unsigned char P, unsigned char I, unsigned short Fi, unsigned char Di, unsigned char Ni) {338 static int32_t stapi_writesettings(struct s_reader *reader, uint32_t ETU, uint32_t EGT, unsigned char P, unsigned char I, uint16_t Fi, unsigned char Di, unsigned char Ni) { 339 339 return STReader_SetClockrate(reader->stsmart_handle); 340 340 } … … 352 352 crdr->write_settings = stapi_writesettings; 353 353 crdr->typ = R_INTERNAL; 354 int max_clock_speed = 1;354 int32_t max_clock_speed = 1; 355 355 } 356 356 #endif
Note:
See TracChangeset
for help on using the changeset viewer.