[Pcsclite-cvs-commit] r3157 - in /trunk/PCSC/src: hotplug_libhal.c hotplug_libusb.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Tue Oct 7 12:28:09 UTC 2008
Author: rousseau
Date: Tue Oct 7 12:28:09 2008
New Revision: 3157
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3157
Log:
call CheckForOpenCT() if RFAddReader() fails.
The first cause of pcsc-lite failure is that OpenCT is installed and
running and has already claimed the USB device. In that case
RFAddReader() fails and I get a user support request
Modified:
trunk/PCSC/src/hotplug_libhal.c
trunk/PCSC/src/hotplug_libusb.c
Modified: trunk/PCSC/src/hotplug_libhal.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libhal.c?rev=3157&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libhal.c (original)
+++ trunk/PCSC/src/hotplug_libhal.c Tue Oct 7 12:28:09 2008
@@ -30,6 +30,7 @@
#include "sys_generic.h"
#include "hotplug.h"
#include "thread_generic.h"
+#include "utils.h"
#undef DEBUG_HOTPLUG
#define ADD_SERIAL_NUMBER
@@ -397,6 +398,8 @@
readerTracker[i].fullName = NULL;
free(readerTracker[i].udi);
readerTracker[i].udi = NULL;
+
+ (void)CheckForOpenCT();
}
SYS_MutexUnLock(&usbNotifierMutex);
Modified: trunk/PCSC/src/hotplug_libusb.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libusb.c?rev=3157&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libusb.c (original)
+++ trunk/PCSC/src/hotplug_libusb.c Tue Oct 7 12:28:09 2008
@@ -38,6 +38,7 @@
#include "winscard_msg.h"
#include "sys_generic.h"
#include "hotplug.h"
+#include "utils.h"
#undef DEBUG_HOTPLUG
#define ADD_SERIAL_NUMBER
@@ -524,7 +525,11 @@
driver->libraryPath, deviceName) == SCARD_S_SUCCESS)
readerTracker[i].status = READER_PRESENT;
else
+ {
readerTracker[i].status = READER_FAILED;
+
+ (void)CheckForOpenCT();
+ }
SYS_MutexUnLock(&usbNotifierMutex);
More information about the Pcsclite-cvs-commit
mailing list