> I tried to apply the patch, but it didn't apply cleanly.
The original patch applied, the attached one was broken. Don't
ask my why, it's not broken on my hard disk.
Personally, I like in-line patches more:
* easier to read in all mailing list clients
* easier to comment inline
* easier to include parts of the patch in a reply
* they end up in all mailing list archives (some
filter attachments out)
* they end up in Googles index
* no mime-type trouble
The drawback is that some mail clients have trouble with long
lines or whitespace, but the Linux people solved all those
problems for us:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/email-clients.txt
But your mileage may vary.
Anyway, the patch allies to SVN HEAD:
/usr/src/sdkcradle/openocd$ patch -p1 <
patches/fix-warnings.patch
patching file src/flash/pic32mx.c
patching file src/helper/jim-eventloop.h
patching file src/server/gdb_server.c
patching file src/flash/mflash.c
patching file src/target/mips_m4k.c
--- openocd.orig/src/flash/pic32mx.c
+++ openocd/src/flash/pic32mx.c
@@ -268,10 +268,12 @@
{
pic32mx_flash_bank_t *pic32mx_info = NULL;
target_t *target = bank->target;
+#if 0
u16 prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF};
int i, reg, bit;
int status;
u32 protection;
+#endif
pic32mx_info = bank->driver_priv;
@@ -824,7 +826,9 @@
int pic32mx_chip_erase(struct flash_bank_s *bank)
{
target_t *target = bank->target;
+#if 0
u32 status;
+#endif
if (target->state != TARGET_HALTED)
{
@@ -865,10 +869,10 @@
int pic32mx_handle_chip_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
+#if 0
flash_bank_t *bank;
int i;
-#if 0
if (argc != 0)
{
command_print(cmd_ctx, "pic32mx chip_erase");
--- openocd.orig/src/helper/jim-eventloop.h
+++ openocd/src/helper/jim-eventloop.h
@@ -95,17 +95,6 @@
#define JIM_GET_API(name) \
Jim_GetApi(interp, "Jim_" #name, ((void *)&Jim_ ## name))
-#if defined(JIM_EXTENSION) || defined(JIM_EMBEDDED)
-/* This must be included "inline" inside the extension */
-static void Jim_ImportEventloopAPI(Jim_Interp *interp)
-{
- JIM_GET_API(CreateFileHandler);
- JIM_GET_API(DeleteFileHandler);
- JIM_GET_API(CreateTimeHandler);
- JIM_GET_API(DeleteTimeHandler);
- JIM_GET_API(ProcessEvents);
-}
-#endif /* defined JIM_EXTENSION || defined JIM_EMBEDDED */
#undef JIM_GET_API
#endif /* __JIM_EVENTLOOP_CORE__ */
--- openocd.orig/src/server/gdb_server.c
+++ openocd/src/server/gdb_server.c
@@ -600,7 +600,7 @@
- int checksum_ok;
+ int checksum_ok = 0;
/* explicit code expansion here to get faster inlined code in -O3 by not
* calculating checksum
*/
--- openocd.orig/src/flash/mflash.c
+++ openocd/src/flash/mflash.c
@@ -206,31 +206,6 @@
return mflash_bank->gpio_drv->set_gpio_output_val(mflash_bank->rst_pin, level);
}
-static int mg_dump_task_reg (void)
-{
- target_t *target = mflash_bank->target;
- u32 address = mflash_bank->base + MG_REG_OFFSET + MG_REG_ERROR;
- u8 value, i;
- char *reg_name[9] = {
- "error ",
- "sector count ",
- "sector num (LBA 7- 0) ",
- "cyl. low (LBA 15- 8) ",
- "cyl. high (LBA 23-16) ",
- "drv/head ",
- "status ",
- "dev control ",
- "burst control "
- };
-
- for (i = 0; i < 9; i++) {
- target_read_u8(target, address + i * 2, &value);
- LOG_INFO("%s : 0x%2.2x", reg_name[i], value);
- }
-
- return ERROR_OK;
-
-}
static int mflash_init_gpio (void)
{
mflash_gpio_drv_t *gpio_drv = mflash_bank->gpio_drv;
--- openocd.orig/src/target/mips_m4k.c
+++ openocd/src/target/mips_m4k.c
@@ -93,7 +93,7 @@
int mips_m4k_examine_debug_reason(target_t *target)
{
- int break_status;
+ u32 break_status;
int retval;
if ((target->debug_reason != DBG_REASON_DBGRQ)
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
