diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-11-19 08:22:47 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-11-19 08:22:47 +0000 |
| commit | e3462b228ce9533b6e7989361f9c4090043a8aa4 (patch) | |
| tree | f482d79463d1cf52eef9a2f934fea29261b06b70 /src/jtag/zy1000.c | |
| parent | cb434c21af5066899c5013a3a3490471f91d4b43 (diff) | |
| download | openocd_libswd-e3462b228ce9533b6e7989361f9c4090043a8aa4.tar.gz openocd_libswd-e3462b228ce9533b6e7989361f9c4090043a8aa4.tar.bz2 openocd_libswd-e3462b228ce9533b6e7989361f9c4090043a8aa4.tar.xz openocd_libswd-e3462b228ce9533b6e7989361f9c4090043a8aa4.zip | |
jtag_get_device() now returns NULL and reports error instead of invoking exit()
git-svn-id: svn://svn.berlios.de/openocd/trunk@1176 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag/zy1000.c')
| -rw-r--r-- | src/jtag/zy1000.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/jtag/zy1000.c b/src/jtag/zy1000.c index a50ed529..5ec1d8ad 100644 --- a/src/jtag/zy1000.c +++ b/src/jtag/zy1000.c @@ -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; } } |