[Pcsclite-cvs-commit] CVS Drivers/ccid/src

[CVS User rousseau]

Update of /cvsroot/pcsclite/Drivers/ccid/src
In directory haydn:/tmp/cvs-serv17297/src

Modified Files:
	ifdhandler.c 
Log Message:
extra_egt(): reuse the same baud rate calculation formula


--- /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c	2005/04/26 12:07:44	1.64
+++ /cvsroot/pcsclite/Drivers/ccid/src/ifdhandler.c	2005/04/26 12:16:26	1.65
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 */
 
-/* $Id: ifdhandler.c,v 1.64 2005/04/26 12:07:44 rousseau Exp $ */
+/* $Id: ifdhandler.c,v 1.65 2005/04/26 12:16:26 rousseau Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -1025,10 +1025,10 @@
 	 * standard.
 	 */
 
-	int card_baudrate;
-	int default_baudrate;
-	int i;
+	unsigned int card_baudrate;
+	unsigned int default_baudrate;
 	double f, d;
+	int i;
 
 	/* if TA1 not present */
 	if (! atr->ib[0][ATR_INTERFACE_BYTE_TA].present)
@@ -1038,10 +1038,10 @@
 	ATR_GetParameter(atr, ATR_PARAMETER_F, &f);
 
 	/* Baudrate = f x D/F */
-	card_baudrate = 1000 * ccid_desc->dwDefaultClock * d / f;
+	card_baudrate = (unsigned int) (1000 * ccid_desc->dwDefaultClock * d / f);
 
-	default_baudrate = 1000 * ccid_desc->dwDefaultClock
-		* ATR_DEFAULT_D / ATR_DEFAULT_F;
+	default_baudrate = (unsigned int) (1000 * ccid_desc->dwDefaultClock
+		* ATR_DEFAULT_D / ATR_DEFAULT_F);
 
 	/* TA1 > 11? */
 	if (card_baudrate <= default_baudrate)