[Pcsclite-cvs-commit] r4814 - in /trunk/Drivers/ccid: INSTALL examples/scardcontrol.c readers/supported_readers.txt src/ccid_serial.c src/reader.conf.in

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Mar 12 15:42:07 2010
New Revision: 4814

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4814
Log:
Rename Gemplus in Gemalto

Modified:
    trunk/Drivers/ccid/INSTALL
    trunk/Drivers/ccid/examples/scardcontrol.c
    trunk/Drivers/ccid/readers/supported_readers.txt
    trunk/Drivers/ccid/src/ccid_serial.c
    trunk/Drivers/ccid/src/reader.conf.in

Modified: trunk/Drivers/ccid/INSTALL
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/INSTALL?rev=4814&op=diff
==============================================================================
--- trunk/Drivers/ccid/INSTALL (original)
+++ trunk/Drivers/ccid/INSTALL Fri Mar 12 15:42:07 2010
@@ -90,7 +90,7 @@
 You have to create or edit the file /etc/reader.conf. The file should
 contain something like:
 
-# Gemplus reader with serial communication
+# Gemalto reader with serial communication
 #  - reader is the reader name. It is needed for multi-slot readers.
 #    Possible reader values are: GemPCPinPad, GemCorePOSPro, GemCoreSIMPro,
 #    GemPCTwin (default value)

Modified: trunk/Drivers/ccid/examples/scardcontrol.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/examples/scardcontrol.c?rev=4814&op=diff
==============================================================================
--- trunk/Drivers/ccid/examples/scardcontrol.c (original)
+++ trunk/Drivers/ccid/examples/scardcontrol.c Fri Mar 12 15:42:07 2010
@@ -186,7 +186,7 @@
 	/* get GemPC firmware */
 	printf(" Get GemPC Firmware\n");
 
-	/* this is specific to Gemplus readers */
+	/* this is specific to Gemalto readers */
 	bSendBuffer[0] = 0x02;
 	rv = SCardControl(hCard, IOCTL_SMARTCARD_VENDOR_IFD_EXCHANGE, bSendBuffer,
 		1, bRecvBuffer, sizeof(bRecvBuffer), &length);

Modified: trunk/Drivers/ccid/readers/supported_readers.txt
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/readers/supported_readers.txt?rev=4814&op=diff
==============================================================================
--- trunk/Drivers/ccid/readers/supported_readers.txt (original)
+++ trunk/Drivers/ccid/readers/supported_readers.txt Fri Mar 12 15:42:07 2010
@@ -1,22 +1,21 @@
 # list of readers supported by the CCID driver
 # $Id$
 
-# Gemplus
-0x08E6:0x2202:Gemplus Gem e-Seal Pro
-0x08E6:0x3437:Gemplus GemPC Twin
-0x08E6:0x3438:Gemplus GemPC Key
-0x08E6:0x3478:Gemplus GemPC Pinpad
-0x08E6:0x3479:Gemplus GemCore POS Pro
-0x08E6:0x3480:Gemplus GemCore SIM Pro
-0x08E6:0x34EC:Gemplus GemPC Express
-0x08E6:0x4433:Gemplus GemPC433 SL
+# Gemalto (ex Gemplus)
+0x08E6:0x2202:Gemalto Gem e-Seal Pro
+0x08E6:0x3437:Gemalto GemPC Twin
+0x08E6:0x3438:Gemalto GemPC Key
+0x08E6:0x3478:Gemalto GemPC Pinpad
+0x08E6:0x3479:Gemalto GemCore POS Pro
+0x08E6:0x3480:Gemalto GemCore SIM Pro
+0x08E6:0x34EC:Gemalto GemPC Express
+0x08E6:0x4433:Gemalto GemPC433 SL
 0x08E6:0x5503:Gemalto Prox-DU
 0x08E6:0x5504:Gemalto Prox-SU
 0x08E6:0x8000:Smart Enterprise Guardian
 # Verisign branded
 0x08E6:0xACE0:Verisign Secure Token
 0x08E6:0x1359:VeriSign Secure Storage Token
-# Gemalto
 0x08E6:0x1227:Gemalto PDT
 
 # SCM Microsystems

Modified: trunk/Drivers/ccid/src/ccid_serial.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_serial.c?rev=4814&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_serial.c (original)
+++ trunk/Drivers/ccid/src/ccid_serial.c Fri Mar 12 15:42:07 2010
@@ -742,7 +742,7 @@
 		return STATUS_UNSUCCESSFUL;
 	}
 
-	/* perform a command to be sure a Gemplus reader is connected
+	/* perform a command to be sure a Gemalto reader is connected
 	 * get the reader firmware */
 	{
 		unsigned char tx_buffer[] = { 0x02 };

Modified: trunk/Drivers/ccid/src/reader.conf.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/reader.conf.in?rev=4814&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/reader.conf.in (original)
+++ trunk/Drivers/ccid/src/reader.conf.in Fri Mar 12 15:42:07 2010
@@ -1,4 +1,4 @@
-# Gemplus reader with serial communication
+# Gemalto reader with serial communication
 #  - n is the serial port to use n in [0..3]
 #  - reader is the reader name. It is needed for multi-slot readers.
 #    Possible reader values are: GemPCPinPad, GemCorePOSPro, GemCoreSIMPro,