X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fpresto.c;h=95c59303b0d68fa936a1857a07f66369c0659408;hp=a6c048ad42d42020af619ec6c73ab647fbf1c134;hb=20e4e77cdf366dedac21ff5670c54291feadfc05;hpb=1429d2c659ab9b84dee673e7697da7eab44a8f90

diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index a6c048ad42..95c59303b0 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -135,7 +135,6 @@ BYTE presto_init_seq[] =
 int presto_open(char *req_serial)
 {
 	int i;
-	int result;
 	DWORD numdevs;
 	DWORD vidpid;
 	char devname[FT_DEVICE_NAME_LEN];
@@ -144,7 +143,7 @@ int presto_open(char *req_serial)
 	BYTE presto_data;
 	unsigned long ftbytes;
 
-	presto->handle=INVALID_HANDLE_VALUE;
+	presto->handle = (FT_HANDLE)INVALID_HANDLE_VALUE;
 
 	presto->buff_out_pos=0;
 	presto->buff_in_pos=0;
@@ -166,13 +165,13 @@ int presto_open(char *req_serial)
 		if (FT_GetDeviceInfo(presto->handle,&device,&vidpid,presto->serial,devname,NULL)==FT_OK)
 		{
 			if (vidpid==PRESTO_VID_PID && (req_serial==NULL || !strcmp(presto->serial,req_serial)))
-			  break;
+				break;
 		}
 		FT_Close(presto->handle);
-		presto->handle=INVALID_HANDLE_VALUE;
+		presto->handle = (FT_HANDLE)INVALID_HANDLE_VALUE;
 	}
 
-	if (presto->handle==INVALID_HANDLE_VALUE) return PRST_ERR;
+	if (presto->handle == (FT_HANDLE)INVALID_HANDLE_VALUE) return PRST_ERR;
 
 	if ((presto->status=FT_SetLatencyTimer(presto->handle,1))!=FT_OK) return PRST_ERR;
 	if ((presto->status=FT_SetTimeouts(presto->handle,100,0))!=FT_OK) return PRST_ERR;
@@ -219,7 +218,7 @@ int presto_close(void)
 
 	int result=PRST_OK;
 
-	if (presto->handle==INVALID_HANDLE_VALUE) return result;
+	if (presto->handle == (FT_HANDLE)INVALID_HANDLE_VALUE) return result;
 
 	presto->status=FT_Write(presto->handle,&presto_init_seq,sizeof(presto_init_seq),&ftbytes);
 	if (presto->status!=FT_OK) result=PRST_ERR;
@@ -228,7 +227,7 @@ int presto_close(void)
 	if ((presto->status=FT_SetLatencyTimer(presto->handle,16))!=FT_OK) result=PRST_ERR;
 
 	if ((presto->status=FT_Close(presto->handle))!=FT_OK) result=PRST_ERR;
-	else presto->handle=INVALID_HANDLE_VALUE;
+	else presto->handle = (FT_HANDLE)INVALID_HANDLE_VALUE;
 
 	return result;
 }