Menu
▾
▴
[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-350-gada8f59
|
From: Øyvind H. <go...@us...> - 2010-06-17 21:11:16
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".
The branch, master has been updated
via ada8f5963d0263d9e839c371641fdb4dd611f436 (commit)
via 3eaab9b55b92a4b52e0a31b9c06da8a904a1dddb (commit)
via 647fe050db9ea709f7624c7330c1315251eb9114 (commit)
via b1cd202f9ad8c95a70548d946ca3073553a340cf (commit)
from f2f798fdd3a4c6d221569ba278945385c2f47504 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ada8f5963d0263d9e839c371641fdb4dd611f436
Author: Freddie Chopin <fre...@op...>
Date: Thu Jun 17 20:30:23 2010 +0200
mingw32: -Wshadow fixes in arm-jtag-ew.c
(error: declaration of âstatâ shadows a global declaration; /usr/local/lib/gcc/i686-w64-mingw32/4.4.2/../../../../i686-w64-mingw32/include/sys/stat.h:279: error: shadowed declaration is here)
Signed-off-by: Freddie Chopin <fre...@op...>
diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index 9d8b8b1..7a6c178 100644
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -659,11 +659,11 @@ static int armjtagew_tap_execute(void)
if (result == 0)
{
- int stat;
+ int stat_local;
- stat = (int)buf_get_u32(usb_in_buffer + byte_length, 0, 32);
- if (stat) {
- LOG_ERROR("armjtagew_tap_execute, emulator returned error code %d for a CMD_TAP_SHIFT command", stat);
+ stat_local = (int)buf_get_u32(usb_in_buffer + byte_length, 0, 32);
+ if (stat_local) {
+ LOG_ERROR("armjtagew_tap_execute, emulator returned error code %d for a CMD_TAP_SHIFT command", stat_local);
return ERROR_JTAG_QUEUE_FAILED;
}
commit 3eaab9b55b92a4b52e0a31b9c06da8a904a1dddb
Author: Freddie Chopin <fre...@op...>
Date: Thu Jun 17 20:26:48 2010 +0200
mingw32: -Wshadow fixes in rlink.c
(error: declaration of âbyteâ shadows a global declaration; /usr/local/lib/gcc/i686-w64-mingw32/4.4.2/../../../../i686-w64-mingw32/include/rpcndr.h:50: error: shadowed declaration is here)
Signed-off-by: Freddie Chopin <fre...@op...>
diff --git a/src/jtag/drivers/rlink.c b/src/jtag/drivers/rlink.c
index 2905bf2..dde117b 100644
--- a/src/jtag/drivers/rlink.c
+++ b/src/jtag/drivers/rlink.c
@@ -824,21 +824,21 @@ int
tap_state_queue_run(void) {
int i;
int bits;
- uint8_t byte;
+ uint8_t byte_param;
int retval;
retval = 0;
if (!tap_state_queue.length) return(retval);
bits = 1;
- byte = 0;
+ byte_param = 0;
for (i = tap_state_queue.length; i--;) {
- byte <<= 1;
+ byte_param <<= 1;
if (tap_state_queue.buffer & 1) {
- byte |= 1;
+ byte_param |= 1;
}
if ((bits >= 8) || !i) {
- byte <<= (8 - bits);
+ byte_param <<= (8 - bits);
/* make sure there's room for stop, byte op, and one byte */
if (dtc_queue.cmd_index >= (sizeof(dtc_queue.cmd_buffer) - (1 + 1 + 1))) {
@@ -860,9 +860,9 @@ tap_state_queue_run(void) {
#endif
dtc_queue.cmd_buffer[dtc_queue.cmd_index++] =
- byte;
+ byte_param;
- byte = 0;
+ byte_param = 0;
bits = 1;
} else {
bits++;
commit 647fe050db9ea709f7624c7330c1315251eb9114
Author: Freddie Chopin <fre...@op...>
Date: Thu Jun 17 20:24:46 2010 +0200
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 <fre...@op...>
diff --git a/src/jtag/drivers/rlink.c b/src/jtag/drivers/rlink.c
index 0060baf..2905bf2 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
commit b1cd202f9ad8c95a70548d946ca3073553a340cf
Author: Freddie Chopin <fre...@op...>
Date: Thu Jun 17 20:06:28 2010 +0200
mingw32: -Wshadow fixes
in jim.c (error: declaration of âbooleanâ shadows a global declaration; /usr/local/lib/gcc/i686-w64-mingw32/4.4.2/../../../../i686-w64-mingw32/include/rpcndr.h:52: error: shadowed declaration is here)
Signed-off-by: Freddie Chopin <fre...@op...>
diff --git a/src/helper/jim.c b/src/helper/jim.c
index 8538954..e9a6ec5 100644
--- a/src/helper/jim.c
+++ b/src/helper/jim.c
@@ -9942,12 +9942,12 @@ noopt:
/* The general purpose implementation of while starts here */
while (1) {
- int boolean, retval;
+ int local_boolean, retval;
if ((retval = Jim_GetBoolFromExpr(interp, argv[1],
- &boolean)) != JIM_OK)
+ &local_boolean)) != JIM_OK)
return retval;
- if (!boolean) break;
+ if (!local_boolean) break;
if ((retval = Jim_EvalObj(interp, argv[2])) != JIM_OK) {
switch (retval) {
case JIM_BREAK:
@@ -10146,13 +10146,13 @@ evalstart:
if ((retval = Jim_EvalObj(interp, argv[1])) != JIM_OK)
return retval;
while (1) {
- int boolean;
+ int local_boolean;
testcond:
/* Test the condition */
- if ((retval = Jim_GetBoolFromExpr(interp, argv[2], &boolean))
+ if ((retval = Jim_GetBoolFromExpr(interp, argv[2], &local_boolean))
!= JIM_OK)
return retval;
- if (!boolean) break;
+ if (!local_boolean) break;
/* Eval body */
if ((retval = Jim_EvalObj(interp, argv[4])) != JIM_OK) {
switch (retval) {
@@ -10297,13 +10297,13 @@ static int Jim_LmapCoreCommand(Jim_Interp *interp, int argc,
static int Jim_IfCoreCommand(Jim_Interp *interp, int argc,
Jim_Obj *const *argv)
{
- int boolean, retval, current = 1, falsebody = 0;
+ int local_boolean, retval, current = 1, falsebody = 0;
if (argc >= 3) {
while (1) {
/* Far not enough arguments given! */
if (current >= argc) goto err;
if ((retval = Jim_GetBoolFromExpr(interp,
- argv[current++], &boolean))
+ argv[current++], &local_boolean))
!= JIM_OK)
return retval;
/* There lacks something, isn't it? */
@@ -10312,7 +10312,7 @@ static int Jim_IfCoreCommand(Jim_Interp *interp, int argc,
"then")) current++;
/* Tsk tsk, no then-clause? */
if (current >= argc) goto err;
- if (boolean)
+ if (local_boolean)
return Jim_EvalObj(interp, argv[current]);
/* Ok: no else-clause follows */
if (++current >= argc) {
-----------------------------------------------------------------------
Summary of changes:
src/helper/jim.c | 18 ++++++++--------
src/jtag/drivers/arm-jtag-ew.c | 8 +++---
src/jtag/drivers/rlink.c | 44 ++++++++++++++++++++--------------------
3 files changed, 35 insertions(+), 35 deletions(-)
hooks/post-receive
--
Main OpenOCD repository
|
