Merge remote-tracking branch 'origin/develop'v1.8.0origin/mastermasterfor-upstream

1 files changed, 33 insertions, 31 deletions

diff --git a/inc/backend.h b/inc/backend.h
index a45dccd..6b9c9c0 100644
--- a/inc/backend.h
+++ b/inc/backend.h
@@ -1,37 +1,39 @@
-#ifndef STLINK_BACKEND_H_
-#define STLINK_BACKEND_H_
+#ifndef BACKEND_H
+#define BACKEND_H
+
+#include <stdint.h>
 
     typedef struct _stlink_backend {
         void (*close) (stlink_t * sl);
-        int (*exit_debug_mode) (stlink_t * sl);
-        int (*enter_swd_mode) (stlink_t * sl);
-        int (*enter_jtag_mode) (stlink_t * stl);
-        int (*exit_dfu_mode) (stlink_t * stl);
-        int (*core_id) (stlink_t * stl);
-        int (*reset) (stlink_t * stl);
-        int (*jtag_reset) (stlink_t * stl, int value);
-        int (*run) (stlink_t * stl, enum run_type type);
-        int (*status) (stlink_t * stl);
-        int (*version) (stlink_t *sl);
-        int (*read_debug32) (stlink_t *sl, uint32_t addr, uint32_t *data);
-        int (*read_mem32) (stlink_t *sl, uint32_t addr, uint16_t len);
-        int (*write_debug32) (stlink_t *sl, uint32_t addr, uint32_t data);
-        int (*write_mem32) (stlink_t *sl, uint32_t addr, uint16_t len);
-        int (*write_mem8) (stlink_t *sl, uint32_t addr, uint16_t len);
-        int (*read_all_regs) (stlink_t *sl, struct stlink_reg * regp);
-        int (*read_reg) (stlink_t *sl, int r_idx, struct stlink_reg * regp);
-        int (*read_all_unsupported_regs) (stlink_t *sl, struct stlink_reg *regp);
-        int (*read_unsupported_reg) (stlink_t *sl, int r_idx, struct stlink_reg *regp);
-        int (*write_unsupported_reg) (stlink_t *sl, uint32_t value, int idx, struct stlink_reg *regp);
-        int (*write_reg) (stlink_t *sl, uint32_t reg, int idx);
-        int (*step) (stlink_t * stl);
-        int (*current_mode) (stlink_t * stl);
-        int (*force_debug) (stlink_t *sl);
+        int32_t (*exit_debug_mode) (stlink_t * sl);
+        int32_t (*enter_swd_mode) (stlink_t * sl);
+        int32_t (*enter_jtag_mode) (stlink_t * stl);
+        int32_t (*exit_dfu_mode) (stlink_t * stl);
+        int32_t (*core_id) (stlink_t * stl);
+        int32_t (*reset) (stlink_t * stl);
+        int32_t (*jtag_reset) (stlink_t * stl, int32_t value);
+        int32_t (*run) (stlink_t * stl, enum run_type type);
+        int32_t (*status) (stlink_t * stl);
+        int32_t (*version) (stlink_t *sl);
+        int32_t (*read_debug32) (stlink_t *sl, uint32_t addr, uint32_t *data);
+        int32_t (*read_mem32) (stlink_t *sl, uint32_t addr, uint16_t len);
+        int32_t (*write_debug32) (stlink_t *sl, uint32_t addr, uint32_t data);
+        int32_t (*write_mem32) (stlink_t *sl, uint32_t addr, uint16_t len);
+        int32_t (*write_mem8) (stlink_t *sl, uint32_t addr, uint16_t len);
+        int32_t (*read_all_regs) (stlink_t *sl, struct stlink_reg * regp);
+        int32_t (*read_reg) (stlink_t *sl, int32_t r_idx, struct stlink_reg * regp);
+        int32_t (*read_all_unsupported_regs) (stlink_t *sl, struct stlink_reg *regp);
+        int32_t (*read_unsupported_reg) (stlink_t *sl, int32_t r_idx, struct stlink_reg *regp);
+        int32_t (*write_unsupported_reg) (stlink_t *sl, uint32_t value, int32_t idx, struct stlink_reg *regp);
+        int32_t (*write_reg) (stlink_t *sl, uint32_t reg, int32_t idx);
+        int32_t (*step) (stlink_t * stl);
+        int32_t (*current_mode) (stlink_t * stl);
+        int32_t (*force_debug) (stlink_t *sl);
         int32_t (*target_voltage) (stlink_t *sl);
-        int (*set_swdclk) (stlink_t * stl, int freq_khz);
-        int (*trace_enable) (stlink_t * sl, uint32_t frequency);
-        int (*trace_disable) (stlink_t * sl);
-        int (*trace_read) (stlink_t * sl, uint8_t* buf, size_t size);
+        int32_t (*set_swdclk) (stlink_t * stl, int32_t freq_khz);
+        int32_t (*trace_enable) (stlink_t * sl, uint32_t frequency);
+        int32_t (*trace_disable) (stlink_t * sl);
+        int32_t (*trace_read) (stlink_t * sl, uint8_t* buf, uint32_t size);
     } stlink_backend_t;
 
-#endif // STLINK_BACKEND_H_
+#endif // BACKEND_H