Changeset 1228 for branches/monitor-improvement/csctapi/protocol_t0.c

Timestamp:

01/14/10 19:07:30 (13 years ago)

Author:

alno

Message:

WebIf:

• Command: Merging revisions 1212-1227 of trunk

File:

• branches/monitor-improvement/csctapi/protocol_t0.c (modified) (11 diffs)

branches/monitor-improvement/csctapi/protocol_t0.c

@@ -121 +121 @@
     /* WWT = 960 * WI * (Fi / f) * 1000 milliseconds */
     double F =  (double) atr_f_table[params->FI];
-    t0->wwt = (long unsigned int) (960 * wi * (F / ICC_Async_GetClockRate (t0->icc)) * 1000);
+    t0->wwt = (long unsigned int) (960 * wi * (F / ICC_Async_GetClockRate ()) * 1000);
     
     /* Set timings */
@@ -132 +132 @@
     
 #ifdef DEBUG_PROTOCOL
-    printf ("Protocol: T=0: WWT=%d, Clockrate=%lu\n", (int)(t0->wwt),ICC_Async_GetClockRate(t0->icc));
+    printf ("Protocol: T=0: WWT=%d, Clockrate=%lu\n", (int)(t0->wwt),ICC_Async_GetClockRate());
 #endif
     
@@ -157 +157 @@
     /* WWT = 960 * WI * (Fi / f) * 1000 milliseconds */
     double F =  (double) atr_f_table[params->FI];
-    t14->wwt = (long unsigned int) (960 * wi * (F / ICC_Async_GetClockRate (t14->icc)) * 1000);
+    t14->wwt = (long unsigned int) (960 * wi * (F / ICC_Async_GetClockRate ()) * 1000);
     t14->wwt >>= 1;
     
@@ -827 +827 @@
         return PROTOCOL_T0_ERROR;
     
-    /* Initialise transmission */
-    if (ICC_Async_BeginTransmission (t0->icc) != ICC_ASYNC_OK)
-    {
-        (*rsp) = NULL;
-        return PROTOCOL_T0_ICC_ERROR;
-    }
-    
     /* Send header bytes */
     if (ICC_Async_Transmit (t0->icc, 5, APDU_Cmd_Header (cmd)) != ICC_ASYNC_OK)
     {
-        ICC_Async_EndTransmission (t0->icc);
-        
         (*rsp) = NULL;
         return PROTOCOL_T0_ICC_ERROR;
@@ -985 +976 @@
         (*rsp) = NULL;
     
-    /* End of transmission */
-    if (ICC_Async_EndTransmission (t0->icc) != ICC_ASYNC_OK)
-        return PROTOCOL_T0_ICC_ERROR;
-    
     return (ret);
 }
@@ -1014 +1001 @@
         return PROTOCOL_T14_ERROR;
     
-    /* Initialise transmission */
-    if (ICC_Async_BeginTransmission (t14->icc) != ICC_ASYNC_OK)
-    {
-        (*rsp) = NULL;
-        return PROTOCOL_T14_ICC_ERROR;
-    }
-    
     if(t14->icc->ifd->io->reader_type!=R_INTERNAL)
     {
@@ -1026 +1006 @@
         if (ICC_Async_Transmit (t14->icc, 1, &b1) != ICC_ASYNC_OK)
         {
-            ICC_Async_EndTransmission (t14->icc);
-            
             (*rsp) = NULL;
             return PROTOCOL_T14_ICC_ERROR;
@@ -1035 +1013 @@
         if (ICC_Async_Transmit (t14->icc, cmd_len, cmd_raw) != ICC_ASYNC_OK)
         {
-            ICC_Async_EndTransmission (t14->icc);
-            
             (*rsp) = NULL;
             return PROTOCOL_T14_ICC_ERROR;
@@ -1044 +1020 @@
         if (ICC_Async_Transmit (t14->icc, 1, &ixor) != ICC_ASYNC_OK)
         {
-            ICC_Async_EndTransmission (t14->icc);
-            
             (*rsp) = NULL;
             return PROTOCOL_T14_ICC_ERROR;
@@ -1059 +1033 @@
         if (ICC_Async_Transmit (t14->icc, cmd_len+2, buffer) != ICC_ASYNC_OK)
         {
-            ICC_Async_EndTransmission (t14->icc);
-            
             (*rsp) = NULL;
             return PROTOCOL_T14_ICC_ERROR;
@@ -1147 +1119 @@
     }
     
-    /* End of transmission */
-    if (ICC_Async_EndTransmission (t14->icc) != ICC_ASYNC_OK)
-        return PROTOCOL_T14_ICC_ERROR;
-    
     return (ret);
 }