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

rlink: -Wshadows fixes 

(error: declaration of ‘pHDev’ shadows a global declaration; ../../../../src/jtag/drivers/rlink.c:102: error: shadowed declaration is here)

Signed-off-by: Freddie Chopin <freddie_chopin@op.pl>
This commit is contained in:
Freddie Chopin 2010-06-17 20:24:46 +02:00 committed by Øyvind Harboe
parent b1cd202f9a
commit 647fe050db
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/jtag/drivers/rlink.c
View File

@ -110,7 +110,7 @@ static usb_dev_handle *pHDev;
static static
int int
ep1_generic_commandl( ep1_generic_commandl(
usb_dev_handle *pHDev, usb_dev_handle *pHDev_param,
size_t length, size_t length,
... ...
) { ) {
@ -138,7 +138,7 @@ ep1_generic_commandl(
); );
usb_ret = usb_bulk_write( usb_ret = usb_bulk_write(
pHDev, pHDev_param,
USB_EP1OUT_ADDR, USB_EP1OUT_ADDR,
(char *)usb_buffer, sizeof(usb_buffer), (char *)usb_buffer, sizeof(usb_buffer),
USB_TIMEOUT_MS USB_TIMEOUT_MS
@ -219,7 +219,7 @@ ep1_memory_read(
static static
ssize_t ssize_t
ep1_memory_write( ep1_memory_write(
usb_dev_handle *pHDev, usb_dev_handle *pHDev_param,
uint16_t addr, uint16_t addr,
size_t length, size_t length,
uint8_t const *buffer uint8_t const *buffer
@ -256,7 +256,7 @@ ep1_memory_write(
); );
usb_ret = usb_bulk_write( usb_ret = usb_bulk_write(
pHDev, USB_EP1OUT_ADDR, pHDev_param, USB_EP1OUT_ADDR,
(char *)usb_buffer, sizeof(usb_buffer), (char *)usb_buffer, sizeof(usb_buffer),
USB_TIMEOUT_MS USB_TIMEOUT_MS
); );
@ -324,7 +324,7 @@ static uint8_t dtc_entry_download;
static static
int int
dtc_load_from_buffer( dtc_load_from_buffer(
usb_dev_handle *pHDev, usb_dev_handle *pHDev_param,
const uint8_t *buffer, const uint8_t *buffer,
size_t length size_t length
) { ) {
@ -341,7 +341,7 @@ dtc_load_from_buffer(
/* Stop the DTC before loading anything. */ /* Stop the DTC before loading anything. */
usb_err = ep1_generic_commandl( usb_err = ep1_generic_commandl(
pHDev, 1, pHDev_param, 1,
EP1_CMD_DTC_STOP EP1_CMD_DTC_STOP
); );
if (usb_err < 0) return(usb_err); if (usb_err < 0) return(usb_err);
@ -375,7 +375,7 @@ dtc_load_from_buffer(
case DTCLOAD_LOAD: case DTCLOAD_LOAD:
/* Send the DTC program to ST7 RAM. */ /* Send the DTC program to ST7 RAM. */
usb_err = ep1_memory_write( usb_err = ep1_memory_write(
pHDev, pHDev_param,
DTC_LOAD_BUFFER, DTC_LOAD_BUFFER,
header->length + 1, buffer header->length + 1, buffer
); );
@ -383,7 +383,7 @@ dtc_load_from_buffer(
/* Load it into the DTC. */ /* Load it into the DTC. */
usb_err = ep1_generic_commandl( usb_err = ep1_generic_commandl(
pHDev, 3, pHDev_param, 3,
EP1_CMD_DTC_LOAD, EP1_CMD_DTC_LOAD,
(DTC_LOAD_BUFFER >> 8), (DTC_LOAD_BUFFER >> 8),
DTC_LOAD_BUFFER DTC_LOAD_BUFFER
@ -394,7 +394,7 @@ dtc_load_from_buffer(
case DTCLOAD_RUN: case DTCLOAD_RUN:
usb_err = ep1_generic_commandl( usb_err = ep1_generic_commandl(
pHDev, 3, pHDev_param, 3,
EP1_CMD_DTC_CALL, EP1_CMD_DTC_CALL,
buffer[0], buffer[0],
EP1_CMD_DTC_WAIT EP1_CMD_DTC_WAIT
@ -409,7 +409,7 @@ dtc_load_from_buffer(
case DTCLOAD_LUT: case DTCLOAD_LUT:
usb_err = ep1_memory_write( usb_err = ep1_memory_write(
pHDev, pHDev_param,
ST7_USB_BUF_EP0OUT + lut_start, ST7_USB_BUF_EP0OUT + lut_start,
header->length + 1, buffer header->length + 1, buffer
); );
@ -494,7 +494,7 @@ dtc_start_download(void) {
static static
int int
dtc_run_download( dtc_run_download(
usb_dev_handle *pHDev, usb_dev_handle *pHDev_param,
uint8_t *command_buffer, uint8_t *command_buffer,
int command_buffer_size, int command_buffer_size,
uint8_t *reply_buffer, uint8_t *reply_buffer,
@ -507,7 +507,7 @@ dtc_run_download(
LOG_DEBUG(": %d/%d\n", command_buffer_size, reply_buffer_size); LOG_DEBUG(": %d/%d\n", command_buffer_size, reply_buffer_size);
usb_err = usb_bulk_write( usb_err = usb_bulk_write(
pHDev, pHDev_param,
USB_EP2OUT_ADDR, USB_EP2OUT_ADDR,
(char *)command_buffer, USB_EP2BANK_SIZE, (char *)command_buffer, USB_EP2BANK_SIZE,
USB_TIMEOUT_MS USB_TIMEOUT_MS
@ -518,7 +518,7 @@ dtc_run_download(
/* Wait for DTC to finish running command buffer */ /* Wait for DTC to finish running command buffer */
for (i = 10;;) { for (i = 10;;) {
usb_err = ep1_generic_commandl( usb_err = ep1_generic_commandl(
pHDev, 4, pHDev_param, 4,
EP1_CMD_MEMORY_READ, EP1_CMD_MEMORY_READ,
DTC_STATUS_POLL_BYTE >> 8, DTC_STATUS_POLL_BYTE >> 8,
@ -528,7 +528,7 @@ dtc_run_download(
if (usb_err < 0) return(usb_err); if (usb_err < 0) return(usb_err);
usb_err = usb_bulk_read( usb_err = usb_bulk_read(
pHDev, pHDev_param,
USB_EP1IN_ADDR, USB_EP1IN_ADDR,
(char *)ep2_buffer, 1, (char *)ep2_buffer, 1,
USB_TIMEOUT_MS USB_TIMEOUT_MS
@ -549,7 +549,7 @@ dtc_run_download(
if (!reply_buffer) reply_buffer_size = 0; if (!reply_buffer) reply_buffer_size = 0;
if (reply_buffer_size) { if (reply_buffer_size) {
usb_err = usb_bulk_read( usb_err = usb_bulk_read(
pHDev, pHDev_param,
USB_EP2IN_ADDR, USB_EP2IN_ADDR,
(char *)ep2_buffer, sizeof(ep2_buffer), (char *)ep2_buffer, sizeof(ep2_buffer),
USB_TIMEOUT_MS USB_TIMEOUT_MS