Changeset 4166

Timestamp:

12/20/10 10:29:23 (12 years ago)

Author:

dingo35

Message:

move pcsc_close to icc_async, where ifd specific code belongs

Location:

trunk

Files:

• csctapi/icc_async.c (modified) (2 diffs)
• oscam.c (modified) (2 diffs)
• reader-common.c (modified) (1 diff)
• reader-common.h (modified) (1 diff)

trunk/csctapi/icc_async.c

@@ -39 +39 @@
 #include "ifd_smartreader.h"
 #include "ifd_azbox.h"
+#ifdef HAVE_PCSC
+#include "csctapi/ifd_pcsc.h"
+#endif
 
 // Default T0/T14 settings
@@ -508 +511 @@
 #endif
             break;
+#ifdef HAVE_PCSC
+        case R_PCSC:
+            call(pcsc_close(reader));
+            break;
+#endif
         default:
             cs_log("ERROR ICC_Async_Close: unknow reader type %i",reader->typ);

trunk/oscam.c

@@ -16 +16 @@
 
 extern void cs_statistics(struct s_client * client);
+extern int ICC_Async_Close (struct s_reader *reader);
 
 /*****************************************************************************
@@ -538 +539 @@
         }
         // close the device
-        reader_device_close(cl->reader);
+          ICC_Async_Close(cl->reader);
         break;
 

trunk/reader-common.c

@@ -415 +415 @@
     return (rdr->fd && (rdr->caid[0] == b2i(2,ep->caid) || rdr->typ == R_CCCAM));
 }
-
-void reader_device_close(struct s_reader * reader)
-{
-#ifdef HAVE_PCSC
-    if (reader->typ == R_PCSC)
-       pcsc_close(reader);
-    else
-#endif
-       ICC_Async_Close(reader);
-}

trunk/reader-common.h

@@ -12 +12 @@
 
 int check_emm_cardsystem(struct s_reader * rdr, EMM_PACKET *ep);
-void reader_device_close(struct s_reader * reader);
 
 #define write_cmd(cmd, data) \