From: texane <texane@gmail.com>
Date: Wed, 8 Feb 2012 17:00:42 +0000 (-0800)
Subject: Merge pull request #61 from UweBonnes/master
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b0a477d2a7deaf628013a9a8651f5c10f180e5d0;hp=a4547c31a78dc29c9af2e50d46f6d58bfa7ccd86;p=fw%2Fstlink

Merge pull request #61 from UweBonnes/master

Use stlink-usb also for STLINKV1, Rename flash to st-flash
---

diff --git a/flash/Makefile b/flash/Makefile
index 4914587..5345dcb 100644
--- a/flash/Makefile
+++ b/flash/Makefile
@@ -13,7 +13,7 @@ CFLAGS+=`pkg-config --cflags libusb-1.0`
 SRCS=main.c
 OBJS=$(SRCS:.c=.o)
 
-NAME=flash
+NAME=st-flash
 
 all: $(NAME)
 
diff --git a/src/stlink-usb.c b/src/stlink-usb.c
index 2a82b88..8f5c6c4 100644
--- a/src/stlink-usb.c
+++ b/src/stlink-usb.c
@@ -127,8 +127,6 @@ ssize_t send_recv(struct stlink_libusb* handle, int terminate,
     }
     
     if ((handle->protocoll == 1) && terminate) {
-        fprintf(stderr, "This is never used....\n");
-        exit(EXIT_FAILURE);
         /* Read the SG reply */
         unsigned char sg_buf[13];
         libusb_fill_bulk_transfer
@@ -157,7 +155,6 @@ static int fill_command
     int i = 0;
     memset(cmd, 0, sizeof (sl->c_buf));
     if(slu->protocoll == 1) {
-        fprintf(stderr, "This is never used....\n");
         cmd[i++] = 'U';
         cmd[i++] = 'S';
         cmd[i++] = 'B';
@@ -636,11 +633,14 @@ stlink_t* stlink_open_usb(const int verbose) {
     
     slu->usb_handle = libusb_open_device_with_vid_pid(slu->libusb_ctx, USB_ST_VID, USB_STLINK_32L_PID);
     if (slu->usb_handle == NULL) {
-		// TODO - free usb context too...
-		WLOG("Couldn't find any ST-Link/V2 devices");
-        goto on_error;
+	slu->usb_handle = libusb_open_device_with_vid_pid(slu->libusb_ctx, USB_ST_VID, USB_STLINK_PID);
+	if (slu->usb_handle == NULL) {
+	    WLOG("Couldn't find any ST-Link/V2 devices");
+	    goto on_error;
+	}
+	slu->protocoll = 1;
     }
-    
+
     if (libusb_kernel_driver_active(slu->usb_handle, 0) == 1) {
         int r;