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/target/etb.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/target/etb.c')
| -rw-r--r-- | src/target/etb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/target/etb.c b/src/target/etb.c index af474e84..05d970d5 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -63,6 +63,8 @@ int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char int etb_set_instr(etb_t *etb, u32 new_instr) { jtag_device_t *device = jtag_get_device(etb->chain_pos); + if (device==NULL) + return ERROR_FAIL; if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr) { @@ -440,7 +442,6 @@ int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cmd, char if (!jtag_device) { - LOG_ERROR("jtag device number '%s' not defined", args[1]); return ERROR_FAIL; } |