Changeset 1723

Timestamp:

02/26/10 19:05:09 (11 years ago)

Author:

merek

Message:

Merge from UMP r1794

Location:

trunk

Files:

• Makefile (modified) (5 diffs)
• csctapi/ifd_smartreader.c (modified) (52 diffs)
• csctapi/ifd_smartreader.h (modified) (1 diff)
• globals.h (modified) (2 diffs)

trunk/Makefile

@@ -68 +68 @@
         OS_CULI="-lncurses" \
         OS_PTLI="-lpthread" \
-        DS_OPTS="-O2 -DOS_LINUX -DWEBIF -DCS_CONFDIR=${CS_CONFDIR} -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \
+        DS_OPTS="-O2 -DOS_LINUX -DCS_CONFDIR=${CS_CONFDIR} -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \
         DS_CFLAGS="-c" \
         DS_LDFLAGS="" \
@@ -89 +89 @@
         OS_CULI="-lncurses" \
         OS_PTLI="-lpthread" \
-        DS_OPTS="-O2 -DOS_LINUX -DUSE_PTHREAD -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \
+        DS_OPTS="-O2 -DOS_LINUX -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \
         DS_CFLAGS="-c" \
         DS_LDFLAGS="" \
@@ -132 +132 @@
         OS_CULI="-lncurses" \
         OS_PTLI="-lpthread -lpcsclite" \
-        DS_OPTS="-O2 -DOS_LINUX -DUSE_PTHREAD -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -I/usr/include/PCSC -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \
+        DS_OPTS="-O2 -DOS_LINUX -DLIBUSB -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -I/usr/include/PCSC -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \
         DS_CFLAGS="-c" \
         DS_LDFLAGS="" \
@@ -153 +153 @@
         OS_CULI="-lncurses" \
         OS_PTLI="-lpthread" \
-        DS_OPTS="-O2 -DOS_MACOSX -DNEED_DAEMON -DCS_NOSHM -DHAVE_PTHREAD_H -DUSE_PTHREAD -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -m32 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \
+        DS_OPTS="-O2 -DOS_MACOSX -DNEED_DAEMON -DCS_NOSHM -DHAVE_PTHREAD_H -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -m32 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""'" \
         DS_CFLAGS="-c" \
         DS_LDFLAGS="-framework PCSC" \
@@ -175 +175 @@
         OS_CULI="-lncurses" \
         OS_PTLI="-lpthread" \
-        DS_OPTS="-O2 -DOS_MACOSX -DNEED_DAEMON -DCS_NOSHM -DHAVE_PTHREAD_H -DUSE_PTHREAD -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -DLIBUSB -m32 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \
+        DS_OPTS="-O2 -DOS_MACOSX -DNEED_DAEMON -DCS_NOSHM -DHAVE_PTHREAD_H  -DCS_CONFDIR=${CS_CONFDIR} -DHAVE_PCSC=1 -DLIBUSB -m32 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -D'CS_SVN_VERSION="\"$(SVN_REV)\""' -I/usr/local/include" \
         DS_CFLAGS="-c" \
         DS_LDFLAGS="-framework PCSC -Wl,-framework -Wl,IOKit -Wl,-framework -Wl,CoreFoundation -Wl,-prebind -no-undefined" \

trunk/csctapi/ifd_smartreader.c

@@ -16 +16 @@
 
 //local globals
-unsigned char g_read_buffer[4096];
-unsigned int g_read_buffer_size;
-pthread_mutex_t g_read_mutex;
-pthread_mutex_t g_usb_mutex;
-//struct usb_device *smartreader_usb_dev;
-pthread_t rt;
-unsigned char modem_status;
 SR_CONFIG sr_config;
 
@@ -73 +66 @@
         return ERROR;
     }
-
+    reader->sr_config=malloc(sizeof(SR_CONFIG));
+    if(!reader) {
+        cs_log("Couldn't allocate memory for Device=%s config",reader->device);
+        return ERROR;
+    }
     cs_debug_mask (D_IFD,"IO:SR: Looking for device %s on bus %s",devname,busname);
 
@@ -84 +81 @@
     smartreader_init(reader);
 
-    sr_config.usb_dev=find_smartreader(busname,devname);
-    if(!sr_config.usb_dev)
+    reader->sr_config->usb_dev=find_smartreader(busname,devname);
+    if(!reader->sr_config->usb_dev)
         return ERROR;
 
@@ -93 +90 @@
     //also a good way to compare a real FT232 with a smartreader
     //if you enumarate usb devices
-    sr_config.in_ep = 0x1;
-    sr_config.out_ep = 0x82;
+    reader->sr_config->in_ep = 0x1;
+    reader->sr_config->out_ep = 0x82;
 
     //open the first smartreader found in the system, this
@@ -122 +119 @@
 
     // start the reading thread
-    g_read_buffer_size = 0;
-    modem_status = 0 ;
-    pthread_mutex_init(&g_read_mutex,NULL);
-    pthread_mutex_init(&g_usb_mutex,NULL);
-    ret = pthread_create(&rt, NULL, ReaderThread, (void *)(reader));
+    reader->sr_config->g_read_buffer_size = 0;
+    reader->sr_config->modem_status = 0 ;
+    pthread_mutex_init(&reader->sr_config->g_read_mutex,NULL);
+    pthread_mutex_init(&reader->sr_config->g_usb_mutex,NULL);
+    ret = pthread_create(&reader->sr_config->rt, NULL, ReaderThread, (void *)(reader));
     if (ret) {
         cs_log("ERROR; return code from pthread_create() is %d", ret);
@@ -140 +137 @@
     int state;
 
-    pthread_mutex_lock(&g_read_mutex);
-    state =(modem_status & 0x80) == 0x80 ? 0 : 2;
-    pthread_mutex_unlock(&g_read_mutex);
+    pthread_mutex_lock(&reader->sr_config->g_read_mutex);
+    state =(reader->sr_config->modem_status & 0x80) == 0x80 ? 0 : 2;
+    pthread_mutex_unlock(&reader->sr_config->g_read_mutex);
 
     
@@ -166 +163 @@
     
     if(reader->mhz==reader->cardmhz && reader->cardmhz*10000 > 3690000)
-        sr_config.fs=reader->cardmhz*10000; 
+        reader->sr_config->fs=reader->cardmhz*10000; 
     else    
-        sr_config.fs=3690000; 
+        reader->sr_config->fs=3690000; 
 
     smart_flush(reader);
     // set smartreader+ default values 
-    sr_config.F=372; 
-    sr_config.D=1.0; 
+    reader->sr_config->F=372; 
+    reader->sr_config->D=1.0; 
     if(reader->mhz==reader->cardmhz && reader->cardmhz*10000 > 3690000)
-        sr_config.fs=reader->cardmhz*10000; 
+        reader->sr_config->fs=reader->cardmhz*10000; 
     else    
-        sr_config.fs=3690000; 
-    sr_config.N=0; 
-    sr_config.T=0; 
-    sr_config.inv=0; 
+        reader->sr_config->fs=3690000; 
+    reader->sr_config->N=0; 
+    reader->sr_config->T=0; 
+    reader->sr_config->inv=0; 
 
     for(i=0 ; i < 4 ;i++) {
-        sr_config.irdeto=FALSE;
+        reader->sr_config->irdeto=FALSE;
         atr_ok=ERROR;
         memset(data,0,sizeof(data));
@@ -192 +189 @@
         if(i==3) {
             cs_debug_mask (D_IFD,"IO:SR: Trying irdeto");
-            sr_config.F=618; /// magic smartreader value
-            sr_config.D=1;
-            sr_config.T=2; // will be set to T=1 in EnableSmartReader
-            sr_config.irdeto=TRUE;
+            reader->sr_config->F=618; /// magic smartreader value
+            reader->sr_config->D=1;
+            reader->sr_config->T=2; // will be set to T=1 in EnableSmartReader
+            reader->sr_config->irdeto=TRUE;
         }
         
         smart_flush(reader);
-        EnableSmartReader(reader, sr_config.fs/10000, sr_config.F, (BYTE)sr_config.D, sr_config.N, sr_config.T, sr_config.inv,parity[i]);
+        EnableSmartReader(reader, reader->sr_config->fs/10000, reader->sr_config->F, (BYTE)reader->sr_config->D, reader->sr_config->N, reader->sr_config->T, reader->sr_config->inv,parity[i]);
         sched_yield();
         cs_sleepms(500); //smartreader in mouse mode needs this, so it might also be needed in native mode.
@@ -226 +223 @@
 
         if(data[0]!=0x3B && data[0]!=0x03 && data[0]!=0x3F) {
-            sr_config.irdeto=FALSE;
+            reader->sr_config->irdeto=FALSE;
             continue; // this is not a valid ATR.
         }
@@ -233 +230 @@
             cs_debug_mask (D_IFD,"IO:SR: Inverse convention detected, setting smartreader inv to 1");
 
-            sr_config.inv=1;
-            EnableSmartReader(reader, sr_config.fs/10000, sr_config.F, (BYTE)sr_config.D, sr_config.N, sr_config.T, sr_config.inv,parity[i]);
+            reader->sr_config->inv=1;
+            EnableSmartReader(reader, reader->sr_config->fs/10000, reader->sr_config->F, (BYTE)reader->sr_config->D, reader->sr_config->N, reader->sr_config->T, reader->sr_config->inv,parity[i]);
         }
         // parse atr
@@ -242 +239 @@
             if(i==3) {
                 cs_debug_mask (D_IFD,"IO:SR: Locking F and D for Irdeto mode");
-                sr_config.irdeto=TRUE;
+                reader->sr_config->irdeto=TRUE;
             }
         }
@@ -278 +275 @@
 {
 //      maintaining all this admin seems overdone, since after this init the values are nowhere needed
-//      reader[ridx].sr_config.F=F;
-//      reader[ridx].sr_config.D=D;
-//      reader[ridx].sr_config.N=N;
-//      reader[ridx].sr_config.T=T;
-//   sr_config.fs=reader->mhz*10000; //freq in Hz */
-//    EnableSmartReader(reader, sr_config.fs, sr_config.F, (BYTE)sr_config.D, sr_config.N, sr_config.T, sr_config.inv,sr_config.parity);
+//      reader[ridx].reader->sr_config->F=F;
+//      reader[ridx].reader->sr_config->D=D;
+//      reader[ridx].reader->sr_config->N=N;
+//      reader[ridx].reader->sr_config->T=T;
+//   reader->sr_config->fs=reader->mhz*10000; //freq in Hz */
+//    EnableSmartReader(reader, reader->sr_config->fs, reader->sr_config->F, (BYTE)reader->sr_config->D, reader->sr_config->N, reader->sr_config->T, reader->sr_config->inv,reader->sr_config->parity);
         
     // smartreader supports 3.20, 3.43, 3.69, 4.00, 4.36, 4.80, 5.34, 6.00, 6.86, 8.00, 9.61, 12.0, 16.0 Mhz
-        sr_config.inv = convention;//FIXME this one is set by icc_async and local smartreader reset routine  
+        reader->sr_config->inv = convention;//FIXME this one is set by icc_async and local smartreader reset routine  
         if (reader->mhz >=1600) reader->mhz = 1600; else
         if (reader->mhz >=1200) reader->mhz = 1200; else
@@ -300 +297 @@
         if (reader->mhz >=343)  reader->mhz =  343; else
             reader->mhz =  320;
-    EnableSmartReader(reader, reader->mhz, F, D, N, T, sr_config.inv,sr_config.parity);
+    EnableSmartReader(reader, reader->mhz, F, D, N, T, reader->sr_config->inv,reader->sr_config->parity);
 
     //baud rate not really used in native mode since
@@ -331 +328 @@
     cs_debug_mask(D_IFD,"IO:SR: Closing smarteader\n");
 
-    sr_config.running=FALSE;
-    pthread_join(rt,NULL);
-    libusb_close(sr_config.usb_dev_handle);
+    reader->sr_config->running=FALSE;
+    pthread_join(reader->sr_config->rt,NULL);
+    libusb_close(reader->sr_config->usb_dev_handle);
     libusb_exit(NULL);
+    free(reader->sr_config);
     return OK;
 
@@ -355 +353 @@
 
     // command 1, set F and D parameter
-    if(!sr_config.irdeto) {
+    if(!reader->sr_config->irdeto) {
         cs_debug_mask (D_IFD,"IO:SR: sending F=%04X (%d) to smartreader",Fi,Fi);
         cs_debug_mask (D_IFD,"IO:SR: sending D=%02X (%d) to smartreader",Di,Di);
@@ -384 +382 @@
 
     // command 4 , set parameter T
-    if(sr_config.irdeto && T==2) // special trick to get ATR for Irdeto card, we need T=1 at reset, after that oscam takes care of T1 protocol, so we need T=0
+    if(reader->sr_config->irdeto && T==2) // special trick to get ATR for Irdeto card, we need T=1 at reset, after that oscam takes care of T1 protocol, so we need T=0
         {
         T=1;
-        sr_config.T=1;
+        reader->sr_config->T=1;
         }
     else if (T==1)
@@ -505 +503 @@
 void smartreader_init(S_READER *reader)
 {
-    sr_config.usb_dev = NULL;
-    sr_config.usb_dev_handle=NULL;
-    sr_config.usb_read_timeout = 10000;
-    sr_config.usb_write_timeout = 10000;
-
-    sr_config.type = TYPE_BM;    /* chip type */
-    sr_config.baudrate = -1;
-    sr_config.bitbang_enabled = 0;  /* 0: normal mode 1: any of the bitbang modes enabled */
-
-    sr_config.writebuffer_chunksize = 64;
-    sr_config.max_packet_size = 0;
-
-    sr_config.interface = INTERFACE_ANY;
-    sr_config.index = INTERFACE_A;
-    sr_config.in_ep = 0x02;
-    sr_config.out_ep = 0x82;
+    reader->sr_config->usb_dev = NULL;
+    reader->sr_config->usb_dev_handle=NULL;
+    reader->sr_config->usb_read_timeout = 10000;
+    reader->sr_config->usb_write_timeout = 10000;
+
+    reader->sr_config->type = TYPE_BM;    /* chip type */
+    reader->sr_config->baudrate = -1;
+    reader->sr_config->bitbang_enabled = 0;  /* 0: normal mode 1: any of the bitbang modes enabled */
+
+    reader->sr_config->writebuffer_chunksize = 64;
+    reader->sr_config->max_packet_size = 0;
+
+    reader->sr_config->interface = INTERFACE_ANY;
+    reader->sr_config->index = INTERFACE_A;
+    reader->sr_config->in_ep = 0x02;
+    reader->sr_config->out_ep = 0x82;
 }
 
@@ -536 +534 @@
     // New hi-speed devices from FTDI use a packet size of 512 bytes
     // but could be connected to a normal speed USB hub -> 64 bytes packet size.
-    if (sr_config.type == TYPE_2232H || sr_config.type == TYPE_4232H)
+    if (reader->sr_config->type == TYPE_2232H || reader->sr_config->type == TYPE_4232H)
         packet_size = 512;
     else
         packet_size = 64;
 
-    ret = libusb_get_device_descriptor(sr_config.usb_dev, &desc);
+    ret = libusb_get_device_descriptor(reader->sr_config->usb_dev, &desc);
     if (ret < 0) {
         cs_log("Smartreader : couldn't read device descriptor , using default packet size");
@@ -548 +546 @@
     if (desc.bNumConfigurations)
     {
-        ret=libusb_get_active_config_descriptor(sr_config.usb_dev,&configDesc);
+        ret=libusb_get_active_config_descriptor(reader->sr_config->usb_dev,&configDesc);
         if(ret) {
             cs_log("Smartreader : couldn't read config descriptor , using default packet size");
@@ -554 +552 @@
         }
 
-        if (sr_config.interface < configDesc->bNumInterfaces)
+        if (reader->sr_config->interface < configDesc->bNumInterfaces)
         {
-            interface=configDesc->interface[sr_config.interface];
+            interface=configDesc->interface[reader->sr_config->interface];
             if (interface.num_altsetting > 0)
             {
@@ -576 +574 @@
     int ret = 0;
 
-    if (sr_config.usb_dev_handle)
-    {
-       libusb_close (sr_config.usb_dev_handle);
-       sr_config.usb_dev_handle=NULL;
+    if (reader->sr_config->usb_dev_handle)
+    {
+       libusb_close (reader->sr_config->usb_dev_handle);
+       reader->sr_config->usb_dev_handle=NULL;
     }
 
@@ -588 +586 @@
 int smartreader_usb_reset(S_READER *reader)
 {
-    if (libusb_control_transfer(sr_config.usb_dev_handle,
+    if (libusb_control_transfer(reader->sr_config->usb_dev_handle,
                                 FTDI_DEVICE_OUT_REQTYPE,
                                 SIO_RESET_REQUEST,
                                 SIO_RESET_SIO,
-                                sr_config.index,
+                                reader->sr_config->index,
                                 NULL,
                                 0,
-                                sr_config.usb_write_timeout) != 0) {
+                                reader->sr_config->usb_write_timeout) != 0) {
         cs_log("Smartreader reset failed");
         return (-1);
@@ -619 +617 @@
 #endif
 
-    ret=libusb_open(sr_config.usb_dev,&sr_config.usb_dev_handle);
+    ret=libusb_open(reader->sr_config->usb_dev,&reader->sr_config->usb_dev_handle);
     if (ret) {
         cs_log("Smartreader usb_open() failed");
@@ -632 +630 @@
     // detach operation might be denied and everything still works fine.
     // Likely scenario is a static smartreader_sio kernel module.
-    if (libusb_detach_kernel_driver(sr_config.usb_dev_handle, sr_config.interface) != 0 && errno != ENODATA) {
+    if (libusb_detach_kernel_driver(reader->sr_config->usb_dev_handle, reader->sr_config->interface) != 0 && errno != ENODATA) {
         detach_errno = errno;
         cs_log("Couldn't detach interface from kernel. Please unload the FTDI drivers");
@@ -638 +636 @@
     }
 #endif
-    ret = libusb_get_device_descriptor(sr_config.usb_dev, &desc);
+    ret = libusb_get_device_descriptor(reader->sr_config->usb_dev, &desc);
 
 #ifdef __WIN32__
@@ -647 +645 @@
     if (desc.bNumConfigurations > 0)
     {
-        ret=libusb_get_configuration(sr_config.usb_dev_handle,&config);
+        ret=libusb_get_configuration(reader->sr_config->usb_dev_handle,&config);
         
         // libusb-win32 on Windows 64 can return a null pointer for a valid device
-        if (libusb_set_configuration(sr_config.usb_dev_handle, config) &&
+        if (libusb_set_configuration(reader->sr_config->usb_dev_handle, config) &&
             errno != EBUSY)
         {
@@ -666 +664 @@
 #endif
 
-    ret=libusb_claim_interface(sr_config.usb_dev_handle, sr_config.interface) ;
+    ret=libusb_claim_interface(reader->sr_config->usb_dev_handle, reader->sr_config->interface) ;
     if (ret!= 0)
     {
@@ -690 +688 @@
     if (desc.bcdDevice == 0x400 || (desc.bcdDevice == 0x200
             && desc.iSerialNumber == 0))
-        sr_config.type = TYPE_BM;
+        reader->sr_config->type = TYPE_BM;
     else if (desc.bcdDevice == 0x200)
-        sr_config.type = TYPE_AM;
+        reader->sr_config->type = TYPE_AM;
     else if (desc.bcdDevice == 0x500)
-        sr_config.type = TYPE_2232C;
+        reader->sr_config->type = TYPE_2232C;
     else if (desc.bcdDevice == 0x600)
-        sr_config.type = TYPE_R;
+        reader->sr_config->type = TYPE_R;
     else if (desc.bcdDevice == 0x700)
-        sr_config.type = TYPE_2232H;
+        reader->sr_config->type = TYPE_2232H;
     else if (desc.bcdDevice == 0x800)
-        sr_config.type = TYPE_4232H;
+        reader->sr_config->type = TYPE_4232H;
 
     // Set default interface on dual/quad type chips
-    switch(sr_config.type) {
+    switch(reader->sr_config->type) {
         case TYPE_2232C:
         case TYPE_2232H:
         case TYPE_4232H:
-            if (!sr_config.index)
-                sr_config.index = INTERFACE_A;
+            if (!reader->sr_config->index)
+                reader->sr_config->index = INTERFACE_A;
             break;
         default:
@@ -715 +713 @@
 
     // Determine maximum packet size
-    sr_config.max_packet_size = smartreader_determine_max_packet_size(reader);
+    reader->sr_config->max_packet_size = smartreader_determine_max_packet_size(reader);
 
     if (smartreader_set_baudrate (reader, 9600) != 0) {
@@ -729 +727 @@
 int smartreader_usb_purge_rx_buffer(S_READER *reader)
 {
-    if (libusb_control_transfer(sr_config.usb_dev_handle,
+    if (libusb_control_transfer(reader->sr_config->usb_dev_handle,
                                 FTDI_DEVICE_OUT_REQTYPE,
                                 SIO_RESET_REQUEST,
                                 SIO_RESET_PURGE_RX,
-                                sr_config.index,
+                                reader->sr_config->index,
                                 NULL,
                                 0,
-                                sr_config.usb_write_timeout) != 0) {
+                                reader->sr_config->usb_write_timeout) != 0) {
         cs_log("FTDI purge of RX buffer failed");
         return (-1);
@@ -747 +745 @@
 int smartreader_usb_purge_tx_buffer(S_READER *reader)
 {
-    if (libusb_control_transfer(sr_config.usb_dev_handle,
+    if (libusb_control_transfer(reader->sr_config->usb_dev_handle,
                                 FTDI_DEVICE_OUT_REQTYPE,
                                 SIO_RESET_REQUEST,
                                 SIO_RESET_PURGE_TX,
-                                sr_config.index,
+                                reader->sr_config->index,
                                 NULL,
                                 0,
-                                sr_config.usb_write_timeout) != 0) {
+                                reader->sr_config->usb_write_timeout) != 0) {
         cs_log("FTDI purge of TX buffer failed");
         return (-1);
@@ -794 +792 @@
     divisor = 24000000 / baudrate;
 
-    if (sr_config.type == TYPE_AM)
+    if (reader->sr_config->type == TYPE_AM)
     {
         // Round down to supported fraction (AM only)
@@ -816 +814 @@
             try_divisor = 8;
         }
-        else if (sr_config.type != TYPE_AM && try_divisor < 12)
+        else if (reader->sr_config->type != TYPE_AM && try_divisor < 12)
         {
             // BM doesn't support divisors 9 through 11 inclusive
@@ -828 +826 @@
         else
         {
-            if (sr_config.type == TYPE_AM)
+            if (reader->sr_config->type == TYPE_AM)
             {
                 // Round up to supported fraction (AM only)
@@ -884 +882 @@
     // Split into "value" and "index" values
     *value = (unsigned short)(encoded_divisor & 0xFFFF);
-    if (sr_config.type == TYPE_2232C || sr_config.type == TYPE_2232H || sr_config.type == TYPE_4232H)
+    if (reader->sr_config->type == TYPE_2232C || reader->sr_config->type == TYPE_2232H || reader->sr_config->type == TYPE_4232H)
     {
         *index = (unsigned short)(encoded_divisor >> 8);
         *index &= 0xFF00;
-        *index |= sr_config.index;
+        *index |= reader->sr_config->index;
     }
     else
@@ -902 +900 @@
     int actual_baudrate;
 
-    if (sr_config.bitbang_enabled)
+    if (reader->sr_config->bitbang_enabled)
     {
         baudrate = baudrate*4;
@@ -922 +920 @@
     }
 
-    if (libusb_control_transfer(sr_config.usb_dev_handle,
+    if (libusb_control_transfer(reader->sr_config->usb_dev_handle,
                                 FTDI_DEVICE_OUT_REQTYPE,
                                 SIO_SET_BAUDRATE_REQUEST,
@@ -929 +927 @@
                                 NULL,
                                 0,
-                                sr_config.usb_write_timeout) != 0) {
+                                reader->sr_config->usb_write_timeout) != 0) {
         cs_log("Setting new baudrate failed");
         return (-2);
     }
 
-    sr_config.baudrate = baudrate;
+    reader->sr_config->baudrate = baudrate;
     return 0;
 }
@@ -952 +950 @@
         usb_val |= SIO_SET_RTS_LOW;
 
-    if (libusb_control_transfer(sr_config.usb_dev_handle,
+    if (libusb_control_transfer(reader->sr_config->usb_dev_handle,
                                 FTDI_DEVICE_OUT_REQTYPE,
                                 SIO_SET_MODEM_CTRL_REQUEST,
                                 usb_val,
-                                sr_config.index,
+                                reader->sr_config->index,
                                 NULL,
                                 0,
-                                sr_config.usb_write_timeout) != 0) {
+                                reader->sr_config->usb_write_timeout) != 0) {
         cs_log("set of rts/dtr failed");
         return (-1);
@@ -969 +967 @@
 int smartreader_setflowctrl(S_READER *reader, int flowctrl)
 {
-    if (libusb_control_transfer(sr_config.usb_dev_handle,
+    if (libusb_control_transfer(reader->sr_config->usb_dev_handle,
                                 FTDI_DEVICE_OUT_REQTYPE,
                                 SIO_SET_FLOW_CTRL_REQUEST,
                                 0,
-                                (flowctrl | sr_config.index),
+                                (flowctrl | reader->sr_config->index),
                                 NULL,
                                 0,
-                                sr_config.usb_write_timeout) != 0) {
+                                reader->sr_config->usb_write_timeout) != 0) {
         cs_log("set flow control failed");
         return (-1);
@@ -1032 +1030 @@
     }
 
-    if (libusb_control_transfer(sr_config.usb_dev_handle,
+    if (libusb_control_transfer(reader->sr_config->usb_dev_handle,
                                 FTDI_DEVICE_OUT_REQTYPE,
                                 SIO_SET_DATA_REQUEST,
                                 value,
-                                sr_config.index,
+                                reader->sr_config->index,
                                 NULL,
                                 0,
-                                sr_config.usb_write_timeout) != 0) {
+                                reader->sr_config->usb_write_timeout) != 0) {
         cs_log("Setting new line property failed");
         return (-1);
@@ -1061 +1059 @@
     smartreader_usb_purge_buffers(reader);
 
-    pthread_mutex_lock(&g_read_mutex);
-    g_read_buffer_size = 0;
-    pthread_mutex_unlock(&g_read_mutex);
+    pthread_mutex_lock(&reader->sr_config->g_read_mutex);
+    reader->sr_config->g_read_buffer_size = 0;
+    pthread_mutex_unlock(&reader->sr_config->g_read_mutex);
     sched_yield();
 }
@@ -1076 +1074 @@
     
     while(total_read < size && dif.tv_sec < timeout_sec) {
-        pthread_mutex_lock(&g_read_mutex);
+        pthread_mutex_lock(&reader->sr_config->g_read_mutex);
         
-        if(g_read_buffer_size > 0) {
+        if(reader->sr_config->g_read_buffer_size > 0) {
         
-            ret = g_read_buffer_size > size-total_read ? size-total_read : g_read_buffer_size;
-            memcpy(buff+total_read,g_read_buffer,ret);
-            g_read_buffer_size -= ret;
-
-        if(g_read_buffer_size > 0){
-        memcpy(g_read_buffer, g_read_buffer + ret, g_read_buffer_size);
+            ret = reader->sr_config->g_read_buffer_size > size-total_read ? size-total_read : reader->sr_config->g_read_buffer_size;
+            memcpy(buff+total_read,reader->sr_config->g_read_buffer,ret);
+            reader->sr_config->g_read_buffer_size -= ret;
+
+        if(reader->sr_config->g_read_buffer_size > 0){
+        memcpy(reader->sr_config->g_read_buffer, reader->sr_config->g_read_buffer + ret, reader->sr_config->g_read_buffer_size);
         }
 
             total_read+=ret;
         }
-        pthread_mutex_unlock(&g_read_mutex);
+        pthread_mutex_unlock(&reader->sr_config->g_read_mutex);
        
         gettimeofday(&now,NULL);
@@ -1114 +1112 @@
     int written;
      
-    if(size<sr_config.writebuffer_chunksize)
+    if(size<reader->sr_config->writebuffer_chunksize)
         write_size=size;
     else
-        write_size = sr_config.writebuffer_chunksize;
+        write_size = reader->sr_config->writebuffer_chunksize;
 
     while (offset < size)
@@ -1125 +1123 @@
             write_size = size-offset;
 
-        ret = libusb_bulk_transfer(sr_config.usb_dev_handle,
-                                    sr_config.in_ep, 
+        ret = libusb_bulk_transfer(reader->sr_config->usb_dev_handle,
+                                    reader->sr_config->in_ep, 
                                     buf+offset, 
                                     write_size,
                                     &written,
-                                    sr_config.usb_write_timeout);
+                                    reader->sr_config->usb_write_timeout);
         if (ret < 0) {
             cs_log("usb bulk write failed : ret = %d",ret);
@@ -1153 +1151 @@
 
     usb_val = latency;
-    if (libusb_control_transfer(sr_config.usb_dev_handle, 
+    if (libusb_control_transfer(reader->sr_config->usb_dev_handle, 
                         FTDI_DEVICE_OUT_REQTYPE,
                         SIO_SET_LATENCY_TIMER_REQUEST,
                         usb_val,
-                        sr_config.index,
+                        reader->sr_config->index,
                         NULL,
                         0,
-                        sr_config.usb_write_timeout) != 0) {
+                        reader->sr_config->usb_write_timeout) != 0) {
         cs_log("unable to set latency timer");
         return (-2);
@@ -1205 +1203 @@
         if(transfer->actual_length > 2) {  //FTDI always sends modem status bytes as first 2 chars with the 232BM
 
-            pthread_mutex_lock(&g_read_mutex);
-
-            if(g_read_buffer_size == sizeof(g_read_buffer)) {
+            pthread_mutex_lock(&reader->sr_config->g_read_mutex);
+
+            if(reader->sr_config->g_read_buffer_size == sizeof(reader->sr_config->g_read_buffer)) {
                 cs_log("IO:SR: buffer full\n");
                 //if out read buffer is full then delay
@@ -1214 +1212 @@
                 if(ret!=0)
                     cs_log("IO:SR: submit async transfer failed with error %d\n",ret);          
-                pthread_mutex_unlock(&g_read_mutex);
+                pthread_mutex_unlock(&reader->sr_config->g_read_mutex);
                 return;
              }
 
-            modem_status = transfer->buffer[1];
-            copy_size = sizeof(g_read_buffer) - g_read_buffer_size > (unsigned int)transfer->actual_length-2 ? (unsigned int)transfer->actual_length-2: sizeof(g_read_buffer) - g_read_buffer_size;
-            memcpy(g_read_buffer+g_read_buffer_size,transfer->buffer+2,copy_size);
-            g_read_buffer_size += copy_size;
-            pthread_mutex_unlock(&g_read_mutex);
+            reader->sr_config->modem_status = transfer->buffer[1];
+            copy_size = sizeof(reader->sr_config->g_read_buffer) - reader->sr_config->g_read_buffer_size > (unsigned int)transfer->actual_length-2 ? (unsigned int)transfer->actual_length-2: sizeof(reader->sr_config->g_read_buffer) - reader->sr_config->g_read_buffer_size;
+            memcpy(reader->sr_config->g_read_buffer+reader->sr_config->g_read_buffer_size,transfer->buffer+2,copy_size);
+            reader->sr_config->g_read_buffer_size += copy_size;
+            pthread_mutex_unlock(&reader->sr_config->g_read_mutex);
         }
         else {
             if(transfer->actual_length==2) {
-                pthread_mutex_lock(&g_read_mutex);
-                modem_status=transfer->buffer[1];
-                pthread_mutex_unlock(&g_read_mutex);
+                pthread_mutex_lock(&reader->sr_config->g_read_mutex);
+                reader->sr_config->modem_status=transfer->buffer[1];
+                pthread_mutex_unlock(&reader->sr_config->g_read_mutex);
             }
         }
@@ -1253 +1251 @@
     
     reader = (struct s_reader *)p;
-    sr_config.running=TRUE;
+    reader->sr_config->running=TRUE;
 
     for(idx=0; idx<NUM_TXFERS; idx++) {
@@ -1259 +1257 @@
 
          libusb_fill_bulk_transfer( usbt[idx],
-                                    sr_config.usb_dev_handle,
-                                    sr_config.out_ep,
+                                    reader->sr_config->usb_dev_handle,
+                                    reader->sr_config->out_ep,
                                     usb_buffers[idx],
                                     64,
@@ -1270 +1268 @@
     }
 
-    while(sr_config.running) {
+    while(reader->sr_config->running) {
         ret = libusb_handle_events(NULL);
         if(ret!=0) 
@@ -1279 +1277 @@
 }
 
-#endif // HAVE_LIBUSB && USE_PTHREAD
+#endif // HAVE_LIBUSB

trunk/csctapi/ifd_smartreader.h

@@ -33 +33 @@
 
 #endif // __SMARTREADER__
-#endif // HAVE_LIBUSB && USE_PTHREAD
+#endif // HAVE_LIBUSB

trunk/globals.h

@@ -306 +306 @@
     /** maximum packet size. Needed for filtering modem status bytes every n packets. */
     unsigned int max_packet_size;
+    unsigned char g_read_buffer[4096]; 
+    unsigned int g_read_buffer_size; 
+    pthread_mutex_t g_read_mutex; 
+    pthread_mutex_t g_usb_mutex; 
+    pthread_t rt; 
+    unsigned char modem_status; 
 } SR_CONFIG;
 #endif
@@ -524 +530 @@
   DWORD dwActiveProtocol;
 #endif
+#ifdef LIBUSB 
+  SR_CONFIG *sr_config; 
+#endif 
 };