stlink_core_id: No need to return core_id value

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

diff --git a/src/stlink-usb.c b/src/stlink-usb.c
index d54aea875145b4af24fe88940ee9e1f3a840a11a..927e44e9681649372c505fb580a330b0544bbde1 100644 (file)
--- a/src/stlink-usb.c
+++ b/src/stlink-usb.c
@@ -138,7 +138,7 @@ int32_t _stlink_usb_target_voltage(stlink_t *sl) {
     return voltage;
 }
 
-uint32_t _stlink_usb_read_debug32(stlink_t *sl, uint32_t addr) {
+void _stlink_usb_read_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;
@@ -152,9 +152,10 @@ uint32_t _stlink_usb_read_debug32(stlink_t *sl, uint32_t addr) {
     size = send_recv(slu, 1, cmd, slu->cmd_len, rdata, rep_len);
     if (size == -1) {
         printf("[!] send_recv\n");
-        return 0;
+        return;
     }
-    return read_uint32(rdata, 4);
+    *data = read_uint32(rdata, 4);
+    return;
 }
 
 void _stlink_usb_write_debug32(stlink_t *sl, uint32_t addr, uint32_t data) {
@@ -259,6 +260,7 @@ void _stlink_usb_status(stlink_t * sl) {
         printf("[!] send_recv\n");
         return;
     }
+    sl->q_len = (size_t) size;
 }
 
 void _stlink_usb_force_debug(stlink_t *sl) {
@@ -644,7 +646,6 @@ stlink_t* stlink_open_usb(const int verbose, int reset, char *p_usb_iserial) {
     stlink_t* sl = NULL;
     struct stlink_libusb* slu = NULL;
     int error = -1;
-    libusb_device** devs = NULL;
     int config;
 
     sl = malloc(sizeof (stlink_t));
@@ -785,10 +786,6 @@ stlink_t* stlink_open_usb(const int verbose, int reset, char *p_usb_iserial) {
     error = stlink_load_device_params(sl);
 
 on_libusb_error:
-    if (devs != NULL) {
-        libusb_free_device_list(devs, 1);
-    }
-
     if (error == -1) {
         stlink_close(sl);
         return NULL;