Remove redundant declarations to allow building with -Wredundant-decls.

[openocd.git] / src / target / arm11.c

diff --git a/src/target/arm11.c b/src/target/arm11.c
index 241e6ed24696d673f52a310372250e4230df3098..fea4c451b7f72a3928bd39b4591f83514d807f15 100644 (file)
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -322,7 +322,7 @@ int arm11_check_init(arm11_common_t * arm11, u32 * dscr)
        if (!dscr)
        {
                dscr = &dscr_local_tmp_copy;
-               
+
                CHECK_RETVAL(arm11_read_DSCR(arm11, dscr));
        }
 
@@ -673,7 +673,7 @@ int arm11_poll(struct target_s *target)
                return ERROR_OK;
 
        u32     dscr;
-       
+
        CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
 
        LOG_DEBUG("DSCR %08x", dscr);
@@ -861,7 +861,7 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b
        while (1)
        {
                u32 dscr;
-       
+
                CHECK_RETVAL(arm11_read_DSCR(arm11, &dscr));
 
                LOG_DEBUG("DSCR %08x", dscr);
@@ -906,7 +906,7 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
        if (!current)
                R(PC) = address;
 
-       LOG_INFO("STEP PC %08x%s", R(PC), !current ? "!" : "");
+       LOG_DEBUG("STEP PC %08x%s", R(PC), !current ? "!" : "");
 
        /** \todo TODO: Thumb not supported here */
 
@@ -920,7 +920,7 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
                R(PC) += 4;
                arm11->reg_list[ARM11_RC_PC].valid = 1;
                arm11->reg_list[ARM11_RC_PC].dirty = 0;
-               LOG_INFO("Skipping BKPT");
+               LOG_DEBUG("Skipping BKPT");
        }
        /* skip over Wait for interrupt / Standby */
        /* mcr  15, 0, r?, cr7, cr0, {4} */
@@ -929,12 +929,12 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
                R(PC) += 4;
                arm11->reg_list[ARM11_RC_PC].valid = 1;
                arm11->reg_list[ARM11_RC_PC].dirty = 0;
-               LOG_INFO("Skipping WFI");
+               LOG_DEBUG("Skipping WFI");
        }
        /* ignore B to self */
        else if ((next_instruction & 0xFEFFFFFF) == 0xeafffffe)
        {
-               LOG_INFO("Not stepping jump to self");
+               LOG_DEBUG("Not stepping jump to self");
        }
        else
        {
@@ -1305,11 +1305,13 @@ int arm11_bulk_write_memory(struct target_s *target, u32 address, u32 count, u8
        return arm11_write_memory(target, address, 4, count, buffer);
 }
 
+/* here we have nothing target specific to contribute, so we fail and then the
+ * fallback code will read data from the target and calculate the CRC on the
+ * host.
+ */
 int arm11_checksum_memory(struct target_s *target, u32 address, u32 count, u32* checksum)
 {
-       FNC_INFO_NOTIMPLEMENTED;
-
-       return ERROR_OK;
+       return ERROR_FAIL;
 }
 
 /* target break-/watchpoint control
@@ -1331,13 +1333,13 @@ int arm11_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
 
        if (!arm11->free_brps)
        {
-               LOG_INFO("no breakpoint unit available for hardware breakpoint");
+               LOG_DEBUG("no breakpoint unit available for hardware breakpoint");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }
 
        if (breakpoint->length != 4)
        {
-               LOG_INFO("only breakpoints of four bytes length supported");
+               LOG_DEBUG("only breakpoints of four bytes length supported");
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
        }