Change tap_state naming to be consistent with SVF documentation.
[fw/openocd] / src / jtag / jtag.c
index 6a84db40201f0e4e98290b1e8035d87cf6e79281..d48641836f274157e171eb3ba616c087e9aea368 100644 (file)
@@ -87,22 +87,22 @@ int tap_move_map[16] = {
 
 tap_transition_t tap_transitions[16] =
 {
-       {TAP_TLR, TAP_RTI},             /* TLR */
-       {TAP_SIS, TAP_CD},              /* SDS */
-       {TAP_E1D, TAP_SD},              /* CD  */
-       {TAP_E1D, TAP_SD},              /* SD  */
-       {TAP_UD,  TAP_PD},              /* E1D */
-       {TAP_E2D, TAP_PD},              /* PD  */
-       {TAP_UD,  TAP_SD},              /* E2D */
-       {TAP_SDS, TAP_RTI},             /* UD  */
-       {TAP_SDS, TAP_RTI},             /* RTI */
-       {TAP_TLR, TAP_CI},              /* SIS */
-       {TAP_E1I, TAP_SI},              /* CI  */
-       {TAP_E1I, TAP_SI},              /* SI  */
-       {TAP_UI,  TAP_PI},              /* E1I */
-       {TAP_E2I, TAP_PI},              /* PI  */
-       {TAP_UI,  TAP_SI},              /* E2I */
-       {TAP_SDS, TAP_RTI}              /* UI  */
+       {TAP_RESET, TAP_IDLE},          /* TLR */
+       {TAP_IRSELECT, TAP_DRCAPTURE},          /* SDS */
+       {TAP_DREXIT1, TAP_DRSHIFT},             /* CD  */
+       {TAP_DREXIT1, TAP_DRSHIFT},             /* SD  */
+       {TAP_DRUPDATE,  TAP_DRPAUSE},           /* E1D */
+       {TAP_DREXIT2, TAP_DRPAUSE},             /* PD  */
+       {TAP_DRUPDATE,  TAP_DRSHIFT},           /* E2D */
+       {TAP_DRSELECT, TAP_IDLE},               /* UD  */
+       {TAP_DRSELECT, TAP_IDLE},               /* RTI */
+       {TAP_RESET, TAP_IRCAPTURE},             /* SIS */
+       {TAP_IREXIT1, TAP_IRSHIFT},             /* CI  */
+       {TAP_IREXIT1, TAP_IRSHIFT},             /* SI  */
+       {TAP_IRUPDATE,  TAP_IRPAUSE},           /* E1I */
+       {TAP_IREXIT2, TAP_IRPAUSE},             /* PI  */
+       {TAP_IRUPDATE,  TAP_IRSHIFT},           /* E2I */
+       {TAP_DRSELECT, TAP_IDLE}                /* UI  */
 };
 
 char* jtag_event_strings[] =
@@ -115,19 +115,18 @@ char* jtag_event_strings[] =
  * inside the drivers, but we don't want to break
  * linking the drivers!!!!
  */
-enum tap_state end_state = TAP_TLR;
-enum tap_state cur_state = TAP_TLR;
+enum tap_state end_state = TAP_RESET;
+enum tap_state cur_state = TAP_RESET;
 int jtag_trst = 0;
 int jtag_srst = 0;
 
 jtag_command_t *jtag_command_queue = NULL;
 jtag_command_t **last_comand_pointer = &jtag_command_queue;
-jtag_device_t *jtag_devices = NULL;
-int jtag_num_devices = 0;
-int jtag_ir_scan_size = 0;
+static jtag_tap_t *jtag_all_taps = NULL;
+
 enum reset_types jtag_reset_config = RESET_NONE;
-enum tap_state cmd_queue_end_state = TAP_TLR;
-enum tap_state cmd_queue_cur_state = TAP_TLR;
+enum tap_state cmd_queue_end_state = TAP_RESET;
+enum tap_state cmd_queue_cur_state = TAP_RESET;
 
 int jtag_verify_capture_ir = 1;
 
@@ -273,6 +272,109 @@ int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
 
 int handle_verify_ircapture_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 
+
+jtag_tap_t *jtag_AllTaps(void)
+{
+  return jtag_all_taps;
+};
+
+int
+jtag_NumTotalTaps(void)
+{
+       jtag_tap_t *t;
+       int n;
+
+       n = 0;
+       t = jtag_AllTaps();
+       while(t){
+               n++;
+               t = t->next_tap;
+       }
+       return n;
+}
+
+int
+jtag_NumEnabledTaps(void)
+{
+       jtag_tap_t *t;
+       int n;
+
+       n = 0;
+       t = jtag_AllTaps();
+       while(t){
+               if( t->enabled ){
+                       n++;
+               }
+               t = t->next_tap;
+       }
+       return n;
+}
+
+
+jtag_tap_t *jtag_TapByString( const char *s )
+{
+       jtag_tap_t *t;
+       char *cp;
+
+       t = jtag_AllTaps();
+       // try name first
+       while(t){
+               if( 0 == strcmp( t->dotted_name, s ) ){
+                       break;
+               } else {
+                       t = t->next_tap;
+               }
+       }
+       // backup plan is by number
+       if( t == NULL ){
+               /* ok - is "s" a number? */
+               int n;
+               n = strtol( s, &cp, 0 );
+               if( (s != cp) && (*cp == 0) ){
+                       /* Then it is... */
+                       t = jtag_TapByAbsPosition(n);
+               }
+       }
+       return t;
+}
+
+jtag_tap_t *
+jtag_TapByJimObj( Jim_Interp *interp, Jim_Obj *o )
+{
+       jtag_tap_t *t;
+       const char *cp;
+
+       cp = Jim_GetString( o, NULL );
+       if(cp == NULL){
+               cp = "(unknown)";
+               t = NULL;
+       }  else {
+               t = jtag_TapByString( cp );
+       }
+       if( t == NULL ){
+               Jim_SetResult_sprintf(interp,"Tap: %s is unknown", cp );
+       }
+       return t;
+}
+
+/* returns a pointer to the n-th device in the scan chain */
+jtag_tap_t *
+jtag_TapByAbsPosition( int n )
+{
+       int orig_n;
+       jtag_tap_t *t;
+
+       orig_n = n;
+       t = jtag_AllTaps();
+
+       while( t && (n > 0)) {
+               n--;
+               t = t->next_tap;
+    }
+       return t;
+}
+
+
 int jtag_register_event_callback(int (*callback)(enum jtag_event event, void *priv), void *priv)
 {
        jtag_event_callback_t **callbacks_p = &jtag_event_callbacks;
@@ -354,23 +456,6 @@ jtag_command_t** jtag_get_last_command_p(void)
        return last_comand_pointer;
 }
 
-/* returns a pointer to the n-th device in the scan chain */
-jtag_device_t* jtag_get_device(int num)
-{
-       jtag_device_t *device = jtag_devices;
-       int i = 0;
-
-       while (device)
-       {
-               if (num == i)
-                       return device;
-               device = device->next;
-               i++;
-       }
-
-       LOG_ERROR("jtag device number %d not defined", num);
-       exit(-1);
-}
 
 void* cmd_queue_alloc(size_t size)
 {
@@ -378,6 +463,39 @@ void* cmd_queue_alloc(size_t size)
        int offset;
        u8 *t;
 
+       /*
+        * WARNING:
+        *    We align/round the *SIZE* per below
+        *    so that all pointers returned by
+        *    this function are reasonably well
+        *    aligned.
+        *
+        * If we did not, then an "odd-length" request would cause the
+        * *next* allocation to be at an *odd* address, and because
+        * this function has the same type of api as malloc() - we
+        * must also return pointers that have the same type of
+        * alignment.
+        *
+        * What I do not/have is a reasonable portable means
+        * to align by...
+        *
+        * The solution here, is based on these suggestions.
+        * http://gcc.gnu.org/ml/gcc-help/2008-12/msg00041.html
+        *
+        */
+       union worse_case_align {
+         int i;
+         long l;
+         float f;
+         void *v;
+       };
+#define ALIGN_SIZE  (sizeof(union worse_case_align))
+
+       // The alignment process.
+       size = (size + ALIGN_SIZE -1) & (~(ALIGN_SIZE-1));
+       // Done...
+
+
        if (*p_page)
        {
                while ((*p_page)->next)
@@ -425,7 +543,7 @@ static void jtag_prelude1(void)
                return;
        }
 
-       if (cmd_queue_end_state == TAP_TLR)
+       if (cmd_queue_end_state == TAP_RESET)
                jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
 }
 
@@ -453,8 +571,10 @@ void jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_state state
 int MINIDRIVER(interface_jtag_add_ir_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
 {
        jtag_command_t **last_cmd;
-       jtag_device_t *device;
-       int i, j;
+       jtag_tap_t *tap;
+       int j;
+       int x;
+       int nth_tap;
        int scan_size = 0;
 
 
@@ -469,59 +589,67 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int num_fields, scan_field_t *fields,
        /* allocate memory for ir scan command */
        (*last_cmd)->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
        (*last_cmd)->cmd.scan->ir_scan = 1;
-       (*last_cmd)->cmd.scan->num_fields = jtag_num_devices;   /* one field per device */
-       (*last_cmd)->cmd.scan->fields = cmd_queue_alloc(jtag_num_devices * sizeof(scan_field_t));
+       x = jtag_NumEnabledTaps();
+       (*last_cmd)->cmd.scan->num_fields = x;  /* one field per device */
+       (*last_cmd)->cmd.scan->fields = cmd_queue_alloc(x  * sizeof(scan_field_t));
        (*last_cmd)->cmd.scan->end_state = state;
 
-       for (i = 0; i < jtag_num_devices; i++)
-       {
+       nth_tap = -1;
+       tap = NULL;
+       for(;;){
                int found = 0;
-               device = jtag_get_device(i);
-               scan_size = device->ir_length;
-               (*last_cmd)->cmd.scan->fields[i].device = i;
-               (*last_cmd)->cmd.scan->fields[i].num_bits = scan_size;
-               (*last_cmd)->cmd.scan->fields[i].in_value = NULL;
-               (*last_cmd)->cmd.scan->fields[i].in_handler = NULL;     /* disable verification by default */
+
+               // do this here so it is not forgotten
+               tap = jtag_NextEnabledTap(tap);
+               if( tap == NULL ){
+                       break;
+               }
+               nth_tap++;
+               scan_size = tap->ir_length;
+               (*last_cmd)->cmd.scan->fields[nth_tap].tap = tap;
+               (*last_cmd)->cmd.scan->fields[nth_tap].num_bits = scan_size;
+               (*last_cmd)->cmd.scan->fields[nth_tap].in_value = NULL;
+               (*last_cmd)->cmd.scan->fields[nth_tap].in_handler = NULL;       /* disable verification by default */
 
                /* search the list */
                for (j = 0; j < num_fields; j++)
                {
-                       if (i == fields[j].device)
+                       if (tap == fields[j].tap)
                        {
                                found = 1;
-                               (*last_cmd)->cmd.scan->fields[i].out_value = buf_cpy(fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
-                               (*last_cmd)->cmd.scan->fields[i].out_mask = buf_cpy(fields[j].out_mask, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
+                               (*last_cmd)->cmd.scan->fields[nth_tap].out_value = buf_cpy(fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
+                               (*last_cmd)->cmd.scan->fields[nth_tap].out_mask = buf_cpy(fields[j].out_mask, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
 
                                if (jtag_verify_capture_ir)
                                {
                                        if (fields[j].in_handler==NULL)
                                        {
-                                               jtag_set_check_value((*last_cmd)->cmd.scan->fields+i, device->expected, device->expected_mask, NULL);
+                                               jtag_set_check_value((*last_cmd)->cmd.scan->fields+nth_tap, tap->expected, tap->expected_mask, NULL);
                                        } else
                                        {
-                                               (*last_cmd)->cmd.scan->fields[i].in_handler = fields[j].in_handler;
-                                               (*last_cmd)->cmd.scan->fields[i].in_handler_priv = fields[j].in_handler_priv;
-                                               (*last_cmd)->cmd.scan->fields[i].in_check_value = device->expected;
-                                               (*last_cmd)->cmd.scan->fields[i].in_check_mask = device->expected_mask;
+                                               (*last_cmd)->cmd.scan->fields[nth_tap].in_handler = fields[j].in_handler;
+                                               (*last_cmd)->cmd.scan->fields[nth_tap].in_handler_priv = fields[j].in_handler_priv;
+                                               (*last_cmd)->cmd.scan->fields[nth_tap].in_check_value = tap->expected;
+                                               (*last_cmd)->cmd.scan->fields[nth_tap].in_check_mask = tap->expected_mask;
                                        }
                                }
 
-                               device->bypass = 0;
+                               tap->bypass = 0;
                                break;
                        }
                }
 
                if (!found)
                {
-                       /* if a device isn't listed, set it to BYPASS */
-                       (*last_cmd)->cmd.scan->fields[i].out_value = buf_set_ones(cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
-                       (*last_cmd)->cmd.scan->fields[i].out_mask = NULL;
-                       device->bypass = 1;
+                       /* if a tap isn't listed, set it to BYPASS */
+                       (*last_cmd)->cmd.scan->fields[nth_tap].out_value = buf_set_ones(cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
+                       (*last_cmd)->cmd.scan->fields[nth_tap].out_mask = NULL;
+                       tap->bypass = 1;
 
                }
 
                /* update device information */
-               buf_cpy((*last_cmd)->cmd.scan->fields[i].out_value, jtag_get_device(i)->cur_instr, scan_size);
+               buf_cpy((*last_cmd)->cmd.scan->fields[nth_tap].out_value, tap->cur_instr, scan_size);
        }
 
        return ERROR_OK;
@@ -558,11 +686,10 @@ int MINIDRIVER(interface_jtag_add_plain_ir_scan)(int num_fields, scan_field_t *f
        (*last_cmd)->cmd.scan->fields = cmd_queue_alloc(num_fields * sizeof(scan_field_t));
        (*last_cmd)->cmd.scan->end_state = state;
 
-       for (i = 0; i < num_fields; i++)
-       {
+       for( i = 0 ; i < num_fields ; i++ ){
                int num_bits = fields[i].num_bits;
                int num_bytes = CEIL(fields[i].num_bits, 8);
-               (*last_cmd)->cmd.scan->fields[i].device = fields[i].device;
+               (*last_cmd)->cmd.scan->fields[i].tap = fields[i].tap;
                (*last_cmd)->cmd.scan->fields[i].num_bits = num_bits;
                (*last_cmd)->cmd.scan->fields[i].out_value = buf_cpy(fields[i].out_value, cmd_queue_alloc(num_bytes), num_bits);
                (*last_cmd)->cmd.scan->fields[i].out_mask = buf_cpy(fields[i].out_mask, cmd_queue_alloc(num_bytes), num_bits);
@@ -588,25 +715,26 @@ void jtag_add_dr_scan(int num_fields, scan_field_t *fields, enum tap_state state
 
 int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields, enum tap_state state)
 {
-       int i, j;
+       int j;
+       int nth_tap;
        int bypass_devices = 0;
        int field_count = 0;
        int scan_size;
 
        jtag_command_t **last_cmd = jtag_get_last_command_p();
-       jtag_device_t *device = jtag_devices;
+       jtag_tap_t *tap;
 
        /* count devices in bypass */
-       while (device)
-       {
-               if (device->bypass)
+       tap = NULL;
+       bypass_devices = 0;
+       for(;;){
+               tap = jtag_NextEnabledTap(tap);
+               if( tap == NULL ){
+                       break;
+               }
+               if( tap->bypass ){
                        bypass_devices++;
-               device = device->next;
-       }
-       if (bypass_devices >= jtag_num_devices)
-       {
-               LOG_ERROR("all devices in bypass");
-               return ERROR_JTAG_DEVICE_ERROR;
+               }
        }
 
        /* allocate memory for a new list member */
@@ -622,14 +750,20 @@ int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields,
        (*last_cmd)->cmd.scan->fields = cmd_queue_alloc((num_fields + bypass_devices) * sizeof(scan_field_t));
        (*last_cmd)->cmd.scan->end_state = state;
 
-       for (i = 0; i < jtag_num_devices; i++)
-       {
+       tap = NULL;
+       nth_tap = -1;
+       for(;;){
+               nth_tap++;
+               tap = jtag_NextEnabledTap(tap);
+               if( tap == NULL ){
+                       break;
+               }
                int found = 0;
-               (*last_cmd)->cmd.scan->fields[field_count].device = i;
+               (*last_cmd)->cmd.scan->fields[field_count].tap = tap;
 
                for (j = 0; j < num_fields; j++)
                {
-                       if (i == fields[j].device)
+                       if (tap == fields[j].tap)
                        {
                                found = 1;
                                scan_size = fields[j].num_bits;
@@ -647,7 +781,7 @@ int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields,
                {
 #ifdef _DEBUG_JTAG_IO_
                        /* if a device isn't listed, the BYPASS register should be selected */
-                       if (!jtag_get_device(i)->bypass)
+                       if (! tap->bypass)
                        {
                                LOG_ERROR("BUG: no scan data for a device not in BYPASS");
                                exit(-1);
@@ -667,7 +801,7 @@ int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields,
                {
 #ifdef _DEBUG_JTAG_IO_
                        /* if a device is listed, the BYPASS register must not be selected */
-                       if (jtag_get_device(i)->bypass)
+                       if (tap->bypass)
                        {
                                LOG_ERROR("BUG: scan data for a device in BYPASS");
                                exit(-1);
@@ -678,25 +812,31 @@ int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields,
        return ERROR_OK;
 }
 
-void MINIDRIVER(interface_jtag_add_dr_out)(int device_num,
+void MINIDRIVER(interface_jtag_add_dr_out)(jtag_tap_t *target_tap,
                int num_fields,
                const int *num_bits,
                const u32 *value,
                enum tap_state end_state)
 {
-       int i;
+       int nth_tap;
        int field_count = 0;
        int scan_size;
        int bypass_devices = 0;
 
        jtag_command_t **last_cmd = jtag_get_last_command_p();
-       jtag_device_t *device = jtag_devices;
+       jtag_tap_t *tap;
+
        /* count devices in bypass */
-       while (device)
-       {
-               if (device->bypass)
+       tap = NULL;
+       bypass_devices = 0;
+       for(;;){
+               tap = jtag_NextEnabledTap(tap);
+               if( tap == NULL ){
+                       break;
+               }
+               if( tap->bypass ){
                        bypass_devices++;
-               device = device->next;
+               }
        }
 
        /* allocate memory for a new list member */
@@ -712,16 +852,22 @@ void MINIDRIVER(interface_jtag_add_dr_out)(int device_num,
        (*last_cmd)->cmd.scan->fields = cmd_queue_alloc((num_fields + bypass_devices) * sizeof(scan_field_t));
        (*last_cmd)->cmd.scan->end_state = end_state;
 
-       for (i = 0; i < jtag_num_devices; i++)
-       {
-               (*last_cmd)->cmd.scan->fields[field_count].device = i;
+       tap = NULL;
+       nth_tap = -1;
+       for(;;){
+               tap = jtag_NextEnabledTap(tap);
+               if( tap == NULL ){
+                       break;
+               }
+               nth_tap++;
+               (*last_cmd)->cmd.scan->fields[field_count].tap = tap;
 
-               if (i == device_num)
+               if (tap == target_tap)
                {
                        int j;
 #ifdef _DEBUG_JTAG_IO_
                        /* if a device is listed, the BYPASS register must not be selected */
-                       if (jtag_get_device(i)->bypass)
+                       if (tap->bypass)
                        {
                                LOG_ERROR("BUG: scan data for a device in BYPASS");
                                exit(-1);
@@ -745,7 +891,7 @@ void MINIDRIVER(interface_jtag_add_dr_out)(int device_num,
                {
 #ifdef _DEBUG_JTAG_IO_
                        /* if a device isn't listed, the BYPASS register should be selected */
-                       if (!jtag_get_device(i)->bypass)
+                       if (! tap->bypass)
                        {
                                LOG_ERROR("BUG: no scan data for a device not in BYPASS");
                                exit(-1);
@@ -797,7 +943,7 @@ int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int num_fields, scan_field_t *f
        {
                int num_bits = fields[i].num_bits;
                int num_bytes = CEIL(fields[i].num_bits, 8);
-               (*last_cmd)->cmd.scan->fields[i].device = fields[i].device;
+               (*last_cmd)->cmd.scan->fields[i].tap = fields[i].tap;
                (*last_cmd)->cmd.scan->fields[i].num_bits = num_bits;
                (*last_cmd)->cmd.scan->fields[i].out_value = buf_cpy(fields[i].out_value, cmd_queue_alloc(num_bytes), num_bits);
                (*last_cmd)->cmd.scan->fields[i].out_mask = buf_cpy(fields[i].out_mask, cmd_queue_alloc(num_bytes), num_bits);
@@ -813,7 +959,7 @@ int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int num_fields, scan_field_t *f
 
 void jtag_add_tlr(void)
 {
-       jtag_prelude(TAP_TLR);
+       jtag_prelude(TAP_RESET);
 
        int retval;
        retval=interface_jtag_add_tlr();
@@ -823,7 +969,7 @@ void jtag_add_tlr(void)
 
 int MINIDRIVER(interface_jtag_add_tlr)()
 {
-       enum tap_state state = TAP_TLR;
+       enum tap_state state = TAP_RESET;
        jtag_command_t **last_cmd = jtag_get_last_command_p();
 
        /* allocate memory for a new list member */
@@ -854,9 +1000,9 @@ void jtag_add_pathmove(int num_states, enum tap_state *path)
 
        for (i=0; i<num_states; i++)
        {
-               if (path[i] == TAP_TLR)
+               if (path[i] == TAP_RESET)
                {
-                       LOG_ERROR("BUG: TAP_TLR is not a valid state for pathmove sequences");
+                       LOG_ERROR("BUG: TAP_RESET is not a valid state for pathmove sequences");
                        exit(-1);
                }
                if ((tap_transitions[cur_state].low != path[i])&&
@@ -1008,7 +1154,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
        if (trst_with_tlr)
        {
                LOG_DEBUG("JTAG reset with TLR instead of TRST");
-               jtag_add_end_state(TAP_TLR);
+               jtag_add_end_state(TAP_RESET);
                jtag_add_tlr();
                jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
                return;
@@ -1020,7 +1166,7 @@ void jtag_add_reset(int req_tlr_or_trst, int req_srst)
                 * and inform possible listeners about this
                 */
                LOG_DEBUG("TRST line asserted");
-               cmd_queue_cur_state = TAP_TLR;
+               cmd_queue_cur_state = TAP_RESET;
                jtag_call_event_callbacks(JTAG_TRST_ASSERTED);
        }
        else
@@ -1050,9 +1196,9 @@ int MINIDRIVER(interface_jtag_add_reset)(int req_trst, int req_srst)
 void jtag_add_end_state(enum tap_state state)
 {
        cmd_queue_end_state = state;
-       if ((cmd_queue_end_state == TAP_SD)||(cmd_queue_end_state == TAP_SI))
+       if ((cmd_queue_end_state == TAP_DRSHIFT)||(cmd_queue_end_state == TAP_IRSHIFT))
        {
-               LOG_ERROR("BUG: TAP_SD/SI can't be end state. Calling code should use a larger scan field");
+               LOG_ERROR("BUG: TAP_DRSHIFT/SI can't be end state. Calling code should use a larger scan field");
        }
 }
 
@@ -1199,12 +1345,13 @@ int jtag_check_value(u8 *captured, void *priv, scan_field_t *field)
        else
                compare_failed = buf_cmp(captured, field->in_check_value, num_bits);
 
-       if (compare_failed)
-               {
+       if (compare_failed){
                /* An error handler could have caught the failing check
                 * only report a problem when there wasn't a handler, or if the handler
                 * acknowledged the error
                 */
+               LOG_WARNING("TAP %s:",
+                                       (field->tap == NULL) ? "(unknown)" : field->tap->dotted_name );
                if (compare_failed)
                {
                        char *captured_char = buf_to_str(captured, (num_bits > 64) ? 64 : num_bits, 16);
@@ -1214,7 +1361,9 @@ int jtag_check_value(u8 *captured, void *priv, scan_field_t *field)
                        {
                                char *in_check_mask_char;
                                in_check_mask_char = buf_to_str(field->in_check_mask, (num_bits > 64) ? 64 : num_bits, 16);
-                               LOG_WARNING("value captured during scan didn't pass the requested check: captured: 0x%s check_value: 0x%s check_mask: 0x%s", captured_char, in_check_value_char, in_check_mask_char);
+                               LOG_WARNING("value captured during scan didn't pass the requested check:");
+                               LOG_WARNING("captured: 0x%s check_value: 0x%s check_mask: 0x%s",
+                                                       captured_char, in_check_value_char, in_check_mask_char);
                                free(in_check_mask_char);
                        }
                        else
@@ -1296,14 +1445,14 @@ int jtag_execute_queue(void)
 
 int jtag_reset_callback(enum jtag_event event, void *priv)
 {
-       jtag_device_t *device = priv;
+       jtag_tap_t *tap = priv;
 
        LOG_DEBUG("-");
 
        if (event == JTAG_TRST_ASSERTED)
        {
-               buf_set_ones(device->cur_instr, device->ir_length);
-               device->bypass = 1;
+               buf_set_ones(tap->cur_instr, tap->ir_length);
+               tap->bypass = 1;
        }
 
        return ERROR_OK;
@@ -1318,7 +1467,7 @@ void jtag_sleep(u32 us)
  */
 int jtag_examine_chain(void)
 {
-       jtag_device_t *device = jtag_devices;
+       jtag_tap_t *tap;
        scan_field_t field;
        u8 idcode_buffer[JTAG_MAX_CHAIN_SIZE * 4];
        int i;
@@ -1327,7 +1476,7 @@ int jtag_examine_chain(void)
        u8 zero_check = 0x0;
        u8 one_check = 0xff;
 
-       field.device = 0;
+       field.tap = NULL;
        field.num_bits = sizeof(idcode_buffer) * 8;
        field.out_value = idcode_buffer;
        field.out_mask = NULL;
@@ -1342,7 +1491,7 @@ int jtag_examine_chain(void)
                buf_set_u32(idcode_buffer, i * 32, 32, 0x000000FF);
        }
 
-       jtag_add_plain_dr_scan(1, &field, TAP_TLR);
+       jtag_add_plain_dr_scan(1, &field, TAP_RESET);
        jtag_execute_queue();
 
        for (i = 0; i < JTAG_MAX_CHAIN_SIZE * 4; i++)
@@ -1358,13 +1507,20 @@ int jtag_examine_chain(void)
                return ERROR_JTAG_INIT_FAILED;
        }
 
+       // point at the 1st tap
+       tap = jtag_NextEnabledTap(NULL);
+       if( tap == NULL ){
+               LOG_ERROR("JTAG: No taps enabled?");
+               return ERROR_JTAG_INIT_FAILED;
+       }
+
        for (bit_count = 0; bit_count < (JTAG_MAX_CHAIN_SIZE * 32) - 31;)
        {
                u32 idcode = buf_get_u32(idcode_buffer, bit_count, 32);
                if ((idcode & 1) == 0)
                {
                        /* LSB must not be 0, this indicates a device in bypass */
-                       LOG_WARNING("Device does not have IDCODE");
+                       LOG_WARNING("Tap/Device does not have IDCODE");
                        idcode=0;
 
                        bit_count += 1;
@@ -1402,28 +1558,71 @@ int jtag_examine_chain(void)
                                break;
                        }
 
-                       manufacturer = (idcode & 0xffe) >> 1;
-                       part = (idcode & 0xffff000) >> 12;
-                       version = (idcode & 0xf0000000) >> 28;
+#define EXTRACT_MFG(X)  (((X) & 0xffe) >> 1)
+                       manufacturer = EXTRACT_MFG(idcode);
+#define EXTRACT_PART(X) (((X) & 0xffff000) >> 12)
+                       part = EXTRACT_PART(idcode);
+#define EXTRACT_VER(X)  (((X) & 0xf0000000) >> 28)
+                       version = EXTRACT_VER(idcode);
 
-                       LOG_INFO("JTAG device found: 0x%8.8x (Manufacturer: 0x%3.3x, Part: 0x%4.4x, Version: 0x%1.1x)",
+                       LOG_INFO("JTAG tap: %s tap/device found: 0x%8.8x (Manufacturer: 0x%3.3x, Part: 0x%4.4x, Version: 0x%1.1x)",
+                                        ((tap != NULL) ? (tap->dotted_name) : "(not-named)"),
                                idcode, manufacturer, part, version);
 
                        bit_count += 32;
                }
-               if (device)
+               if (tap)
                {
-                       device->idcode = idcode;
-                       device = device->next;
+                       tap->idcode = idcode;
+
+                       if (tap->expected_ids_cnt > 0) {
+                               /* Loop over the expected identification codes and test for a match */
+                               u8 ii;
+                               for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
+                                       if( tap->idcode == tap->expected_ids[ii] ){
+                                               break;
+                                       }
+                               }
+
+                               /* If none of the expected ids matched, log an error */
+                               if (ii == tap->expected_ids_cnt) {
+                                       LOG_ERROR("JTAG tap: %s             got: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
+                                                         tap->dotted_name,
+                                                         idcode,
+                                                         EXTRACT_MFG( tap->idcode ),
+                                                         EXTRACT_PART( tap->idcode ),
+                                                         EXTRACT_VER( tap->idcode ) );
+                                       for (ii = 0; ii < tap->expected_ids_cnt; ii++) {
+                                               LOG_ERROR("JTAG tap: %s expected %hhu of %hhu: 0x%08x (mfg: 0x%3.3x, part: 0x%4.4x, ver: 0x%1.1x)",
+                                                                 tap->dotted_name,
+                                                                 ii + 1,
+                                                                 tap->expected_ids_cnt,
+                                                                 tap->expected_ids[ii],
+                                                                 EXTRACT_MFG( tap->expected_ids[ii] ),
+                                                                 EXTRACT_PART( tap->expected_ids[ii] ),
+                                                                 EXTRACT_VER( tap->expected_ids[ii] ) );
+                                       }
+
+                                       return ERROR_JTAG_INIT_FAILED;
+                               } else {
+                                       LOG_INFO("JTAG Tap/device matched");
+                               }
+                       } else {
+#if 0
+                               LOG_INFO("JTAG TAP ID: 0x%08x - Unknown - please report (A) chipname and (B) idcode to the openocd project",
+                                                tap->idcode);
+#endif
+                       }
+                       tap = jtag_NextEnabledTap(tap);
                }
                device_count++;
        }
 
        /* see if number of discovered devices matches configuration */
-       if (device_count != jtag_num_devices)
+       if (device_count != jtag_NumEnabledTaps())
        {
-               LOG_ERROR("number of discovered devices in JTAG chain (%i) doesn't match configuration (%i)",
-                               device_count, jtag_num_devices);
+               LOG_ERROR("number of discovered devices in JTAG chain (%i) doesn't match (enabled) configuration (%i), total taps: %d",
+                                 device_count, jtag_NumEnabledTaps(), jtag_NumTotalTaps());
                LOG_ERROR("check the config file and ensure proper JTAG communication (connections, speed, ...)");
                return ERROR_JTAG_INIT_FAILED;
        }
@@ -1433,23 +1632,27 @@ int jtag_examine_chain(void)
 
 int jtag_validate_chain(void)
 {
-       jtag_device_t *device = jtag_devices;
+       jtag_tap_t *tap;
        int total_ir_length = 0;
        u8 *ir_test = NULL;
        scan_field_t field;
        int chain_pos = 0;
 
-       while (device)
-       {
-               total_ir_length += device->ir_length;
-               device = device->next;
+       tap = NULL;
+       total_ir_length = 0;
+       for(;;){
+               tap = jtag_NextEnabledTap(tap);
+               if( tap == NULL ){
+                       break;
+               }
+               total_ir_length += tap->ir_length;
        }
 
        total_ir_length += 2;
        ir_test = malloc(CEIL(total_ir_length, 8));
        buf_set_ones(ir_test, total_ir_length);
 
-       field.device = 0;
+       field.tap = NULL;
        field.num_bits = total_ir_length;
        field.out_value = ir_test;
        field.out_mask = NULL;
@@ -1459,12 +1662,18 @@ int jtag_validate_chain(void)
        field.in_handler = NULL;
        field.in_handler_priv = NULL;
 
-       jtag_add_plain_ir_scan(1, &field, TAP_TLR);
+       jtag_add_plain_ir_scan(1, &field, TAP_RESET);
        jtag_execute_queue();
 
-       device = jtag_devices;
-       while (device)
-       {
+       tap = NULL;
+       chain_pos = 0;
+       for(;;){
+               tap = jtag_NextEnabledTap(tap);
+               if( tap == NULL ){
+                       break;
+               }
+
+
                if (buf_get_u32(ir_test, chain_pos, 2) != 0x1)
                {
                        char *cbuf = buf_to_str(ir_test, total_ir_length, 16);
@@ -1473,8 +1682,7 @@ int jtag_validate_chain(void)
                        free(ir_test);
                        return ERROR_JTAG_INIT_FAILED;
                }
-               chain_pos += device->ir_length;
-               device = device->next;
+               chain_pos += tap->ir_length;
        }
 
        if (buf_get_u32(ir_test, chain_pos, 2) != 0x3)
@@ -1492,6 +1700,201 @@ int jtag_validate_chain(void)
 }
 
 
+static int
+jim_newtap_cmd( Jim_GetOptInfo *goi )
+{
+       jtag_tap_t *pTap;
+       jtag_tap_t **ppTap;
+       jim_wide w;
+       int x;
+       int e;
+       int reqbits;
+       Jim_Nvp *n;
+       char *cp;
+       const Jim_Nvp opts[] = {
+#define NTAP_OPT_IRLEN     0
+               { .name = "-irlen"                      ,       .value = NTAP_OPT_IRLEN },
+#define NTAP_OPT_IRMASK    1
+               { .name = "-irmask"                     ,       .value = NTAP_OPT_IRMASK },
+#define NTAP_OPT_IRCAPTURE 2
+               { .name = "-ircapture"          ,       .value = NTAP_OPT_IRCAPTURE },
+#define NTAP_OPT_ENABLED   3
+               { .name = "-enable"                     ,   .value = NTAP_OPT_ENABLED },
+#define NTAP_OPT_DISABLED  4
+               { .name = "-disable"            ,   .value = NTAP_OPT_DISABLED },
+#define NTAP_OPT_EXPECTED_ID 5
+               { .name = "-expected-id"        ,   .value = NTAP_OPT_EXPECTED_ID },
+               { .name = NULL                          ,   .value = -1 },
+       };
+
+
+       pTap = malloc( sizeof(jtag_tap_t) );
+       memset( pTap, 0, sizeof(*pTap) );
+       if( !pTap ){
+               Jim_SetResult_sprintf( goi->interp, "no memory");
+               return JIM_ERR;
+       }
+       //
+       // we expect CHIP + TAP + OPTIONS
+       //
+       if( goi->argc < 3 ){
+               Jim_SetResult_sprintf(goi->interp, "Missing CHIP TAP OPTIONS ....");
+               return JIM_ERR;
+       }
+       Jim_GetOpt_String( goi, &cp, NULL );
+       pTap->chip = strdup(cp);
+
+       Jim_GetOpt_String( goi, &cp, NULL );
+       pTap->tapname = strdup(cp);
+
+       // name + dot + name + null
+       x = strlen(pTap->chip) + 1 + strlen(pTap->tapname) + 1;
+       cp = malloc( x );
+       sprintf( cp, "%s.%s", pTap->chip, pTap->tapname );
+       pTap->dotted_name = cp;
+
+       LOG_DEBUG("Creating New Tap, Chip: %s, Tap: %s, Dotted: %s, %d params",
+                         pTap->chip, pTap->tapname, pTap->dotted_name, goi->argc);
+
+
+       // default is enabled
+       pTap->enabled = 1;
+
+       // deal with options
+#define NTREQ_IRLEN      1
+#define NTREQ_IRCAPTURE  2
+#define NTREQ_IRMASK     4
+
+       // clear them as we find them
+       reqbits = (NTREQ_IRLEN | NTREQ_IRCAPTURE | NTREQ_IRMASK);
+
+       while( goi->argc ){
+               e = Jim_GetOpt_Nvp( goi, opts, &n );
+               if( e != JIM_OK ){
+                       Jim_GetOpt_NvpUnknown( goi, opts, 0 );
+                       return e;
+               }
+               LOG_DEBUG("Processing option: %s", n->name );
+               switch( n->value ){
+               case NTAP_OPT_ENABLED:
+                       pTap->enabled = 1;
+                       break;
+               case NTAP_OPT_DISABLED:
+                       pTap->enabled = 0;
+                       break;
+               case NTAP_OPT_EXPECTED_ID:
+               {
+                       u32 *new_expected_ids;
+
+                       e = Jim_GetOpt_Wide( goi, &w );
+                       if( e != JIM_OK) {
+                               Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
+                               return e;
+                       }
+
+                       new_expected_ids = malloc(sizeof(u32) * (pTap->expected_ids_cnt + 1));
+                       if (new_expected_ids == NULL) {
+                               Jim_SetResult_sprintf( goi->interp, "no memory");
+                               return JIM_ERR;
+                       }
+
+                       memcpy(new_expected_ids, pTap->expected_ids, sizeof(u32) * pTap->expected_ids_cnt);
+
+                       new_expected_ids[pTap->expected_ids_cnt] = w;
+
+                       free(pTap->expected_ids);
+                       pTap->expected_ids = new_expected_ids;
+                       pTap->expected_ids_cnt++;
+                       break;
+               }
+               case NTAP_OPT_IRLEN:
+               case NTAP_OPT_IRMASK:
+               case NTAP_OPT_IRCAPTURE:
+                       e = Jim_GetOpt_Wide( goi, &w );
+                       if( e != JIM_OK ){
+                               Jim_SetResult_sprintf( goi->interp, "option: %s bad parameter", n->name );
+                               return e;
+                       }
+                       if( (w < 0) || (w > 0xffff) ){
+                               // wacky value
+                               Jim_SetResult_sprintf( goi->interp, "option: %s - wacky value: %d (0x%x)",
+                                                                          n->name, (int)(w), (int)(w));
+                               return JIM_ERR;
+                       }
+                       switch(n->value){
+                       case NTAP_OPT_IRLEN:
+                               pTap->ir_length = w;
+                               reqbits &= (~(NTREQ_IRLEN));
+                               break;
+                       case NTAP_OPT_IRMASK:
+                               pTap->ir_capture_mask = w;
+                               reqbits &= (~(NTREQ_IRMASK));
+                               break;
+                       case NTAP_OPT_IRCAPTURE:
+                               pTap->ir_capture_value = w;
+                               reqbits &= (~(NTREQ_IRCAPTURE));
+                               break;
+                       }
+               } // switch(n->value)
+       } // while( goi->argc )
+
+       // Did we get all the options?
+       if( reqbits ){
+               // no
+               Jim_SetResult_sprintf( goi->interp,
+                                                          "newtap: %s missing required parameters",
+                                                          pTap->dotted_name);
+               // fixme: Tell user what is missing :-(
+               // no memory leaks pelase
+               free(((void *)(pTap->expected_ids)));
+               free(((void *)(pTap->chip)));
+               free(((void *)(pTap->tapname)));
+               free(((void *)(pTap->dotted_name)));
+               free(((void *)(pTap)));
+               return JIM_ERR;
+       }
+
+       pTap->expected      = malloc( pTap->ir_length );
+       pTap->expected_mask = malloc( pTap->ir_length );
+       pTap->cur_instr     = malloc( pTap->ir_length );
+
+       buf_set_u32( pTap->expected,
+                                0,
+                                pTap->ir_length,
+                                pTap->ir_capture_value );
+       buf_set_u32( pTap->expected_mask,
+                                0,
+                                pTap->ir_length,
+                                pTap->ir_capture_mask );
+       buf_set_ones( pTap->cur_instr,
+                                 pTap->ir_length );
+
+       pTap->bypass = 1;
+
+
+       jtag_register_event_callback(jtag_reset_callback, pTap );
+
+       ppTap = &(jtag_all_taps);
+       while( (*ppTap) != NULL ){
+               ppTap = &((*ppTap)->next_tap);
+       }
+       *ppTap = pTap;
+       {
+               static int n_taps = 0;
+               pTap->abs_chain_position = n_taps++;
+       }
+       LOG_DEBUG( "Created Tap: %s @ abs position %d, irlen %d, capture: 0x%x mask: 0x%x",
+                          (*ppTap)->dotted_name,
+                          (*ppTap)->abs_chain_position,
+                          (*ppTap)->ir_length,
+                          (*ppTap)->ir_capture_value,
+                          (*ppTap)->ir_capture_mask );
+
+
+       return ERROR_OK;
+}
+
+
 static int
 jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
 {
@@ -1503,11 +1906,19 @@ jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
        enum {
                JTAG_CMD_INTERFACE,
                JTAG_CMD_INIT_RESET,
+               JTAG_CMD_NEWTAP,
+               JTAG_CMD_TAPENABLE,
+               JTAG_CMD_TAPDISABLE,
+               JTAG_CMD_TAPISENABLED
        };
 
        const Jim_Nvp jtag_cmds[] = {
                { .name = "interface"     , .value = JTAG_CMD_INTERFACE },
                { .name = "arp_init-reset", .value = JTAG_CMD_INIT_RESET },
+               { .name = "newtap"        , .value = JTAG_CMD_NEWTAP },
+               { .name = "tapisenabled"     , .value = JTAG_CMD_TAPISENABLED },
+               { .name = "tapenable"     , .value = JTAG_CMD_TAPENABLE },
+               { .name = "tapdisable"    , .value = JTAG_CMD_TAPDISABLE },
 
                { .name = NULL, .value = -1 },
        };
@@ -1544,6 +1955,39 @@ jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
                        return JIM_ERR;
                }
                return JIM_OK;
+       case JTAG_CMD_NEWTAP:
+               return jim_newtap_cmd( &goi );
+               break;
+       case JTAG_CMD_TAPISENABLED:
+       case JTAG_CMD_TAPENABLE:
+       case JTAG_CMD_TAPDISABLE:
+               if( goi.argc != 1 ){
+                       Jim_SetResultString( goi.interp, "Too many parameters",-1 );
+                       return JIM_ERR;
+               }
+
+               {
+                       jtag_tap_t *t;
+                       t = jtag_TapByJimObj( goi.interp, goi.argv[0] );
+                       if( t == NULL ){
+                               return JIM_ERR;
+                       }
+                       switch( n->value ){
+                       case JTAG_CMD_TAPISENABLED:
+                               // below
+                               break;
+                       case JTAG_CMD_TAPENABLE:
+                               e = 1;
+                               t->enabled = e;
+                               break;
+                       case JTAG_CMD_TAPDISABLE:
+                               e = 0;
+                               t->enabled = e;
+                               break;
+                       }
+                       Jim_SetResult( goi.interp, Jim_NewIntObj( goi.interp, e ) );
+                       return JIM_OK;
+               }
        }
 
 
@@ -1615,19 +2059,16 @@ int jtag_interface_init(struct command_context_s *cmd_ctx)
 
 static int jtag_init_inner(struct command_context_s *cmd_ctx)
 {
-       jtag_device_t *device;
+       jtag_tap_t *tap;
        int retval;
 
        LOG_DEBUG("Init JTAG chain");
 
-       device = jtag_devices;
-       jtag_ir_scan_size = 0;
-       jtag_num_devices = 0;
-       while (device != NULL)
-       {
-               jtag_ir_scan_size += device->ir_length;
-               jtag_num_devices++;
-               device = device->next;
+
+       tap = jtag_NextEnabledTap(NULL);
+       if( tap == NULL ){
+               LOG_ERROR("There are no enabled taps?");
+               return ERROR_JTAG_INIT_FAILED;
        }
 
        jtag_add_tlr();
@@ -1794,53 +2235,102 @@ int handle_interface_command(struct command_context_s *cmd_ctx, char *cmd, char
 
 int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       jtag_device_t **last_device_p = &jtag_devices;
-
-       if (*last_device_p)
-       {
-               while ((*last_device_p)->next)
-                       last_device_p = &((*last_device_p)->next);
-               last_device_p = &((*last_device_p)->next);
-       }
-
-       if (argc < 3)
+       int e;
+       char buf[1024];
+       Jim_Obj *newargs[ 10 ];
+       //
+       // CONVERT SYNTAX
+       //
+       //   argv[-1] = command
+       //   argv[ 0] = ir length
+       //   argv[ 1] = ir capture
+       //   argv[ 2] = ir mask
+       //   argv[ 3] = not actually used by anything but in the docs
+
+       if( argc < 4 ){
+               command_print( cmd_ctx, "OLD DEPRECATED SYNTAX: Please use the NEW syntax");
                return ERROR_OK;
-
-       *last_device_p = malloc(sizeof(jtag_device_t));
-       (*last_device_p)->ir_length = strtoul(args[0], NULL, 0);
-
-       (*last_device_p)->expected = malloc((*last_device_p)->ir_length);
-       buf_set_u32((*last_device_p)->expected, 0, (*last_device_p)->ir_length, strtoul(args[1], NULL, 0));
-       (*last_device_p)->expected_mask = malloc((*last_device_p)->ir_length);
-       buf_set_u32((*last_device_p)->expected_mask, 0, (*last_device_p)->ir_length, strtoul(args[2], NULL, 0));
-
-       (*last_device_p)->cur_instr = malloc((*last_device_p)->ir_length);
-       (*last_device_p)->bypass = 1;
-       buf_set_ones((*last_device_p)->cur_instr, (*last_device_p)->ir_length);
-
-       (*last_device_p)->next = NULL;
-
-       jtag_register_event_callback(jtag_reset_callback, (*last_device_p));
-
-       jtag_num_devices++;
-
-       return ERROR_OK;
+       }
+       command_print( cmd_ctx, "OLD SYNTAX: DEPRECATED - translating to new syntax");
+       command_print( cmd_ctx, "jtag newtap CHIP TAP -irlen %s -ircapture %s -irvalue %s",
+                                  args[0],
+                                  args[1],
+                                  args[2] );
+       command_print( cmd_ctx, "Example: STM32 has 2 taps, the cortexM3(len4) + boundryscan(len5)");
+       command_print( cmd_ctx, "jtag newtap stm32 cortexm3  ....., thus creating the tap: \"stm32.cortexm3\"");
+       command_print( cmd_ctx, "jtag newtap stm32 boundry  ....., and the tap: \"stm32.boundery\"");
+       command_print( cmd_ctx, "And then refer to the taps by the dotted name.");
+
+
+
+       newargs[0] = Jim_NewStringObj( interp, "jtag", -1   );
+       newargs[1] = Jim_NewStringObj( interp, "newtap", -1 );
+       sprintf( buf, "chip%d", jtag_NumTotalTaps() );
+       newargs[2] = Jim_NewStringObj( interp, buf, -1 );
+       sprintf( buf, "tap%d", jtag_NumTotalTaps() );
+       newargs[3] = Jim_NewStringObj( interp, buf, -1  );
+       newargs[4] = Jim_NewStringObj( interp, "-irlen", -1  );
+       newargs[5] = Jim_NewStringObj( interp, args[0], -1  );
+       newargs[6] = Jim_NewStringObj( interp, "-ircapture", -1  );
+       newargs[7] = Jim_NewStringObj( interp, args[1], -1  );
+       newargs[8] = Jim_NewStringObj( interp, "-irmask", -1  );
+       newargs[9] = Jim_NewStringObj( interp, args[2], -1  );
+
+       command_print( cmd_ctx, "NEW COMMAND:");
+       sprintf( buf, "%s %s %s %s %s %s %s %s %s %s",
+                        Jim_GetString( newargs[0], NULL ),
+                        Jim_GetString( newargs[1], NULL ),
+                        Jim_GetString( newargs[2], NULL ),
+                        Jim_GetString( newargs[3], NULL ),
+                        Jim_GetString( newargs[4], NULL ),
+                        Jim_GetString( newargs[5], NULL ),
+                        Jim_GetString( newargs[6], NULL ),
+                        Jim_GetString( newargs[7], NULL ),
+                        Jim_GetString( newargs[8], NULL ),
+                        Jim_GetString( newargs[9], NULL ) );
+
+
+
+       e = jim_jtag_command( interp, 10, newargs );
+       if( e != JIM_OK ){
+               command_print( cmd_ctx, "%s", Jim_GetString( Jim_GetResult(interp), NULL ) );
+       }
+       return e;
 }
 
+
 int handle_scan_chain_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       jtag_device_t *device = jtag_devices;
-       int device_count = 0;
+       jtag_tap_t *tap;
+
+       tap = jtag_all_taps;
+       command_print(cmd_ctx, "     TapName            | Enabled |   IdCode      Expected    IrLen IrCap  IrMask Instr     ");
+       command_print(cmd_ctx, "---|--------------------|---------|------------|------------|------|------|------|---------");
+
+       while( tap ){
+               u32 expected, expected_mask, cur_instr, ii;
+               expected = buf_get_u32(tap->expected, 0, tap->ir_length);
+               expected_mask = buf_get_u32(tap->expected_mask, 0, tap->ir_length);
+               cur_instr = buf_get_u32(tap->cur_instr, 0, tap->ir_length);
+
+               command_print(cmd_ctx,
+                                         "%2d | %-18s |    %c    | 0x%08x | 0x%08x | 0x%02x | 0x%02x | 0x%02x | 0x%02x",
+                                         tap->abs_chain_position,
+                                         tap->dotted_name,
+                                         tap->enabled ? 'Y' : 'n',
+                                         tap->idcode,
+                                         (tap->expected_ids_cnt > 0 ? tap->expected_ids[0] : 0),
+                                         tap->ir_length,
+                                         expected,
+                                         expected_mask,
+                                         cur_instr);
+
+               for (ii = 1; ii < tap->expected_ids_cnt; ii++) {
+                       command_print(cmd_ctx, "   |                    |         |            | 0x%08x |      |      |      |         ",
+                                                 tap->expected_ids[ii]);
+               }
 
-       while (device)
-       {
-               u32 expected, expected_mask, cur_instr;
-               expected = buf_get_u32(device->expected, 0, device->ir_length);
-               expected_mask = buf_get_u32(device->expected_mask, 0, device->ir_length);
-               cur_instr = buf_get_u32(device->cur_instr, 0, device->ir_length);
-               command_print(cmd_ctx, "%i: idcode: 0x%8.8x ir length %i, ir capture 0x%x, ir mask 0x%x, current instruction 0x%x", device_count, device->idcode, device->ir_length, expected, expected_mask, cur_instr);
-               device = device->next;
-               device_count++;
+               tap = tap->next_tap;
        }
 
        return ERROR_OK;
@@ -1863,7 +2353,7 @@ int handle_reset_config_command(struct command_context_s *cmd_ctx, char *cmd, ch
                        jtag_reset_config = RESET_TRST_AND_SRST;
                else
                {
-                       LOG_ERROR("invalid reset_config argument, defaulting to none");
+                       LOG_ERROR("(1) invalid reset_config argument (%s), defaulting to none", args[0]);
                        jtag_reset_config = RESET_NONE;
                        return ERROR_INVALID_ARGUMENTS;
                }
@@ -1884,7 +2374,7 @@ int handle_reset_config_command(struct command_context_s *cmd_ctx, char *cmd, ch
                                jtag_reset_config |= RESET_SRST_PULLS_TRST | RESET_TRST_PULLS_SRST;
                        else
                        {
-                               LOG_ERROR("invalid reset_config argument, defaulting to none");
+                               LOG_ERROR("(2) invalid reset_config argument (%s), defaulting to none", args[1]);
                                jtag_reset_config = RESET_NONE;
                                return ERROR_INVALID_ARGUMENTS;
                        }
@@ -1899,7 +2389,7 @@ int handle_reset_config_command(struct command_context_s *cmd_ctx, char *cmd, ch
                        jtag_reset_config &= ~RESET_TRST_OPEN_DRAIN;
                else
                {
-                       LOG_ERROR("invalid reset_config argument, defaulting to none");
+                       LOG_ERROR("(3) invalid reset_config argument (%s) defaulting to none", args[2] );
                        jtag_reset_config = RESET_NONE;
                        return ERROR_INVALID_ARGUMENTS;
                }
@@ -1913,7 +2403,7 @@ int handle_reset_config_command(struct command_context_s *cmd_ctx, char *cmd, ch
                        jtag_reset_config &= ~RESET_SRST_PUSH_PULL;
                else
                {
-                       LOG_ERROR("invalid reset_config argument, defaulting to none");
+                       LOG_ERROR("(4) invalid reset_config argument (%s), defaulting to none", args[3]);
                        jtag_reset_config = RESET_NONE;
                        return ERROR_INVALID_ARGUMENTS;
                }
@@ -2109,6 +2599,7 @@ int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, char **a
 {
        int i;
        scan_field_t *fields;
+       jtag_tap_t *tap;
 
        if ((argc < 2) || (argc % 2))
        {
@@ -2119,9 +2610,14 @@ int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, char **a
 
        for (i = 0; i < argc / 2; i++)
        {
-               int device = strtoul(args[i*2], NULL, 0);
-               int field_size = jtag_get_device(device)->ir_length;
-               fields[i].device = device;
+               tap = jtag_TapByString( args[i*2] );
+               if (tap==NULL)
+               {
+                       command_print( cmd_ctx, "Tap: %s unknown", args[i*2] );
+                       return ERROR_FAIL;
+               }
+               int field_size = tap->ir_length;
+               fields[i].tap = tap;
                fields[i].out_value = malloc(CEIL(field_size, 8));
                buf_set_u32(fields[i].out_value, 0, field_size, strtoul(args[i*2+1], NULL, 0));
                fields[i].out_mask = NULL;
@@ -2149,7 +2645,7 @@ int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args)
        int num_fields;
        int field_count = 0;
        int i, e;
-       long device;
+       jtag_tap_t *tap;
 
        /* args[1] = device
         * args[2] = num_bits
@@ -2171,9 +2667,10 @@ int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args)
                        return e;
        }
 
-       e = Jim_GetLong(interp, args[1], &device);
-       if (e != JIM_OK)
-               return e;
+       tap = jtag_TapByJimObj( interp, args[1] );
+       if( tap == NULL ){
+               return JIM_ERR;
+       }
 
        num_fields=(argc-2)/2;
        fields = malloc(sizeof(scan_field_t) * num_fields);
@@ -2186,7 +2683,8 @@ int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args)
                Jim_GetLong(interp, args[i], &bits);
                str = Jim_GetString(args[i+1], &len);
 
-               fields[field_count].device = device;
+
+               fields[field_count].tap = tap;
                fields[field_count].num_bits = bits;
                fields[field_count].out_value = malloc(CEIL(bits, 8));
                str_to_buf(str, len, fields[field_count].out_value, bits, 0);
@@ -2202,8 +2700,7 @@ int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args)
        retval = jtag_execute_queue();
        if (retval != ERROR_OK)
        {
-               Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
-               Jim_AppendStrings(interp, Jim_GetResult(interp), "drscan: jtag execute failed", NULL);
+               Jim_SetResultString(interp, "drscan: jtag execute failed",-1);
                return JIM_ERR;
        }
 
@@ -2265,3 +2762,4 @@ int jtag_srst_asserted(int *srst_asserted)
 {
        return jtag->srst_asserted(srst_asserted);
 }
+