X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fvsllink.c;h=250b495d179fc9c182743a23244d0b63d3e2e401;hp=1c0c3e1eeed5bfc5bb7de3bef7a319a4d4a9e3bb;hb=ba2fbe22470915359e1905aaad4c613eacbdf6dc;hpb=de0130a0aad83c1ef692ee4d68ab996a8668424d

diff --git a/src/jtag/drivers/vsllink.c b/src/jtag/drivers/vsllink.c
index 1c0c3e1eee..250b495d17 100644
--- a/src/jtag/drivers/vsllink.c
+++ b/src/jtag/drivers/vsllink.c
@@ -14,7 +14,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 /* Versaloon is a programming tool for multiple MCUs.
@@ -302,11 +302,11 @@ static int vsllink_init(void)
 	}
 
 	/* malloc buffer size for tap */
-	tap_buffer_size = versaloon_interface.usb_setting.buf_size - 32;
+	tap_buffer_size = versaloon_interface.usb_setting.buf_size / 2 - 32;
 	vsllink_free_buffer();
-	tdi_buffer = (uint8_t *)malloc(tap_buffer_size);
-	tdo_buffer = (uint8_t *)malloc(tap_buffer_size);
-	tms_buffer = (uint8_t *)malloc(tap_buffer_size);
+	tdi_buffer = malloc(tap_buffer_size);
+	tdo_buffer = malloc(tap_buffer_size);
+	tms_buffer = malloc(tap_buffer_size);
 	if ((NULL == tdi_buffer) || (NULL == tdo_buffer) || (NULL == tms_buffer)) {
 		vsllink_quit();
 		return ERROR_FAIL;
@@ -660,7 +660,7 @@ static uint8_t usb_check_string(usb_dev_handle *usb, uint8_t stringidx,
 
 	if (NULL == buff) {
 		buf_size = 256;
-		buff = (char *)malloc(buf_size);
+		buff = malloc(buf_size);
 		if (NULL == buff) {
 			ret = 0;
 			goto free_and_return;
@@ -669,14 +669,14 @@ static uint8_t usb_check_string(usb_dev_handle *usb, uint8_t stringidx,
 	}
 
 	strcpy(buff, "");
-	len = usb_get_string_simple(usb, stringidx, (char *)buff, buf_size);
-	if ((len < 0) || (len != ((int)strlen((const char *)buff)))) {
+	len = usb_get_string_simple(usb, stringidx, buff, buf_size);
+	if ((len < 0) || ((size_t)len != strlen(buff))) {
 		ret = 0;
 		goto free_and_return;
 	}
 
 	buff[len] = '\0';
-	if ((string != NULL) && strcmp((const char *)buff, string)) {
+	if ((string != NULL) && strcmp(buff, string)) {
 		ret = 0;
 		goto free_and_return;
 	}