Changeset 1303 for branches/smartreader/csctapi/ifd_smartreader.c

Timestamp:

01/20/10 15:51:11 (12 years ago)

Author:

rorothetroll

Message:

more support for the smartreader ... not yet finish so don't expect it to work right now

File:

• branches/smartreader/csctapi/ifd_smartreader.c (modified) (14 diffs)

branches/smartreader/csctapi/ifd_smartreader.c

@@ -1 @@
-#ifdef HAVE_LIBUSB
-#ifdef USE_PTHREAD
+#if defined(HAVE_LIBUSB) && defined(USE_PTHREAD)
 /*
         ifd_smartreader.c
@@ -29 +28 @@
     ftdic.out_ep = 0x82;
 
+    
     //open the first smartreader if found by find_smartreader
     if ((ret = ftdi_usb_open(&ftdic, 0x0403, 0x6001)) < 0) {
-        cs_log("unable to open ftdi device: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
+        cs_log("unable to open ftdi device: %d (%s)", ret, ftdi_get_error_string(&ftdic));
         return ERROR;
     }
@@ -47 +47 @@
     ftdi_setflowctrl(&ftdic, 0);
 
+    // star the reading thread
+    g_read_buffer_size = 0;
+    pthread_mutex_init(&g_read_mutex,NULL);
+    pthread_mutex_init(&g_usb_mutex,NULL);
     ret = pthread_create(&rt, NULL, ReaderThread, (void *)&ftdic);
     if (ret) {
-        cs_log("ERROR; return code from pthread_create() is %d\n", ret);
+        cs_log("ERROR; return code from pthread_create() is %d", ret);
         return ERROR;
     }
@@ -133 +137 @@
 
     sr_config.fs=mhz*1000; //freq in KHz
-    EnableSmartReader(&ftdic, sr_config.fs, sr_config.F, sr_config.D, sr_config.N, sr_config.inv);
+    EnableSmartReader(&ftdic, sr_config.fs, sr_config.F, (BYTE)sr_config.D, sr_config.N, sr_config.inv);
 
     return OK;
@@ -147 +151 @@
     
     if (ftdi_init(ftdic) < 0) {
-        fprintf(stderr, "ftdi_init failed\n");
+        cs_log("ftdi_init failed");
         return ERROR;
     }
@@ -153 +157 @@
     if ((ret = ftdi_usb_find_all(ftdic, &devlist, 0x0403, 0x6001)) < 0)
     {
-        fprintf(stderr, "ftdi_usb_find_all failed: %d (%s)\n", ret, ftdi_get_error_string(ftdic));
-        return ERROR;
-    }
-
-    printf("Number of FTDI devices found: %d\n", ret);
-
+        cs_log( "ftdi_usb_find_all failed: %d (%s)", ret, ftdi_get_error_string(ftdic));
+        return ERROR;
+    }
+#ifdef DEBUG_IO
+    cs_log("Number of FTDI devices found: %d", ret);
+#endif
     i = 0;
     dev_found=FALSE;
     for (curdev = devlist; curdev != NULL; i++)
     {
-        printf("Checking device: %d\n", i);
-        if ((ret = ftdi_usb_get_strings(ftdic, curdev->dev, manufacturer, 128, description, 128, NULL, 0)) < 0)
-        {
-            fprintf(stderr, "ftdi_usb_get_strings failed: %d (%s)\n", ret, ftdi_get_error_string(ftdic));
+#ifdef DEBUG_IO
+        cs_log("Checking device: %d", i);
+        if ((ret = ftdi_usb_get_strings(ftdic, curdev->dev, manufacturer, 128, description, 128, NULL, 0)) < 0) {
+            cs_log( "ftdi_usb_get_strings failed: %d (%s)", ret, ftdi_get_error_string(ftdic));
             return ERROR;
         }
-        printf("Manufacturer: %s, Description: %s\n\n", manufacturer, description);
+        cs_log("Manufacturer: %s, Description: %s", manufacturer, description);
+#endif
         if (i==index)
             {
-            printf("Found device index %d\n",i);
+#ifdef DEBUG_IO
+            cs_log("Found device index %d",i);
+#endif
             dev_found=TRUE;
             break;
@@ -183 +190 @@
     if(!dev_found)
         {
-        printf("Device not found\n");
+        cs_log("Smartreader device number %d not found",index);
         
         ftdi_deinit(ftdic);
@@ -238 +245 @@
     int ret = 0;
     int idx;
-    printf("write: ");
-    hexdump(buff, size, 0);
-
+
+#ifdef DEBUG_IO
     struct timeval start, stop, taken;
     gettimeofday(&start, NULL);
+#endif
 
     if (udelay == 0) {
@@ -261 +268 @@
     }
 
+#ifdef DEBUG_IO
     gettimeofday(&stop, NULL);
     timersub(&stop, &start, &taken);
-    printf(" took %u.000%u seconds\n", (unsigned int) taken.tv_sec, (unsigned int) taken.tv_usec);
+    cs_log(" took %u.000%u seconds", (unsigned int) taken.tv_sec, (unsigned int) taken.tv_usec);
+#endif
     return ret;
 }
@@ -316 +325 @@
 
     smart_flush(ftdic);
-    EnableSmartReader(ftdic, 3571200, 372, 1, 0, 0);
+
     // set smartreader+ default values 
     sr_config.F=372; 
@@ -324 +333 @@
     sr_config.T=0; 
     sr_config.inv=0; 
+    EnableSmartReader(ftdic, sr_config.fs, sr_config.F, (BYTE)sr_config.D, sr_config.N, sr_config.inv);
 
 }
@@ -333 +343 @@
     bool running = TRUE;
     int ret;
+    int copy_size;
     unsigned char local_buffer[64];  //64 is max transfer size of FTDI bulk pipe
 
@@ -350 +361 @@
         pthread_yield_np();
 
-        if(ret>2){  //FTDI always sends modem status bytes as first 2 chars with the 232BM
+        if(ret>2) {  //FTDI always sends modem status bytes as first 2 chars with the 232BM
             pthread_mutex_lock(&g_read_mutex);
 
-            int copy_size = sizeof(g_read_buffer) - g_read_buffer_size > ret-2 ?ret-2: sizeof(g_read_buffer) - g_read_buffer_size;
+            copy_size = sizeof(g_read_buffer) - g_read_buffer_size > ret-2 ?ret-2: sizeof(g_read_buffer) - g_read_buffer_size;
             memcpy(g_read_buffer+g_read_buffer_size,local_buffer+2,copy_size);
             g_read_buffer_size += copy_size;            
-            //printf("Transferred %u bytes to read buffer - current buffer = ",copy_size); hexdump(g_read_buffer,g_read_buffer_size); printf("\n");
             pthread_mutex_unlock(&g_read_mutex);
-        }else{
+        } 
+        else {
             //sleep for 50ms since there was nothing to read last time
             usleep(50000);
@@ -367 +378 @@
 }
 
-#endif // USE_PTHREAD
-#endif //HAVE_LIBUSB
+#endif // HAVE_LIBUSB && USE_PTHREAD