flash/nor/efr32: fixed lockbits and user data

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

diff --git a/src/target/nds32_v3m.c b/src/target/nds32_v3m.c
index 2d52bc3822b01caa4722dea092f936e2bac3a6e2..ffd646f33e6ff666aea61c11a167580f31164a97 100644 (file)
--- a/src/target/nds32_v3m.c
+++ b/src/target/nds32_v3m.c
@@ -50,7 +50,7 @@ static int nds32_v3m_activate_hardware_breakpoint(struct target *target)
                                /* enable breakpoint (physical address) */
                                aice_write_debug_reg(aice, NDS_EDM_SR_BPC0 + brp_num, 0xA);
 
-                       LOG_DEBUG("Add hardware BP %u at %08" PRIx32, brp_num,
+                       LOG_DEBUG("Add hardware BP %u at %08" TARGET_PRIxADDR, brp_num,
                                        bp->address);
 
                        brp_num--;
@@ -78,7 +78,7 @@ static int nds32_v3m_deactivate_hardware_breakpoint(struct target *target)
                else
                        return ERROR_FAIL;
 
-               LOG_DEBUG("Remove hardware BP %u at %08" PRIx32, brp_num,
+               LOG_DEBUG("Remove hardware BP %u at %08" TARGET_PRIxADDR, brp_num,
                                bp->address);
 
                brp_num--;
@@ -125,7 +125,7 @@ static int nds32_v3m_activate_hardware_watchpoint(struct target *target)
                        /* enable watchpoint */
                        aice_write_debug_reg(aice, NDS_EDM_SR_BPC0 + wp_num, wp_config);
 
-                       LOG_DEBUG("Add hardware watchpoint %" PRId32 " at %08" PRIx32
+                       LOG_DEBUG("Add hardware watchpoint %" PRId32 " at %08" TARGET_PRIxADDR
                                        " mask %08" PRIx32, wp_num, wp->address, wp->mask);
 
                        wp_num++;
@@ -166,7 +166,7 @@ static int nds32_v3m_deactivate_hardware_watchpoint(struct target *target)
                        /* disable watchpoint */
                        aice_write_debug_reg(aice, NDS_EDM_SR_BPC0 + wp_num, 0x0);
 
-                       LOG_DEBUG("Remove hardware watchpoint %" PRId32 " at %08" PRIx32
+                       LOG_DEBUG("Remove hardware watchpoint %" PRId32 " at %08" TARGET_PRIxADDR
                                        " mask %08" PRIx32, wp_num, wp->address, wp->mask);
                        wp_num++;
                } else if (nds32_v3m->nds32.global_stop) {
@@ -267,7 +267,7 @@ static int nds32_v3m_add_breakpoint(struct target *target,
                return ERROR_OK;
        } else if (breakpoint->type == BKPT_SOFT) {
                result = nds32_add_software_breakpoint(target, breakpoint);
-               if (ERROR_OK != result) {
+               if (result != ERROR_OK) {
                        /* auto convert to hardware breakpoint if failed */
                        if (nds32->auto_convert_hw_bp) {
                                /* convert to hardware breakpoint */
@@ -379,7 +379,7 @@ static int nds32_v3m_remove_watchpoint(struct target *target,
        return ERROR_OK;
 }
 
-struct nds32_v3_common_callback nds32_v3m_common_callback = {
+static struct nds32_v3_common_callback nds32_v3m_common_callback = {
        .check_interrupt_stack = nds32_v3m_check_interrupt_stack,
        .restore_interrupt_stack = nds32_v3m_restore_interrupt_stack,
        .activate_hardware_breakpoint = nds32_v3m_activate_hardware_breakpoint,