[Pcsclite-cvs-commit] r2193 - trunk/PCSC/src

Ludovic Rousseau rousseau at alioth.debian.org
Sun Oct 29 20:27:52 CET 2006


Author: rousseau
Date: 2006-10-29 20:27:52 +0100 (Sun, 29 Oct 2006)
New Revision: 2193

Modified:
   trunk/PCSC/src/hotplug_libusb.c
   trunk/PCSC/src/pcscdaemon.c
Log:
check for rescan ongoing in pcscdaemon.c:signal_reload() instead of
hotplug_libusb.c:HPReCheckSerialReaders() since the code is not specific
to libusb


Modified: trunk/PCSC/src/hotplug_libusb.c
===================================================================
--- trunk/PCSC/src/hotplug_libusb.c	2006-10-23 14:57:51 UTC (rev 2192)
+++ trunk/PCSC/src/hotplug_libusb.c	2006-10-29 19:27:52 UTC (rev 2193)
@@ -493,20 +493,8 @@
 
 void HPReCheckSerialReaders(void)
 {
-	static int rescan_ongoing = FALSE;
-
-	if (rescan_ongoing)
-	{
-		Log1(PCSC_LOG_INFO, "Rescan already ongoing");
-		return;
-	}
-
-	rescan_ongoing = TRUE;
-
 	HPRescanUsbBus();
 	RFReCheckReaderConf();
-
-	rescan_ongoing = FALSE;
 }
 
 #endif

Modified: trunk/PCSC/src/pcscdaemon.c
===================================================================
--- trunk/PCSC/src/pcscdaemon.c	2006-10-23 14:57:51 UTC (rev 2192)
+++ trunk/PCSC/src/pcscdaemon.c	2006-10-29 19:27:52 UTC (rev 2193)
@@ -540,8 +540,20 @@
 
 void signal_reload(int sig)
 {
+	static int rescan_ongoing = FALSE;
+
 	Log1(PCSC_LOG_INFO, "Reload serial configuration");
+	if (rescan_ongoing)
+	{
+		Log1(PCSC_LOG_INFO, "Rescan already ongoing");
+		return;
+	}
+
+	rescan_ongoing = TRUE;
+
 	HPReCheckSerialReaders();
+
+	rescan_ongoing = FALSE;
 } /* signal_reload */
 
 void signal_trap(int sig)




More information about the Pcsclite-cvs-commit mailing list