[Pcsclite-cvs-commit] Drivers/ccid/src ifdhandler.c,1.3,1.4
rousseau@quantz.debian.org
rousseau@quantz.debian.org
Tue, 25 Nov 2003 23:56:00 +0100
- Previous message: [Pcsclite-cvs-commit] Drivers/ccid Makefile.am,1.5,1.6 config.h.in,1.2,1.3 configure.in,1.9,1.10 reconf,1.2,1.3
- Next message: [Pcsclite-cvs-commit] Drivers/ccid INSTALL,1.3,1.4 configure.in,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory quantz:/tmp/cvs-serv28658/src
Modified Files:
ifdhandler.c
Log Message:
use a updated version of acx_pthread.m4 needed for FreeBSD
Index: ifdhandler.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ifdhandler.c 22 Sep 2003 14:25:19 -0000 1.3
+++ ifdhandler.c 25 Nov 2003 22:55:58 -0000 1.4
@@ -28,7 +28,7 @@
#include "utils.h"
#include "commands.h"
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD
#include <pthread.h>
#endif
@@ -36,7 +36,7 @@
static CcidDesc CcidSlots[PCSCLITE_MAX_READERS];
/* global mutex */
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD
static pthread_mutex_t ifdh_context_mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
@@ -90,7 +90,7 @@
/* Reset PowerFlags */
CcidSlots[LunToReaderIndex(Lun)].bPowerFlags = POWERFLAGS_RAZ;
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD
pthread_mutex_lock(&ifdh_context_mutex);
#endif
@@ -100,7 +100,7 @@
return_value = IFD_COMMUNICATION_ERROR;
}
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD
pthread_mutex_unlock(&ifdh_context_mutex);
#endif
@@ -129,13 +129,13 @@
CmdPowerOff(Lun);
/* No reader status check, if it failed, what can you do ? :) */
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD
pthread_mutex_lock(&ifdh_context_mutex);
#endif
ClosePort(Lun);
-#ifdef HAVE_PTHREAD_H
+#ifdef HAVE_PTHREAD
pthread_mutex_unlock(&ifdh_context_mutex);
#endif
@@ -185,6 +185,7 @@
.pcATRBuffer, *Length);
break;
+#ifdef HAVE_PTHREAD
case TAG_IFD_SIMULTANEOUS_ACCESS:
if (*Length >= 1)
{
@@ -200,6 +201,7 @@
*Value = 1; /* Can talk to multiple readers at the same time */
}
break;
+#endif
case TAG_IFD_SLOTS_NUMBER:
if (*Length >= 1)
@@ -502,5 +504,4 @@
return return_value;
} /* IFDHICCPresence */
-
- Previous message: [Pcsclite-cvs-commit] Drivers/ccid Makefile.am,1.5,1.6 config.h.in,1.2,1.3 configure.in,1.9,1.10 reconf,1.2,1.3
- Next message: [Pcsclite-cvs-commit] Drivers/ccid INSTALL,1.3,1.4 configure.in,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]