arm_adi_v5: prevent possibly endless recursion in dap_dp_init()

[fw/openocd] / src / target / ls1_sap.c

diff --git a/src/target/ls1_sap.c b/src/target/ls1_sap.c
index b4d814bbf5b36ff6cf62bab318f745978c95111a..5e1218837ec87654e58ffbc1f2d879b8a4ccb069 100644 (file)
--- a/src/target/ls1_sap.c
+++ b/src/target/ls1_sap.c
@@ -64,14 +64,14 @@ static int ls1_sap_halt(struct target *target)
        return ERROR_OK;
 }
 
-static int ls1_sap_resume(struct target *target, int current, uint32_t address,
+static int ls1_sap_resume(struct target *target, int current, target_addr_t address,
                int handle_breakpoints, int debug_execution)
 {
        LOG_DEBUG("%s", __func__);
        return ERROR_OK;
 }
 
-static int ls1_sap_step(struct target *target, int current, uint32_t address,
+static int ls1_sap_step(struct target *target, int current, target_addr_t address,
                                int handle_breakpoints)
 {
        LOG_DEBUG("%s", __func__);
@@ -113,7 +113,7 @@ static void ls1_sap_set_instr(struct jtag_tap *tap, uint32_t new_instr)
 static void ls1_sap_set_addr_high(struct jtag_tap *tap, uint16_t addr_high)
 {
        struct scan_field field;
-       uint8_t buf[2];
+       uint8_t buf[2] = { 0 };
 
        ls1_sap_set_instr(tap, 0x21);
 
@@ -130,7 +130,7 @@ static void ls1_sap_memory_cmd(struct jtag_tap *tap, uint32_t address,
                               int32_t size, bool rnw)
 {
        struct scan_field field;
-       uint8_t cmd[8];
+       uint8_t cmd[8] = { 0 };
 
        ls1_sap_set_instr(tap, 0x24);
 
@@ -178,11 +178,11 @@ static void ls1_sap_memory_write(struct jtag_tap *tap, uint32_t size,
        jtag_add_dr_scan(tap, 1, &field, TAP_IDLE);
 }
 
-static int ls1_sap_read_memory(struct target *target, uint32_t address,
+static int ls1_sap_read_memory(struct target *target, target_addr_t address,
                               uint32_t size, uint32_t count, uint8_t *buffer)
 {
-       LOG_DEBUG("Reading memory at physical address 0x%" PRIx32
-                 "; size %" PRId32 "; count %" PRId32, address, size, count);
+       LOG_DEBUG("Reading memory at physical address 0x%" TARGET_PRIxADDR
+                 "; size %" PRIu32 "; count %" PRIu32, address, size, count);
 
        if (count == 0 || buffer == NULL)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -199,12 +199,12 @@ static int ls1_sap_read_memory(struct target *target, uint32_t address,
        return jtag_execute_queue();
 }
 
-static int ls1_sap_write_memory(struct target *target, uint32_t address,
+static int ls1_sap_write_memory(struct target *target, target_addr_t address,
                                uint32_t size, uint32_t count,
                                const uint8_t *buffer)
 {
-       LOG_DEBUG("Writing memory at physical address 0x%" PRIx32
-                 "; size %" PRId32 "; count %" PRId32, address, size, count);
+       LOG_DEBUG("Writing memory at physical address 0x%" TARGET_PRIxADDR
+                 "; size %" PRIu32 "; count %" PRIu32, address, size, count);
 
 
        if (count == 0 || buffer == NULL)