- fix typo's

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

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 2a34bd0b9fce07ed926648bdf70736149db3e099..0db7a94bc5c8535f67d26b8386f6e569d712feda 100644 (file)
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -43,8 +43,8 @@ int mips_m4k_read_memory(struct target_s *target, u32 address, u32 size, u32 cou
 int mips_m4k_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int mips_m4k_register_commands(struct command_context_s *cmd_ctx);
 int mips_m4k_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int mips_m4k_quit();
-int mips_m4k_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
+int mips_m4k_quit(void);
+int mips_m4k_target_create(struct target_s *target, Jim_Interp *interp);
 
 int mips_m4k_examine(struct target_s *target);
 int mips_m4k_assert_reset(target_t *target);
@@ -83,7 +83,7 @@ target_type_t mips_m4k_target =
        .remove_watchpoint = mips_m4k_remove_watchpoint,
 
        .register_commands = mips_m4k_register_commands,
-       .target_command = mips_m4k_target_command,
+       .target_create = mips_m4k_target_create,
        .init_target = mips_m4k_init_target,
        .examine = mips_m4k_examine,
        .quit = mips_m4k_quit
@@ -119,8 +119,9 @@ int mips_m4k_debug_entry(target_t *target)
        
        mips32_save_context(target);
        
-       LOG_DEBUG("entered debug state at PC 0x%x, target->state: %s", \
-               *(u32*)(mips32->core_cache->reg_list[MIPS32_PC].value), target_state_strings[target->state]);
+       LOG_DEBUG("entered debug state at PC 0x%x, target->state: %s", 
+               *(u32*)(mips32->core_cache->reg_list[MIPS32_PC].value), 
+                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        return ERROR_OK;
 }
@@ -187,7 +188,8 @@ int mips_m4k_halt(struct target_s *target)
        mips32_common_t *mips32 = target->arch_info;
        mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
        
-       LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
+       LOG_DEBUG("target->state: %s", 
+                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        if (target->state == TARGET_HALTED)
        {
@@ -231,7 +233,8 @@ int mips_m4k_assert_reset(target_t *target)
        mips32_common_t *mips32 = target->arch_info;
        mips_ejtag_t *ejtag_info = &mips32->ejtag_info;
        
-       LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
+       LOG_DEBUG("target->state: %s", 
+                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        if (!(jtag_reset_config & RESET_HAS_SRST))
        {
@@ -279,7 +282,8 @@ int mips_m4k_assert_reset(target_t *target)
 
 int mips_m4k_deassert_reset(target_t *target)
 {
-       LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
+       LOG_DEBUG("target->state: %s", 
+                 Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
        
        /* deassert reset lines */
        jtag_add_reset(0, 0);
@@ -569,12 +573,12 @@ int mips_m4k_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
        return ERROR_OK;
 }
 
-int mips_m4k_quit()
+int mips_m4k_quit(void)
 {
        return ERROR_OK;
 }
 
-int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, int chain_pos, char *variant)
+int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, int chain_pos, const char *variant)
 {
        mips32_common_t *mips32 = &mips_m4k->mips32_common;
        
@@ -596,24 +600,11 @@ int mips_m4k_init_arch_info(target_t *target, mips_m4k_common_t *mips_m4k, int c
        return ERROR_OK;
 }
 
-int mips_m4k_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target)
+int mips_m4k_target_create(struct target_s *target, Jim_Interp *interp)
 {
-       int chain_pos;
-       char *variant = NULL;
-       mips_m4k_common_t *mips_m4k = malloc(sizeof(mips_m4k_common_t));
+       mips_m4k_common_t *mips_m4k = calloc(1,sizeof(mips_m4k_common_t));
        
-       if (argc < 4)
-       {
-               LOG_ERROR("'target mips4k' requires at least one additional argument");
-               exit(-1);
-       }
-       
-       chain_pos = strtoul(args[3], NULL, 0);
-       
-       if (argc >= 5)
-               variant = args[4];
-       
-       mips_m4k_init_arch_info(target, mips_m4k, chain_pos, variant);
+       mips_m4k_init_arch_info(target, mips_m4k, target->chain_position, target->variant);
        
        return ERROR_OK;
 }