The following patches was applied:

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

diff --git a/src/target/arm11.c b/src/target/arm11.c
index 49172021c41fc54e1cdf33b06bb8f2746c30b2ad..7ccc7b82da874cc4e4b52e8e012a8c3519355884 100644 (file)
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -383,9 +383,9 @@ static void arm11_on_enter_debug_state(arm11_common_t * arm11)
 
        if (R(DSCR) & ARM11_DSCR_WDTR_FULL)
        {
-       arm11_add_debug_SCAN_N(arm11, 0x05, -1);
+       arm11_add_debug_SCAN_N(arm11, 0x05, TAP_INVALID);
 
-       arm11_add_IR(arm11, ARM11_INTEST, -1);
+       arm11_add_IR(arm11, ARM11_INTEST, TAP_INVALID);
 
        scan_field_t    chain5_fields[3];
 
@@ -393,7 +393,7 @@ static void arm11_on_enter_debug_state(arm11_common_t * arm11)
        arm11_setup_field(arm11,  1, NULL, NULL,        chain5_fields + 1);
        arm11_setup_field(arm11,  1, NULL, NULL,        chain5_fields + 2);
 
-       arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_PD);
+       arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
        }
        else
        {
@@ -614,9 +614,9 @@ void arm11_leave_debug_state(arm11_common_t * arm11)
 
        if (R(DSCR) & ARM11_DSCR_RDTR_FULL || arm11->reg_list[ARM11_RC_RDTR].dirty)
        {
-       arm11_add_debug_SCAN_N(arm11, 0x05, -1);
+       arm11_add_debug_SCAN_N(arm11, 0x05, TAP_INVALID);
 
-       arm11_add_IR(arm11, ARM11_EXTEST, -1);
+       arm11_add_IR(arm11, ARM11_EXTEST, TAP_INVALID);
 
        scan_field_t    chain5_fields[3];
 
@@ -627,7 +627,7 @@ void arm11_leave_debug_state(arm11_common_t * arm11)
        arm11_setup_field(arm11,  1, &Ready,    NULL, chain5_fields + 1);
        arm11_setup_field(arm11,  1, &Valid,    NULL, chain5_fields + 2);
 
-       arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_PD);
+       arm11_add_dr_scan_vc(asizeof(chain5_fields), chain5_fields, TAP_DRPAUSE);
        }
 
        arm11_record_register_history(arm11);
@@ -710,7 +710,7 @@ int arm11_target_request_data(struct target_s *target, u32 size, u8 *buffer)
 int arm11_halt(struct target_s *target)
 {
        int retval = ERROR_OK;
-       
+
        FNC_INFO;
 
        arm11_common_t * arm11 = target->arch_info;
@@ -735,7 +735,7 @@ int arm11_halt(struct target_s *target)
        return ERROR_OK;
        }
 
-       arm11_add_IR(arm11, ARM11_HALT, TAP_RTI);
+       arm11_add_IR(arm11, ARM11_HALT, TAP_IDLE);
 
        if((retval = jtag_execute_queue()) != ERROR_OK)
        {
@@ -841,7 +841,7 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b
 
        arm11_leave_debug_state(arm11);
 
-       arm11_add_IR(arm11, ARM11_RESTART, TAP_RTI);
+       arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
 
        if((retval = jtag_execute_queue()) != ERROR_OK)
        {
@@ -956,7 +956,7 @@ int arm11_step(struct target_s *target, int current, u32 address, int handle_bre
 
        arm11_leave_debug_state(arm11);
 
-       arm11_add_IR(arm11, ARM11_RESTART, TAP_RTI);
+       arm11_add_IR(arm11, ARM11_RESTART, TAP_IDLE);
 
        if((retval = jtag_execute_queue()) != ERROR_OK)
        {
@@ -1526,7 +1526,7 @@ int arm11_target_create(struct target_s *target, Jim_Interp *interp)
        arm11->target = target;
 
        /* prepare JTAG information for the new target */
-       arm11->jtag_info.chain_pos      = target->chain_position;
+       arm11->jtag_info.tap    = target->tap;
        arm11->jtag_info.scann_size     = 5;
 
        if((retval = arm_jtag_setup_connection(&arm11->jtag_info)) != ERROR_OK)
@@ -1534,11 +1534,12 @@ int arm11_target_create(struct target_s *target, Jim_Interp *interp)
                return retval;
        }
 
-       jtag_device_t *device = jtag_get_device(target->chain_position);
+       if (target->tap==NULL)
+               return ERROR_FAIL;
 
-       if (device->ir_length != 5)
+       if (target->tap->ir_length != 5)
        {
-               LOG_ERROR("'target arm11' expects 'jtag_device 5 0x01 0x1F 0x1E'");
+               LOG_ERROR("'target arm11' expects IR LENGTH = 5");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
@@ -1564,26 +1565,26 @@ int arm11_examine(struct target_s *target)
 
        /* check IDCODE */
 
-       arm11_add_IR(arm11, ARM11_IDCODE, -1);
+       arm11_add_IR(arm11, ARM11_IDCODE, TAP_INVALID);
 
        scan_field_t            idcode_field;
 
        arm11_setup_field(arm11, 32, NULL, &arm11->device_id, &idcode_field);
 
-       arm11_add_dr_scan_vc(1, &idcode_field, TAP_PD);
+       arm11_add_dr_scan_vc(1, &idcode_field, TAP_DRPAUSE);
 
        /* check DIDR */
 
-       arm11_add_debug_SCAN_N(arm11, 0x00, -1);
+       arm11_add_debug_SCAN_N(arm11, 0x00, TAP_INVALID);
 
-       arm11_add_IR(arm11, ARM11_INTEST, -1);
+       arm11_add_IR(arm11, ARM11_INTEST, TAP_INVALID);
 
        scan_field_t            chain0_fields[2];
 
        arm11_setup_field(arm11, 32, NULL,      &arm11->didr,           chain0_fields + 0);
        arm11_setup_field(arm11,  8, NULL,      &arm11->implementor,    chain0_fields + 1);
 
-       arm11_add_dr_scan_vc(asizeof(chain0_fields), chain0_fields, TAP_RTI);
+       arm11_add_dr_scan_vc(asizeof(chain0_fields), chain0_fields, TAP_IDLE);
 
        if ((retval=jtag_execute_queue())!=ERROR_OK)
                return retval;
@@ -1829,22 +1830,22 @@ const char arm11_mcr_syntax[] = "Syntax: mcr <jtag_target> <coprocessor> <opcode
 
 arm11_common_t * arm11_find_target(const char * arg)
 {
-       size_t jtag_target              = strtoul(arg, NULL, 0);
+       jtag_tap_t *tap;
+       target_t * t;
 
-       {target_t * t;
-       for (t = all_targets; t; t = t->next)
-       {
-               if (strcmp(t->type->name,"arm11"))
-               continue;
-
-       arm11_common_t * arm11 = t->arch_info;
-
-       if (arm11->jtag_info.chain_pos != jtag_target)
-               continue;
-
-       return arm11;
-       }}
+       tap = jtag_TapByString( arg );
+       if( !tap ){
+               return NULL;
+       }
 
+       for (t = all_targets; t; t = t->next){
+               if( t->tap == tap ){
+                       if( 0 == strcmp(t->type->name,"arm11")){
+                               arm11_common_t * arm11 = t->arch_info;
+                               return arm11;
+                       }
+               }
+       }
        return 0;
 }