interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

target: hla: check return value of hl_dcc_read 

This should fix "Assigned value is garbage or undefined" warning
reported by clang:
http://build.openocd.org/job/openocd-clang/doclinks/1/report-391318.html

Change-Id: Ib9488fadca871814328501e415f88822291e0c96
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/4332
Tested-by: jenkins
This commit is contained in:
Paul Fertser 2018-01-13 17:15:29 +03:00
parent a957a1c843
commit 6e76e56e2e
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/target/hla_target.c
View File

@ -271,7 +271,10 @@ static int hl_target_request_data(struct target *target,
uint32_t i; uint32_t i;
for (i = 0; i < (size * 4); i++) { for (i = 0; i < (size * 4); i++) {
hl_dcc_read(hl_if, &data, &ctrl); int err = hl_dcc_read(hl_if, &data, &ctrl);
if (err != ERROR_OK)
return err;
buffer[i] = data; buffer[i] = data;
} }
@ -281,6 +284,8 @@ static int hl_target_request_data(struct target *target,
static int hl_handle_target_request(void *priv) static int hl_handle_target_request(void *priv)
{ {
struct target *target = priv; struct target *target = priv;
int err;
if (!target_was_examined(target)) if (!target_was_examined(target))
return ERROR_OK; return ERROR_OK;
struct hl_interface_s *hl_if = target_to_adapter(target); struct hl_interface_s *hl_if = target_to_adapter(target);
@ -292,7 +297,9 @@ static int hl_handle_target_request(void *priv)
uint8_t data; uint8_t data;
uint8_t ctrl; uint8_t ctrl;
hl_dcc_read(hl_if, &data, &ctrl); err = hl_dcc_read(hl_if, &data, &ctrl);
if (err != ERROR_OK)
return err;
/* check if we have data */ /* check if we have data */
if (ctrl & (1 << 0)) { if (ctrl & (1 << 0)) {
@ -300,11 +307,20 @@ static int hl_handle_target_request(void *priv)
/* we assume target is quick enough */ /* we assume target is quick enough */
request = data; request = data;
hl_dcc_read(hl_if, &data, &ctrl); err = hl_dcc_read(hl_if, &data, &ctrl);
if (err != ERROR_OK)
return err;
request |= (data << 8); request |= (data << 8);
hl_dcc_read(hl_if, &data, &ctrl); err = hl_dcc_read(hl_if, &data, &ctrl);
if (err != ERROR_OK)
return err;
request |= (data << 16); request |= (data << 16);
hl_dcc_read(hl_if, &data, &ctrl); err = hl_dcc_read(hl_if, &data, &ctrl);
if (err != ERROR_OK)
return err;
request |= (data << 24); request |= (data << 24);
target_request(target, request); target_request(target, request);
} }