Merge pull request #61 from UweBonnes/master

[fw/stlink] / src / stlink-usb.c

diff --git a/src/stlink-usb.c b/src/stlink-usb.c
index 678e4c42bd389c57296a2663232090be4174dd3d..8f5c6c410c46420166f817bab8e781db8bc64d62 100644 (file)
--- a/src/stlink-usb.c
+++ b/src/stlink-usb.c
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <time.h>
 #include <sys/types.h>
-#include <libusb-1.0/libusb.h>
+#include <libusb.h>
 
 #include "stlink-common.h"
 #include "stlink-usb.h"
@@ -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';
@@ -189,6 +186,44 @@ void _stlink_usb_version(stlink_t *sl) {
     }
 }
 
+uint32_t _stlink_usb_read_debug32(stlink_t *sl, uint32_t addr) {
+    struct stlink_libusb * const slu = sl->backend_data;
+    unsigned char* const rdata = sl->q_buf;
+    unsigned char* const cmd  = sl->c_buf;
+    ssize_t size;
+    const int rep_len = 8;
+ 
+    int i = fill_command(sl, SG_DXFER_FROM_DEV, rep_len);
+    cmd[i++] = STLINK_DEBUG_COMMAND;
+    cmd[i++] = STLINK_JTAG_READDEBUG_32BIT;
+    write_uint32(&cmd[i], addr);
+    size = send_recv(slu, 1, cmd, slu->cmd_len, rdata, rep_len);
+    if (size == -1) {
+        printf("[!] send_recv\n");
+        return 0;
+    }
+    return read_uint32(rdata, 4);
+}
+
+void _stlink_usb_write_debug32(stlink_t *sl, uint32_t addr, uint32_t data) {
+    struct stlink_libusb * const slu = sl->backend_data;
+    unsigned char* const rdata = sl->q_buf;
+    unsigned char* const cmd  = sl->c_buf;
+    ssize_t size;
+    const int rep_len = 2;
+ 
+    int i = fill_command(sl, SG_DXFER_FROM_DEV, rep_len);
+    cmd[i++] = STLINK_DEBUG_COMMAND;
+    cmd[i++] = STLINK_JTAG_WRITEDEBUG_32BIT;
+    write_uint32(&cmd[i], addr);
+    write_uint32(&cmd[i + 4], data);
+    size = send_recv(slu, 1, cmd, slu->cmd_len, rdata, rep_len);
+    if (size == -1) {
+        printf("[!] send_recv\n");
+        return;
+    }
+}
+
 void _stlink_usb_write_mem32(stlink_t *sl, uint32_t addr, uint16_t len) {
     struct stlink_libusb * const slu = sl->backend_data;
     unsigned char* const data = sl->q_buf;
@@ -557,7 +592,9 @@ stlink_backend_t _stlink_usb_backend = {
     _stlink_usb_run,
     _stlink_usb_status,
     _stlink_usb_version,
+    _stlink_usb_read_debug32,
     _stlink_usb_read_mem32,
+    _stlink_usb_write_debug32,
     _stlink_usb_write_mem32,
     _stlink_usb_write_mem8,
     _stlink_usb_read_all_regs,
@@ -596,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;
         
@@ -661,8 +701,9 @@ stlink_t* stlink_open_usb(const int verbose) {
       stlink_enter_swd_mode(sl);
     }
 
-    stlink_version(sl);
+    stlink_reset(sl);
     stlink_load_device_params(sl);
+    stlink_version(sl);
 
     error = 0;