Changeset 1369
- Timestamp:
- 01/24/10 09:30:40 (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/csctapi/apdu.c
r1179 r1369 27 27 #include <stdlib.h> 28 28 #include <string.h> 29 #include "../globals.h"30 29 31 30 /* -
trunk/csctapi/ct_slot.h
r1321 r1369 27 27 28 28 #include "defines.h" 29 #include "../globals.h"30 29 #include "apdu.h" 31 30 #include "ctapi.h" -
trunk/csctapi/ifd_phoenix.c
r1312 r1369 58 58 { 59 59 #ifdef USE_GPIO //felix: define gpio number used for card detect and reset. ref to globals.h 60 extern int oscam_card_detect; 61 if (oscam_card_detect>4) 62 { 63 gpio_detect=oscam_card_detect-4; 60 if (reader[ridx].detect>4) 61 { 62 gpio_detect=reader[ridx].detect-4; 64 63 pin = 1<<gpio_detect; 65 64 gpio_outen=open("/dev/gpio/outen",O_RDWR); … … 109 108 { 110 109 unsigned int modembits=0; 111 extern int oscam_card_detect; //FIXME kill global variable112 110 if (ioctl(reader[ridx].handle, TIOCMGET,&modembits)<0) 113 111 return ERROR; 114 switch( oscam_card_detect&0x7f)112 switch(reader[ridx].detect&0x7f) 115 113 { 116 114 case 0: *status=(modembits & TIOCM_CAR); break; … … 120 118 default: *status=0; // dummy 121 119 } 122 if (!( oscam_card_detect&0x80))120 if (!(reader[ridx].detect&0x80)) 123 121 *status=!*status; 124 122 } -
trunk/reader-common.c
r1253 r1369 1 1 #include "globals.h" 2 2 #include "reader-common.h" 3 4 int oscam_card_detect;5 3 6 4 uchar cta_cmd[272], cta_res[CTA_RES_LEN], atr[64]; … … 305 303 306 304 int rc; 307 oscam_card_detect=reader[ridx].detect;308 305 cs_ptyp_orig=cs_ptyp; 309 306 cs_ptyp=D_DEVICE;
Note:
See TracChangeset
for help on using the changeset viewer.