Duane Ellis: "target as an [tcl] object" feature.

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

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 549f6a6730416b1cfb11fd09ac0564e49d08e0a7..56198d1cb7883d78869b8bcc07773dc7cf522cea 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -44,9 +44,10 @@
 int arm7tdmi_register_commands(struct command_context_s *cmd_ctx);
 
 /* forward declarations */
-int arm7tdmi_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
+
+int arm7tdmi_target_create(struct target_s *target,Jim_Interp *interp);
 int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm7tdmi_quit();
+int arm7tdmi_quit(void);
 
 /* target function declarations */
 int arm7tdmi_poll(struct target_s *target);
@@ -75,6 +76,7 @@ target_type_t arm7tdmi_target =
        .write_memory = arm7_9_write_memory,
        .bulk_write_memory = arm7_9_bulk_write_memory,
        .checksum_memory = arm7_9_checksum_memory,
+       .blank_check_memory = arm7_9_blank_check_memory,
        
        .run_algorithm = armv4_5_run_algorithm,
        
@@ -83,8 +85,8 @@ target_type_t arm7tdmi_target =
        .add_watchpoint = arm7_9_add_watchpoint,
        .remove_watchpoint = arm7_9_remove_watchpoint,
 
-       .register_commands = arm7tdmi_register_commands,
-       .target_command = arm7tdmi_target_command,
+       .register_commands  = arm7tdmi_register_commands,
+       .target_create  = arm7tdmi_target_create,
        .init_target = arm7tdmi_init_target,
        .examine = arm7tdmi_examine,
        .quit = arm7tdmi_quit
@@ -278,7 +280,7 @@ int arm7tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size,
                        
                if (in)
                {
-                       LOG_DEBUG("in: 0x%8.8x", *in);
+                       LOG_DEBUG("in: 0x%8.8x", *(u32*)in);
                }
                else
                {
@@ -707,7 +709,7 @@ void arm7tdmi_build_reg_cache(target_t *target)
        armv4_5->core_cache = (*cache_p);
 }
 
-int arm7tdmi_examine(struct command_context_s *cmd_ctx, struct target_s *target)
+int arm7tdmi_examine(struct target_s *target)
 {
        int retval;
        armv4_5_common_t *armv4_5 = target->arch_info;
@@ -752,13 +754,13 @@ int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
        
 }
 
-int arm7tdmi_quit()
+int arm7tdmi_quit(void)
 {
        
        return ERROR_OK;
 }
 
-int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, int chain_pos, char *variant)
+int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, int chain_pos, const char *variant)
 {
        armv4_5_common_t *armv4_5;
        arm7_9_common_t *arm7_9;
@@ -806,8 +808,6 @@ int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, int c
        arm7_9->arm_bkpt = 0xdeeedeee;
        arm7_9->thumb_bkpt = 0xdeee;
        
-       arm7_9->sw_bkpts_use_wp = 1;
-       arm7_9->sw_bkpts_enabled = 0;
        arm7_9->dbgreq_adjust_pc = 2;
        arm7_9->arch_info = arm7tdmi;
 
@@ -828,30 +828,20 @@ int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, int c
        return ERROR_OK;
 }
 
-/* target arm7tdmi <endianess> <startup_mode> <chain_pos> <variant> */
-int arm7tdmi_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target)
-{
-       int chain_pos;
-       char *variant = NULL;
-       arm7tdmi_common_t *arm7tdmi = malloc(sizeof(arm7tdmi_common_t));
-       memset(arm7tdmi, 0, sizeof(*arm7tdmi));
 
-       if (argc < 4)
-       {
-               LOG_ERROR("'target arm7tdmi' requires at least one additional argument");
-               exit(-1);
-       }
-       
-       chain_pos = strtoul(args[3], NULL, 0);
+
+int arm7tdmi_target_create( struct target_s *target, Jim_Interp *interp )
+{
+       arm7tdmi_common_t *arm7tdmi;
        
-       if (argc >= 5)
-               variant = args[4];
+       arm7tdmi = calloc(1,sizeof(arm7tdmi_common_t));
        
-       arm7tdmi_init_arch_info(target, arm7tdmi, chain_pos, variant);
+       arm7tdmi_init_arch_info(target, arm7tdmi, target->chain_position, target->variant);
        
        return ERROR_OK;
 }
 
+
 int arm7tdmi_register_commands(struct command_context_s *cmd_ctx)
 {
        int retval;
@@ -862,3 +852,12 @@ int arm7tdmi_register_commands(struct command_context_s *cmd_ctx)
 
 }
 
+
+
+
+/*
+ * Local Variables: ***
+ * c-basic-offset: 4 ***
+ * tab-width: 4 ***
+ * End: ***
+ */