diff options
| author | Freddie Chopin <freddie_chopin@op.pl> | 2010-06-17 20:24:46 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-17 21:09:43 +0200 |
| commit | 647fe050db9ea709f7624c7330c1315251eb9114 (patch) | |
| tree | 1d2ecb137d313c7527924e1823fbd54e7e6886ae /src | |
| parent | b1cd202f9ad8c95a70548d946ca3073553a340cf (diff) | |
| download | openocd+libswd-647fe050db9ea709f7624c7330c1315251eb9114.tar.gz openocd+libswd-647fe050db9ea709f7624c7330c1315251eb9114.tar.bz2 openocd+libswd-647fe050db9ea709f7624c7330c1315251eb9114.tar.xz openocd+libswd-647fe050db9ea709f7624c7330c1315251eb9114.zip | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jtag/drivers/rlink.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/jtag/drivers/rlink.c b/src/jtag/drivers/rlink.c index 0060baff..2905bf26 100644 --- a/src/jtag/drivers/rlink.c +++ b/src/jtag/drivers/rlink.c @@ -110,7 +110,7 @@ static usb_dev_handle *pHDev; static int ep1_generic_commandl( - usb_dev_handle *pHDev, + usb_dev_handle *pHDev_param, size_t length, ... ) { @@ -138,7 +138,7 @@ ep1_generic_commandl( ); usb_ret = usb_bulk_write( - pHDev, + pHDev_param, USB_EP1OUT_ADDR, (char *)usb_buffer, sizeof(usb_buffer), USB_TIMEOUT_MS @@ -219,7 +219,7 @@ ep1_memory_read( static ssize_t ep1_memory_write( - usb_dev_handle *pHDev, + usb_dev_handle *pHDev_param, uint16_t addr, size_t length, uint8_t const *buffer @@ -256,7 +256,7 @@ ep1_memory_write( ); usb_ret = usb_bulk_write( - pHDev, USB_EP1OUT_ADDR, + pHDev_param, USB_EP1OUT_ADDR, (char *)usb_buffer, sizeof(usb_buffer), USB_TIMEOUT_MS ); @@ -324,7 +324,7 @@ static uint8_t dtc_entry_download; static int dtc_load_from_buffer( - usb_dev_handle *pHDev, + usb_dev_handle *pHDev_param, const uint8_t *buffer, size_t length ) { @@ -341,7 +341,7 @@ dtc_load_from_buffer( /* Stop the DTC before loading anything. */ usb_err = ep1_generic_commandl( - pHDev, 1, + pHDev_param, 1, EP1_CMD_DTC_STOP ); if (usb_err < 0) return(usb_err); @@ -375,7 +375,7 @@ dtc_load_from_buffer( case DTCLOAD_LOAD: /* Send the DTC program to ST7 RAM. */ usb_err = ep1_memory_write( - pHDev, + pHDev_param, DTC_LOAD_BUFFER, header->length + 1, buffer ); @@ -383,7 +383,7 @@ dtc_load_from_buffer( /* Load it into the DTC. */ usb_err = ep1_generic_commandl( - pHDev, 3, + pHDev_param, 3, EP1_CMD_DTC_LOAD, (DTC_LOAD_BUFFER >> 8), DTC_LOAD_BUFFER @@ -394,7 +394,7 @@ dtc_load_from_buffer( case DTCLOAD_RUN: usb_err = ep1_generic_commandl( - pHDev, 3, + pHDev_param, 3, EP1_CMD_DTC_CALL, buffer[0], EP1_CMD_DTC_WAIT @@ -409,7 +409,7 @@ dtc_load_from_buffer( case DTCLOAD_LUT: usb_err = ep1_memory_write( - pHDev, + pHDev_param, ST7_USB_BUF_EP0OUT + lut_start, header->length + 1, buffer ); @@ -494,7 +494,7 @@ dtc_start_download(void) { static int dtc_run_download( - usb_dev_handle *pHDev, + usb_dev_handle *pHDev_param, uint8_t *command_buffer, int command_buffer_size, uint8_t *reply_buffer, @@ -507,7 +507,7 @@ dtc_run_download( LOG_DEBUG(": %d/%d\n", command_buffer_size, reply_buffer_size); usb_err = usb_bulk_write( - pHDev, + pHDev_param, USB_EP2OUT_ADDR, (char *)command_buffer, USB_EP2BANK_SIZE, USB_TIMEOUT_MS @@ -518,7 +518,7 @@ dtc_run_download( /* Wait for DTC to finish running command buffer */ for (i = 10;;) { usb_err = ep1_generic_commandl( - pHDev, 4, + pHDev_param, 4, EP1_CMD_MEMORY_READ, DTC_STATUS_POLL_BYTE >> 8, @@ -528,7 +528,7 @@ dtc_run_download( if (usb_err < 0) return(usb_err); usb_err = usb_bulk_read( - pHDev, + pHDev_param, USB_EP1IN_ADDR, (char *)ep2_buffer, 1, USB_TIMEOUT_MS @@ -549,7 +549,7 @@ dtc_run_download( if (!reply_buffer) reply_buffer_size = 0; if (reply_buffer_size) { usb_err = usb_bulk_read( - pHDev, + pHDev_param, USB_EP2IN_ADDR, (char *)ep2_buffer, sizeof(ep2_buffer), USB_TIMEOUT_MS |