Hi!
here are some more fixes without which OpenOCD fails to build. The fixes
are trivial.
I don't know if the files will be encoded right... I've created those
patches in Linux (OpenSUSE) with just "git format-patch origin"... There
is something very wrong with the "subject" lines of those patches... /;
4\/3!!
From d394caef93e4373581a3ebab10cd220ee865938a Mon Sep 17 00:00:00 2001
From: Freddie Chopin <freddie_cho...@op.pl>
Date: Thu, 17 Jun 2010 20:06:28 +0200
Subject: [PATCH 1/4]
=?UTF-8?q?mingw32=20-Wshadow=20fixes=20in=20jim.c=20(error:=20declaration=20of=20=E2=80=98boolean=E2=80=99=20shadows=20a=20global=20declaration;=20/usr/local/lib/gcc/i686-w64-mingw32/4.4.2/../../../../i686-w64-mingw32/include/rpcndr.h:52:=20error:=20shadowed=20declaration=20is=20here)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Freddie Chopin <freddie_cho...@op.pl>
---
src/helper/jim.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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) {
--
1.6.4.2
From 0c860d2e8fd25f6efebcba83ada3947b7011bffa Mon Sep 17 00:00:00 2001
From: Freddie Chopin <freddie_cho...@op.pl>
Date: Thu, 17 Jun 2010 20:24:46 +0200
Subject: [PATCH 2/4]
=?UTF-8?q?-Wshadows=20fixes=20for=20rlink.c=20(error:=20declaration=20of=20=E2=80=98pHDev=E2=80=99=20shadows=20a=20global=20declaration;=20../../../../src/jtag/drivers/rlink.c:102:=20error:=20shadowed=20declaration=20is=20here)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Freddie Chopin <freddie_cho...@op.pl>
---
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 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
--
1.6.4.2
From 05923eab11d1069b5efdd666d15665c150983b02 Mon Sep 17 00:00:00 2001
From: Freddie Chopin <freddie_cho...@op.pl>
Date: Thu, 17 Jun 2010 20:26:48 +0200
Subject: [PATCH 3/4]
=?UTF-8?q?mingw32=20-Wshadow=20fixes=20in=20rlink.c=20(error:=20declaration=20of=20=E2=80=98byte=E2=80=99=20shadows=20a=20global=20declaration;=20/usr/local/lib/gcc/i686-w64-mingw32/4.4.2/../../../../i686-w64-mingw32/include/rpcndr.h:50:=20error:=20shadowed=20declaration=20is=20here)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Freddie Chopin <freddie_cho...@op.pl>
---
src/jtag/drivers/rlink.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
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++;
--
1.6.4.2
From 4b6927ce5e1cb31666e3a438d3aa04d955c51660 Mon Sep 17 00:00:00 2001
From: Freddie Chopin <freddie_cho...@op.pl>
Date: Thu, 17 Jun 2010 20:30:23 +0200
Subject: [PATCH 4/4]
=?UTF-8?q?mingw32=20-Wshadow=20fixes=20in=20arm-jtag-ew.c=20(error:=20declaration=20of=20=E2=80=98stat=E2=80=99=20shadows=20a=20global=20declaration;=20/usr/local/lib/gcc/i686-w64-mingw32/4.4.2/../../../../i686-w64-mingw32/include/sys/stat.h:279:=20error:=20shadowed=20declaration=20is=20here)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Freddie Chopin <freddie_cho...@op.pl>
---
src/jtag/drivers/arm-jtag-ew.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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;
}
--
1.6.4.2
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
