Merge pull request #91 from UweBonnes/master

st-flash: Honor read size, when given and add \n to mesage when no STLINK found

diff --git a/flash/main.c b/flash/main.c
index 24287456b41e283abc6624711267532b4de83fd9..4716b66e154813fd236add16036cceea07fb457d 100644 (file)
--- a/flash/main.c
+++ b/flash/main.c
@@ -154,10 +154,10 @@ int main(int ac, char** av)
   }
   else /* read */
   {
-    if ((o.addr >= sl->flash_base) &&
+    if ((o.addr >= sl->flash_base) && (o.size == 0) &&
        (o.addr < sl->flash_base + sl->flash_size))
         o.size = sl->flash_size;
-    else if ((o.addr >= sl->sram_base) &&
+    else if ((o.addr >= sl->sram_base) && (o.size == 0) &&
             (o.addr < sl->sram_base + sl->sram_size))
         o.size = sl->sram_size;
     err = stlink_fread(sl, o.filename, o.addr, o.size);

diff --git a/src/stlink-usb.c b/src/stlink-usb.c
index 72ffda17787439dfec7611b0efc7f0cf7aa62227..a25f7ec55d5b6815f28ab0e4ae242079eef842d4 100644 (file)
--- a/src/stlink-usb.c
+++ b/src/stlink-usb.c
@@ -652,7 +652,7 @@ stlink_t* stlink_open_usb(const int verbose) {
     if (slu->usb_handle == NULL) {
        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");
+           WLOG("Couldn't find any ST-Link/V2 devices\n");
            goto on_error;
        }
        slu->protocoll = 1;