Changeset 4170

Timestamp:

12/20/10 12:01:00 (12 years ago)

Author:

dingo35

Message:

moving more pcsc stuff to icc_async.c which is more logical place

Location:

trunk

Files:

• csctapi/icc_async.c (modified) (4 diffs)
• reader-common.c (modified) (4 diffs)

trunk/csctapi/icc_async.c

@@ -177 +177 @@
 #endif//SCI_DEV
             break;
+#ifdef HAVE_PCSC
+        case R_PCSC:
+            return (pcsc_reader_init(reader, reader->device));
+            break;
+#endif
         default:
             cs_log("ERROR ICC_Device_Init: unknow reader type %i",reader->typ);
@@ -253 +258 @@
 #endif
             break;
+#ifdef HAVE_PCSC
+        case R_PCSC:
+            in =  pcsc_check_card_inserted(reader);
+            break;
+#endif
         default:
             cs_log("ERROR ICC_Get_Status: unknow reader type %i",reader->typ);
@@ -262 +272 @@
     else
         *card = FALSE;
-    // this debug is not really useful and polute the log in debug mode
-    // cs_debug_mask (D_IFD, "IFD: Status = %s", in ? "card": "no card");
     
     return OK;
@@ -346 +354 @@
 int ICC_Async_CardWrite (struct s_reader *reader, unsigned char *command, unsigned short command_len, unsigned char *rsp, unsigned short *lr)
 {
+#ifdef HAVE_PCSC
+    if (reader->typ == R_PCSC)
+      return (pcsc_reader_do_api(reader, command, rsp, lr, command_len)); 
+#endif
     *lr = 0; //will be returned in case of error
 

trunk/reader-common.c

@@ -55 +55 @@
 {
     int rc;
-#ifdef HAVE_PCSC
-    if (reader->typ == R_PCSC) {
-      return (pcsc_reader_do_api(reader, buf, cta_res, p_cta_lr,l)); 
-    }
-
-#endif
-
     *p_cta_lr=CTA_RES_LEN-1; //FIXME not sure whether this one is necessary 
     cs_ddump_mask(D_READER, buf, l, "write to cardreader %s:",reader->label);
@@ -100 +93 @@
     if ((reader->detect&0x7f) > 3)
         return 1;
-#endif
-#ifdef HAVE_PCSC
-    if (reader->typ == R_PCSC) {
-        return(pcsc_check_card_inserted(reader));
-    }
 #endif
     int card;
@@ -262 +250 @@
 int reader_device_init(struct s_reader * reader)
 {
-#ifdef HAVE_PCSC
-    if (reader->typ == R_PCSC) {
-       return (pcsc_reader_init(reader, reader->device));
-    }
-#endif
- 
     int rc = -1; //FIXME
 #if defined(TUXBOX) && defined(PPC)
@@ -278 +260 @@
     else
         rc = OK;
-  cs_debug_mask(D_READER, "ct_init on %s: %d", reader->device, rc);
-  return((rc!=OK) ? 2 : 0);
+  return((rc!=OK) ? 2 : 0); //exit code 2 means keep retrying, exit code 0 means all OK
 }