Changeset 1235

Timestamp:

01/15/10 11:28:21 (11 years ago)

Author:

dingo35

Message:

Cleanup reader_type code in csctapi

Location:

trunk/csctapi

Files:

• ifd_towitoko.c (modified) (7 diffs)
• io_serial.c (modified) (1 diff)
• io_serial.h (modified) (1 diff)
• pps.c (modified) (1 diff)
• protocol_t0.c (modified) (1 diff)

trunk/csctapi/ifd_towitoko.c

@@ -164 +164 @@
     
 #ifdef DEBUG_IFD
-    printf ("IFD: Initializing slot number %d, com=%d\n", slot, io->reader_type);
+    printf ("IFD: Initializing slot number %d, com=%d\n", slot, reader[ridx].typ);
 #endif
     
@@ -171 +171 @@
         return IFD_TOWITOKO_PARAM_ERROR;
         
-    if(io->reader_type==R_INTERNAL)
+    if(reader[ridx].typ == R_INTERNAL)
     {
         ifd->io = io;
@@ -256 +256 @@
 int IFD_Towitoko_SetBaudrate (IFD * ifd, unsigned long baudrate)
 {
-    if(ifd->io->reader_type==R_INTERNAL)
+    if(reader[ridx].typ == R_INTERNAL)
     {
         return IFD_TOWITOKO_OK;
@@ -283 +283 @@
 int IFD_Towitoko_GetBaudrate (IFD * ifd, unsigned long *baudrate)
 {
-    if(ifd->io->reader_type==R_INTERNAL)
+    if(reader[ridx].typ == R_INTERNAL)
     {
         return IFD_TOWITOKO_OK;
@@ -299 +299 @@
 extern int IFD_Towitoko_SetParity (IFD * ifd, BYTE parity)
 {
-    if(ifd->io->reader_type==R_INTERNAL)
+    if(reader[ridx].typ == R_INTERNAL)
     {
         return IFD_TOWITOKO_OK;
@@ -334 +334 @@
 #endif
 #ifdef SCI_DEV
-    if(ifd->io->reader_type==R_INTERNAL)
+    if(reader[ridx].typ == R_INTERNAL)
     {
         int in;
@@ -372 +372 @@
 
 #ifdef SCI_DEV
-    if(ifd->io->reader_type==R_INTERNAL)
+    if(reader[ridx].typ == R_INTERNAL)
     {
         int in;

trunk/csctapi/io_serial.c

@@ -171 +171 @@
 bool IO_Serial_Init (IO_Serial * io, int reader_type)
 {
-    reader[ridx].typ = reader_type;
-    reader[ridx].handle = reader[ridx].handle;
-
-    if (reader_type != R_INTERNAL)
+    if (reader[ridx].typ != R_INTERNAL)
         IO_Serial_InitPnP (io);
     

trunk/csctapi/io_serial.h

@@ -64 +64 @@
     int rts;    
     /* end settings that can be modified */
-    int reader_type;
     BYTE PnP_id[IO_SERIAL_PNPID_SIZE];  /* PnP Id of the serial device */
     unsigned PnP_id_size;           /* Length of PnP Id */

trunk/csctapi/pps.c

@@ -432 +432 @@
 #include "sci_global.h"
 #include "sci_ioctl.h"
-    if(pps->icc->ifd->io->reader_type == R_INTERNAL)
+    if(reader[ridx].typ == R_INTERNAL)
     {
         int n;

trunk/csctapi/protocol_t0.c

@@ -1001 +1001 @@
         return PROTOCOL_T14_ERROR;
     
-    if(t14->icc->ifd->io->reader_type!=R_INTERNAL)
+    if (reader[ridx].typ != R_INTERNAL)
     {
         /* Send 0x01 byte */