[Pcsclite-cvs-commit] Drivers/ccid/src ccid_usb.c,1.22,1.23 ccid_usb.h,1.6,1.7
rousseau@haydn.debian.org
rousseau@haydn.debian.org
- Previous message: [Pcsclite-cvs-commit] Drivers/ccid/src utils.c,1.2,1.3 parse.c,1.9,1.10 defs.h,1.5,1.6 commands.h,1.4,1.5 ccid_serial.c,1.9,1.10 ccid_ifdhandler.h,1.7,1.8 Makefile.am,1.14,1.15
- Next message: [Pcsclite-cvs-commit] Drivers/ccid/src commands.c,1.10,1.11 ccid.c,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv30584/src
Modified Files:
ccid_usb.c ccid_usb.h
Log Message:
do not export get_end_points() declaration and make the function static
Index: ccid_usb.c
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ccid_usb.c 8 Apr 2004 14:35:57 -0000 1.22
+++ ccid_usb.c 17 May 2004 14:37:08 -0000 1.23
@@ -28,12 +28,13 @@
#include <errno.h>
#include <usb.h>
-#include "pcscdefines.h"
+#include "ccid.h"
#include "config.h"
#include "debug.h"
+#include "defs.h"
#include "utils.h"
#include "parser.h"
-#include "ccid.h"
+#include "ccid_ifdhandler.h"
/* read timeout
@@ -77,6 +78,8 @@
/* The _usbDevice structure must be defined before including ccid_usb.h */
#include "ccid_usb.h"
+static int get_end_points(struct usb_device *dev, _usbDevice *usb_device);
+
static _usbDevice usbDevice[PCSCLITE_MAX_READERS] = {
[ 0 ... (PCSCLITE_MAX_READERS-1) ] = { NULL, NULL, 0, 0 }
};
@@ -496,7 +499,7 @@
* get_end_points
*
****************************************************************************/
-int get_end_points(struct usb_device *dev, _usbDevice *usb_device)
+static int get_end_points(struct usb_device *dev, _usbDevice *usb_device)
{
int i;
int bEndpointAddress;
Index: ccid_usb.h
===================================================================
RCS file: /cvsroot/pcsclite/Drivers/ccid/src/ccid_usb.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ccid_usb.h 30 Mar 2004 12:43:20 -0000 1.6
+++ ccid_usb.h 17 May 2004 14:37:08 -0000 1.7
@@ -31,7 +31,4 @@
int get_desc(int channel, usb_dev_handle **handle, struct usb_device **dev);
struct usb_interface *get_ccid_usb_interface(struct usb_device *dev);
#endif
-#ifdef __CCID_USB__
-int get_end_points(struct usb_device *dev, _usbDevice *usb_device);
-#endif
- Previous message: [Pcsclite-cvs-commit] Drivers/ccid/src utils.c,1.2,1.3 parse.c,1.9,1.10 defs.h,1.5,1.6 commands.h,1.4,1.5 ccid_serial.c,1.9,1.10 ccid_ifdhandler.h,1.7,1.8 Makefile.am,1.14,1.15
- Next message: [Pcsclite-cvs-commit] Drivers/ccid/src commands.c,1.10,1.11 ccid.c,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]