[Pcsclite-cvs-commit] r4371 - in /trunk/PCSC/src: hotplug_libhal.c hotplug_libusb.c hotplug_linux.c pcscdaemon.c
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Fri Aug 28 07:52:55 UTC 2009
Author: rousseau
Date: Fri Aug 28 07:52:55 2009
New Revision: 4371
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4371
Log:
move definition of usbNotifierMutex in the underlying layers where it is
used
Modified:
trunk/PCSC/src/hotplug_libhal.c
trunk/PCSC/src/hotplug_libusb.c
trunk/PCSC/src/hotplug_linux.c
trunk/PCSC/src/pcscdaemon.c
Modified: trunk/PCSC/src/hotplug_libhal.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libhal.c?rev=4371&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libhal.c (original)
+++ trunk/PCSC/src/hotplug_libhal.c Fri Aug 28 07:52:55 2009
@@ -42,7 +42,7 @@
#define UDI_BASE "/org/freedesktop/Hal/devices/"
-extern PCSCLITE_MUTEX usbNotifierMutex;
+PCSCLITE_MUTEX usbNotifierMutex;
static PCSCLITE_THREAD_T usbNotifyThread;
static int driverSize = -1;
@@ -522,6 +522,8 @@
int i, num_devices;
DBusError error;
+ (void)SYS_MutexInit(&usbNotifierMutex);
+
if (driverSize <= 0)
{
Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR);
Modified: trunk/PCSC/src/hotplug_libusb.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libusb.c?rev=4371&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libusb.c (original)
+++ trunk/PCSC/src/hotplug_libusb.c Fri Aug 28 07:52:55 2009
@@ -52,7 +52,7 @@
#define FALSE 0
#define TRUE 1
-extern PCSCLITE_MUTEX usbNotifierMutex;
+PCSCLITE_MUTEX usbNotifierMutex;
static PCSCLITE_THREAD_T usbNotifyThread;
static int driverSize = -1;
@@ -570,6 +570,7 @@
*/
ULONG HPRegisterForHotplugEvents(void)
{
+ (void)SYS_MutexInit(&usbNotifierMutex);
return 0;
}
Modified: trunk/PCSC/src/hotplug_linux.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_linux.c?rev=4371&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_linux.c (original)
+++ trunk/PCSC/src/hotplug_linux.c Fri Aug 28 07:52:55 2009
@@ -44,7 +44,7 @@
#define TRUE 1
char ReCheckSerialReaders = FALSE;
-extern PCSCLITE_MUTEX usbNotifierMutex;
+PCSCLITE_MUTEX usbNotifierMutex;
struct usb_device_descriptor
{
@@ -423,6 +423,7 @@
*/
ULONG HPRegisterForHotplugEvents(void)
{
+ (void)SYS_MutexInit(&usbNotifierMutex);
return 0;
}
Modified: trunk/PCSC/src/pcscdaemon.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscdaemon.c?rev=4371&op=diff
==============================================================================
--- trunk/PCSC/src/pcscdaemon.c (original)
+++ trunk/PCSC/src/pcscdaemon.c Fri Aug 28 07:52:55 2009
@@ -67,8 +67,6 @@
static void print_version (void);
static void print_usage (char const * const);
-PCSCLITE_MUTEX usbNotifierMutex;
-
/**
* @brief The Server's Message Queue Listener function.
*
@@ -116,11 +114,6 @@
(void)signal(SIGPIPE, SIG_IGN);
(void)signal(SIGHUP, SIG_IGN); /* needed for Solaris. The signal is sent
* when the shell is existed */
-
- /*
- * This function always returns zero
- */
- rsp = SYS_MutexInit(&usbNotifierMutex);
/*
* Set up the search for USB/PCMCIA devices
More information about the Pcsclite-cvs-commit
mailing list