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

target: LS1_SAP: fix "declaration of 'read' shadows a global" warning 

Change-Id: I7070193819cc134f9fe1427c20a11160ec415ccb
Reported-by: Jens Bauer <jens-lists@gpio.dk>
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-on: http://openocd.zylin.com/3877
Tested-by: jenkins
This commit is contained in:
Paul Fertser 2016-11-13 15:02:55 +03:00
parent 50e2253ab9
commit 702b150a6b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/target/ls1_sap.c
View File

@ -127,7 +127,7 @@ static void ls1_sap_set_addr_high(struct jtag_tap *tap, uint16_t addr_high)
} }
static void ls1_sap_memory_cmd(struct jtag_tap *tap, uint32_t address, static void ls1_sap_memory_cmd(struct jtag_tap *tap, uint32_t address,
int32_t size, int read) int32_t size, bool rnw)
{ {
struct scan_field field; struct scan_field field;
uint8_t cmd[8]; uint8_t cmd[8];
@ -138,7 +138,7 @@ static void ls1_sap_memory_cmd(struct jtag_tap *tap, uint32_t address,
field.out_value = cmd; field.out_value = cmd;
buf_set_u64(cmd, 0, 9, 0); buf_set_u64(cmd, 0, 9, 0);
buf_set_u64(cmd, 9, 3, size); buf_set_u64(cmd, 9, 3, size);
buf_set_u64(cmd, 12, 1, !!read); buf_set_u64(cmd, 12, 1, rnw);
buf_set_u64(cmd, 13, 3, 0); buf_set_u64(cmd, 13, 3, 0);
buf_set_u64(cmd, 16, 32, address); buf_set_u64(cmd, 16, 32, address);
buf_set_u64(cmd, 48, 16, 0); buf_set_u64(cmd, 48, 16, 0);
@ -190,7 +190,7 @@ static int ls1_sap_read_memory(struct target *target, uint32_t address,
ls1_sap_set_addr_high(target->tap, 0); ls1_sap_set_addr_high(target->tap, 0);
while (count--) { while (count--) {
ls1_sap_memory_cmd(target->tap, address, size, 1); ls1_sap_memory_cmd(target->tap, address, size, true);
ls1_sap_memory_read(target->tap, size, buffer); ls1_sap_memory_read(target->tap, size, buffer);
address += size; address += size;
buffer += size; buffer += size;
@ -213,7 +213,7 @@ static int ls1_sap_write_memory(struct target *target, uint32_t address,
ls1_sap_set_addr_high(target->tap, 0); ls1_sap_set_addr_high(target->tap, 0);
while (count--) { while (count--) {
ls1_sap_memory_cmd(target->tap, address, size, 0); ls1_sap_memory_cmd(target->tap, address, size, false);
ls1_sap_memory_write(target->tap, size, buffer); ls1_sap_memory_write(target->tap, size, buffer);
address += size; address += size;
buffer += size; buffer += size;