watchpoint_add() cleanup

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

diff --git a/src/target/fa526.c b/src/target/fa526.c
index ae944b569f65be309e596e049e975237738d9764..4f8c3b20d90b48f7238c226d444e3e2d20d9a8b8 100644 (file)
--- a/src/target/fa526.c
+++ b/src/target/fa526.c
@@ -36,7 +36,6 @@
 
 int fa526_target_create(struct target_s *target, Jim_Interp *interp);
 int fa526_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int fa526_quit(void);
 
 target_type_t fa526_target =
 {
@@ -74,7 +73,6 @@ target_type_t fa526_target =
        .target_create = fa526_target_create,
        .init_target = fa526_init_target,
        .examine = arm9tdmi_examine,
-       .quit = fa526_quit
 };
 
 void fa526_change_to_arm(target_t *target, uint32_t *r0, uint32_t *pc)
@@ -187,7 +185,7 @@ void fa526_write_xpsr(target_t *target, uint32_t xpsr, int spsr)
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
        arm_jtag_t *jtag_info = &arm7_9->jtag_info;
 
-       LOG_DEBUG("xpsr: %8.8x, spsr: %i", xpsr, spsr);
+       LOG_DEBUG("xpsr: %8.8" PRIx32 ", spsr: %i", xpsr, spsr);
 
        /* MSR1 fetched */
        arm9tdmi_clock_out(jtag_info, ARMV4_5_MSR_IM(xpsr & 0xff, 0, 1, spsr), 0, NULL, 0);
@@ -269,7 +267,7 @@ void fa526_write_core_regs(target_t *target, uint32_t mask, uint32_t core_regs[1
        for (i = 0; i <= 15; i++)
        {
                if (mask & (1 << i))
-                       /* nothing fetched, LDM still in EXECUTE (1+i cycle) */
+                       /* nothing fetched, LDM still in EXECUTE (1 + i cycle) */
                        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, core_regs[i], NULL, 0);
        }
        arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -346,7 +344,6 @@ int fa526_init_arch_info_2(target_t *target, arm9tdmi_common_t *arm9tdmi, jtag_t
        arm7_9->enable_single_step = arm9tdmi_enable_single_step;
        arm7_9->disable_single_step = arm9tdmi_disable_single_step;
 
-       arm7_9->pre_debug_entry = NULL;
        arm7_9->post_debug_entry = NULL;
 
        arm7_9->pre_restore_context = NULL;
@@ -423,8 +420,3 @@ int fa526_init_target(struct command_context_s *cmd_ctx, struct target_s *target
        arm9tdmi_init_target(cmd_ctx, target);
        return ERROR_OK;
 }
-
-int fa526_quit(void)
-{
-       return ERROR_OK;
-}