auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jtag_get_device() now returns NULL and reports error instead of invoking exit()

Browse Source 
git-svn-id: svn://svn.berlios.de/openocd/trunk@1176 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe
2008-11-19 08:22:47 +00:00
parent cb434c21af
commit e3462b228c
11 changed files with 394 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/jtag/zy1000.c
View File

@@ -501,6 +501,11 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_st
int pause=i==(jtag_num_devices-1);
int found = 0;
device = jtag_get_device(i);
if (device==NULL)
{
return ERROR_FAIL;
}
scan_size = device->ir_length;
/* search the list */
@@ -521,7 +526,7 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_st
scanFields(1, fields+j, TAP_SI, pause);
/* update device information */
buf_cpy(fields[j].out_value, jtag_get_device(i)->cur_instr, scan_size);
buf_cpy(fields[j].out_value, device->cur_instr, scan_size);
device->bypass = 0;
break;
@@ -539,7 +544,7 @@ int interface_jtag_add_ir_scan(int num_fields, scan_field_t *fields, enum tap_st
tmp.num_bits = scan_size;
scanFields(1, &tmp, TAP_SI, pause);
/* update device information */
buf_cpy(tmp.out_value, jtag_get_device(i)->cur_instr, scan_size);
buf_cpy(tmp.out_value, device->cur_instr, scan_size);
device->bypass = 1;
}
}