Øyvind Harboe wrote:
Hmmm... I tried to apply this patch, but it didn't work...
Did you create it in some new way?
Try #2 - this time using "svn diff".
-Duane.
Index: configure.in
===================================================================
--- configure.in (revision 886)
+++ configure.in (working copy)
@@ -27,6 +27,12 @@
is_mingw=no
is_win32=no
+
+AC_ARG_ENABLE(gccwarnings,
+ AS_HELP_STRING([--enable-gccwarnings], [Enable compiler warnings,
default yes]),
+ [gcc_warnings=$enablevalue], [gcc_warnings=yes])
+
+
AC_ARG_ENABLE(parport,
AS_HELP_STRING([--enable-parport], [Enable building the pc parallel port
driver]),
[build_parport=$enableval], [build_parport=no])
@@ -298,11 +304,17 @@
CFLAGS_FOR_BUILD="-g -O2"
else
CC_FOR_BUILD=$CC
- CFLAGS_FOR_BUILD=$CFLAGS
+ CFLAGS_FOR_BUILD="$CFLAGS $GCC_WARNINGS"
fi
+
+if test $gcc_warnings = yes; then
+ CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -Wall -Wmissing-prototypes
-Wstrict-prototypes"
+fi
+
AC_MSG_RESULT([$CC_FOR_BUILD])
AC_SUBST(CC_FOR_BUILD)
AC_SUBST(CFLAGS_FOR_BUILD)
+AC_MSG_NOTICE([CFLAGS_FOR_BUILD = $CFLAGS_FOR_BUILD])
AC_MSG_CHECKING([for suffix of executable build tools])
if test $cross_compiling = yes; then
Index: src/helper/time_support.h
===================================================================
--- src/helper/time_support.h (revision 886)
+++ src/helper/time_support.h (working copy)
@@ -38,7 +38,7 @@
extern int timeval_add(struct timeval *result, struct timeval *x, struct
timeval *y);
extern int timeval_add_time(struct timeval *result, int sec, int usec);
/* gettimeofday() timeval in 64 bit ms */
-extern long long timeval_ms();
+extern long long timeval_ms(void);
typedef struct duration_s
{
Index: src/helper/command.h
===================================================================
--- src/helper/command.h (revision 886)
+++ src/helper/command.h (working copy)
@@ -71,7 +71,7 @@
extern void command_set_output_handler(command_context_t* context, int
(*output_handler)(struct command_context_s *context, const char* line), void
*priv);
extern command_context_t* copy_command_context(command_context_t* context);
extern int command_context_mode(command_context_t *context, enum command_mode
mode);
-extern command_context_t* command_init();
+extern command_context_t* command_init(void);
extern int command_done(command_context_t *context);
extern void command_print(command_context_t *context, char *format, ...);
extern void command_print_sameline(command_context_t *context, char *format,
...);
Index: src/helper/log.h
===================================================================
--- src/helper/log.h (revision 886)
+++ src/helper/log.h (working copy)
@@ -59,8 +59,8 @@
extern int log_register_commands(struct command_context_s *cmd_ctx);
extern int log_init(struct command_context_s *cmd_ctx);
extern int set_log_output(struct command_context_s *cmd_ctx, FILE *output);
-extern void keep_alive();
-extern void kept_alive();
+extern void keep_alive(void);
+extern void kept_alive(void);
typedef void (*log_callback_fn)(void *priv, const char *file, int line,
const char *function, const char *string);
Index: src/jtag/gw16012.c
===================================================================
--- src/jtag/gw16012.c (revision 886)
+++ src/jtag/gw16012.c (working copy)
@@ -194,7 +194,7 @@
return ERROR_OK;
}
-void gw16012_end_state(state)
+void gw16012_end_state(int state)
{
if (tap_move_map[state] != -1)
end_state = state;
@@ -526,7 +526,7 @@
LOG_WARNING("No gw16012 port specified, using default '0x378'
(LPT1)");
}
- LOG_DEBUG("requesting privileges for parallel port 0x%lx...",
gw16012_port);
+ LOG_DEBUG("requesting privileges for parallel port 0x%lx...", (long
unsigned)(gw16012_port) );
#if PARPORT_USE_GIVEIO == 1
if (gw16012_get_giveio_access() != 0)
#else /* PARPORT_USE_GIVEIO */
Index: src/jtag/amt_jtagaccel.c
===================================================================
--- src/jtag/amt_jtagaccel.c (revision 886)
+++ src/jtag/amt_jtagaccel.c (working copy)
@@ -166,7 +166,7 @@
}
}
-void amt_wait_scan_busy()
+void amt_wait_scan_busy(void)
{
int timeout = 4096;
u8 ar_status;
Index: src/jtag/jtag.c
===================================================================
--- src/jtag/jtag.c (revision 886)
+++ src/jtag/jtag.c (working copy)
@@ -401,7 +401,7 @@
return t + offset;
}
-void cmd_queue_free()
+void cmd_queue_free(void)
{
cmd_queue_page_t *page = cmd_queue_pages;
@@ -416,7 +416,7 @@
cmd_queue_pages = NULL;
}
-static void jtag_prelude1()
+static void jtag_prelude1(void)
{
if (jtag_trst == 1)
{
@@ -1316,7 +1316,7 @@
/* Try to examine chain layout according to IEEE 1149.1 §12
*/
-int jtag_examine_chain()
+int jtag_examine_chain(void)
{
jtag_device_t *device = jtag_devices;
scan_field_t field;
@@ -1433,7 +1433,7 @@
return ERROR_OK;
}
-int jtag_validate_chain()
+int jtag_validate_chain(void)
{
jtag_device_t *device = jtag_devices;
int total_ir_length = 0;
Index: src/jtag/jtag.h
===================================================================
--- src/jtag/jtag.h (revision 886)
+++ src/jtag/jtag.h (working copy)
@@ -282,8 +282,8 @@
/* run a TAP_TLR reset. End state is TAP_TLR, regardless
* of start state.
*/
-extern void jtag_add_tlr();
-extern int interface_jtag_add_tlr();
+extern void jtag_add_tlr(void);
+extern int interface_jtag_add_tlr(void);
/* Do not use jtag_add_pathmove() unless you need to, but do use it
* if you have to.
*
Index: src/main.c
===================================================================
--- src/main.c (revision 886)
+++ src/main.c (working copy)
@@ -21,11 +21,11 @@
/* implementations of OpenOCD that uses multithreading needs to know when
* OpenOCD is sleeping. No-op in vanilla OpenOCD
*/
-void openocd_sleep_prelude()
+void openocd_sleep_prelude(void)
{
}
-void openocd_sleep_postlude()
+void openocd_sleep_postlude(void)
{
}
Index: src/server/gdb_server.c
===================================================================
--- src/server/gdb_server.c (revision 886)
+++ src/server/gdb_server.c (working copy)
@@ -2002,7 +2002,7 @@
return ERROR_OK;
}
-int gdb_init()
+int gdb_init(void)
{
gdb_service_t *gdb_service;
target_t *target = targets;
Index: src/server/server.c
===================================================================
--- src/server/server.c (revision 886)
+++ src/server/server.c (working copy)
@@ -222,7 +222,7 @@
return ERROR_OK;
}
-int remove_services()
+int remove_services(void)
{
service_t *c = services;
@@ -249,8 +249,8 @@
return ERROR_OK;
}
-extern void openocd_sleep_prelude();
-extern void openocd_sleep_postlude();
+extern void openocd_sleep_prelude(void);
+extern void openocd_sleep_postlude(void);
int server_loop(command_context_t *command_context)
{
@@ -434,7 +434,7 @@
}
#endif
-int server_init()
+int server_init(void)
{
#ifdef _WIN32
WORD wVersionRequested;
@@ -460,7 +460,7 @@
return ERROR_OK;
}
-int server_quit()
+int server_quit(void)
{
remove_services();
Index: src/server/gdb_server.h
===================================================================
--- src/server/gdb_server.h (revision 886)
+++ src/server/gdb_server.h (working copy)
@@ -46,7 +46,7 @@
struct target_s *target;
} gdb_service_t;
-extern int gdb_init();
+extern int gdb_init(void);
extern int gdb_register_commands(command_context_t *command_context);
#define ERROR_GDB_BUFFER_TOO_SMALL (-800)
Index: src/server/server.h
===================================================================
--- src/server/server.h (revision 886)
+++ src/server/server.h (working copy)
@@ -68,8 +68,8 @@
} service_t;
extern int add_service(char *name, enum connection_type type, unsigned short
port, int max_connections, new_connection_handler_t new_connection_handler,
input_handler_t input_handler, connection_closed_handler_t
connection_closed_handler, void *priv);
-extern int server_init();
-extern int server_quit();
+extern int server_init(void);
+extern int server_quit(void);
extern int server_loop(command_context_t *command_context);
extern int server_register_commands(command_context_t *context);
Index: src/target/arm11.c
===================================================================
--- src/target/arm11.c (revision 886)
+++ src/target/arm11.c (working copy)
@@ -1709,7 +1709,7 @@
if (values[i] > arm11_coproc_instruction_limits[i])
{
LOG_ERROR("Parameter %ld out of bounds (%d max). %s",
- i + 2, arm11_coproc_instruction_limits[i],
+ (long)(i + 2), arm11_coproc_instruction_limits[i],
read ? arm11_mrc_syntax : arm11_mcr_syntax);
return -1;
}
Index: src/target/arm926ejs.c
===================================================================
--- src/target/arm926ejs.c (revision 886)
+++ src/target/arm926ejs.c (working copy)
@@ -48,7 +48,7 @@
/* forward declarations */
int arm926ejs_target_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc, struct target_s *target);
int arm926ejs_init_target(struct command_context_s *cmd_ctx, struct target_s
*target);
-int arm926ejs_quit();
+int arm926ejs_quit(void);
int arm926ejs_arch_state(struct target_s *target);
int arm926ejs_read_memory(struct target_s *target, u32 address, u32 size, u32
count, u8 *buffer);
int arm926ejs_write_memory(struct target_s *target, u32 address, u32 size, u32
count, u8 *buffer);
@@ -666,7 +666,7 @@
}
-int arm926ejs_quit()
+int arm926ejs_quit(void)
{
return ERROR_OK;
Index: src/target/xscale.c
===================================================================
--- src/target/xscale.c (revision 886)
+++ src/target/xscale.c (working copy)
@@ -55,7 +55,7 @@
/* forward declarations */
int xscale_target_command(struct command_context_s *cmd_ctx, char *cmd, char
**args, int argc, struct target_s *target);
int xscale_init_target(struct command_context_s *cmd_ctx, struct target_s
*target);
-int xscale_quit();
+int xscale_quit(void);
int xscale_arch_state(struct target_s *target);
int xscale_poll(target_t *target);
@@ -2982,7 +2982,7 @@
return ERROR_OK;
}
-int xscale_quit()
+int xscale_quit(void)
{
return ERROR_OK;
Index: src/target/target.c
===================================================================
--- src/target/target.c (revision 886)
+++ src/target/target.c (working copy)
@@ -692,15 +692,15 @@
return ERROR_OK;
}
-int target_call_timer_callbacks()
+int target_call_timer_callbacks(void)
{
return target_call_timer_callbacks_check_time(1);
}
/* invoke periodic callbacks immediately */
-int target_call_timer_callbacks_now()
+int target_call_timer_callbacks_now(void)
{
- return target_call_timer_callbacks(0);
+ return target_call_timer_callbacks();
}
int target_alloc_working_area(struct target_s *target, u32 size,
working_area_t **area)
Index: src/target/target.h
===================================================================
--- src/target/target.h (revision 886)
+++ src/target/target.h (working copy)
@@ -266,11 +266,11 @@
*/
extern int target_register_timer_callback(int (*callback)(void *priv), int
time_ms, int periodic, void *priv);
extern int target_unregister_timer_callback(int (*callback)(void *priv), void
*priv);
-extern int target_call_timer_callbacks();
+extern int target_call_timer_callbacks(void);
/* invoke this to ensure that e.g. polling timer callbacks happen before
* a syncrhonous command completes.
*/
-extern int target_call_timer_callbacks_now();
+extern int target_call_timer_callbacks_now(void);
extern target_t* get_current_target(struct command_context_s *cmd_ctx);
extern int get_num_by_target(target_t *query_target);
Index: src/target/arm920t.c
===================================================================
--- src/target/arm920t.c (revision 886)
+++ src/target/arm920t.c (working copy)
@@ -48,7 +48,7 @@
/* forward declarations */
int arm920t_target_command(struct command_context_s *cmd_ctx, char *cmd, char
**args, int argc, struct target_s *target);
int arm920t_init_target(struct command_context_s *cmd_ctx, struct target_s
*target);
-int arm920t_quit();
+int arm920t_quit(void);
int arm920t_arch_state(struct target_s *target);
int arm920t_read_memory(struct target_s *target, u32 address, u32 size, u32
count, u8 *buffer);
int arm920t_write_memory(struct target_s *target, u32 address, u32 size, u32
count, u8 *buffer);
@@ -685,7 +685,7 @@
}
-int arm920t_quit()
+int arm920t_quit(void)
{
return ERROR_OK;
Index: src/target/arm7tdmi.c
===================================================================
--- src/target/arm7tdmi.c (revision 886)
+++ src/target/arm7tdmi.c (working copy)
@@ -46,7 +46,7 @@
/* forward declarations */
int arm7tdmi_target_command(struct command_context_s *cmd_ctx, char *cmd, char
**args, int argc, struct target_s *target);
int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s
*target);
-int arm7tdmi_quit();
+int arm7tdmi_quit(void);
/* target function declarations */
int arm7tdmi_poll(struct target_s *target);
@@ -753,7 +753,7 @@
}
-int arm7tdmi_quit()
+int arm7tdmi_quit(void)
{
return ERROR_OK;
Index: src/target/mips32_pracc.c
===================================================================
--- src/target/mips32_pracc.c (revision 886)
+++ src/target/mips32_pracc.c (working copy)
@@ -23,6 +23,7 @@
#include "config.h"
#endif
+#include <string.h>
#include "log.h"
#include "mips32.h"
#include "mips32_pracc.h"
Index: src/target/arm9tdmi.c
===================================================================
--- src/target/arm9tdmi.c (revision 886)
+++ src/target/arm9tdmi.c (working copy)
@@ -48,7 +48,7 @@
/* forward declarations */
int arm9tdmi_target_command(struct command_context_s *cmd_ctx, char *cmd, char
**args, int argc, struct target_s *target);
int arm9tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s
*target);
-int arm9tdmi_quit();
+int arm9tdmi_quit(void);
target_type_t arm9tdmi_target =
{
@@ -896,7 +896,7 @@
}
-int arm9tdmi_quit()
+int arm9tdmi_quit(void)
{
return ERROR_OK;
Index: src/target/feroceon.c
===================================================================
--- src/target/feroceon.c (revision 886)
+++ src/target/feroceon.c (working copy)
@@ -58,7 +58,7 @@
int feroceon_target_command(struct command_context_s *cmd_ctx, char *cmd, char
**args, int argc, struct target_s *target);
int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8
*buffer);
int feroceon_init_target(struct command_context_s *cmd_ctx, struct target_s
*target);
-int feroceon_quit();
+int feroceon_quit(void);
target_type_t feroceon_target =
{
@@ -381,6 +381,7 @@
arm_jtag_t *jtag_info = &arm7_9->jtag_info;
u32 r0 = buf_get_u32(armv4_5->core_cache->reg_list[0].value, 0, 32);
u32 pc = buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32);
+ (void)(r0); // use R0...
arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
arm9tdmi_clock_out(jtag_info, ARMV4_5_NOP, 0, NULL, 0);
@@ -627,7 +628,7 @@
return ERROR_OK;
}
-int feroceon_quit()
+int feroceon_quit(void)
{
return ERROR_OK;
}
Index: src/target/cortex_m3.c
===================================================================
--- src/target/cortex_m3.c (revision 886)
+++ src/target/cortex_m3.c (working copy)
@@ -47,7 +47,7 @@
void cortex_m3_enable_watchpoints(struct target_s *target);
int cortex_m3_target_command(struct command_context_s *cmd_ctx, char *cmd,
char **args, int argc, struct target_s *target);
int cortex_m3_init_target(struct command_context_s *cmd_ctx, struct target_s
*target);
-int cortex_m3_quit();
+int cortex_m3_quit(void);
int cortex_m3_load_core_reg_u32(target_t *target, enum armv7m_regtype type,
u32 num, u32 *value);
int cortex_m3_store_core_reg_u32(target_t *target, enum armv7m_regtype type,
u32 num, u32 value);
int cortex_m3_target_request_data(target_t *target, u32 size, u8 *buffer);
@@ -1367,7 +1367,7 @@
return ERROR_OK;
}
-int cortex_m3_quit()
+int cortex_m3_quit(void)
{
return ERROR_OK;
Index: src/target/mips_m4k.c
===================================================================
--- src/target/mips_m4k.c (revision 886)
+++ src/target/mips_m4k.c (working copy)
@@ -43,7 +43,7 @@
int mips_m4k_write_memory(struct target_s *target, u32 address, u32 size, u32
count, u8 *buffer);
int mips_m4k_register_commands(struct command_context_s *cmd_ctx);
int mips_m4k_init_target(struct command_context_s *cmd_ctx, struct target_s
*target);
-int mips_m4k_quit();
+int mips_m4k_quit(void);
int mips_m4k_target_command(struct command_context_s *cmd_ctx, char *cmd, char
**args, int argc, struct target_s *target);
int mips_m4k_examine(struct command_context_s *cmd_ctx, struct target_s
*target);
@@ -561,7 +561,7 @@
return ERROR_OK;
}
-int mips_m4k_quit()
+int mips_m4k_quit(void)
{
return ERROR_OK;
}
Index: src/target/arm720t.c
===================================================================
--- src/target/arm720t.c (revision 886)
+++ src/target/arm720t.c (working copy)
@@ -43,7 +43,7 @@
/* forward declarations */
int arm720t_target_command(struct command_context_s *cmd_ctx, char *cmd, char
**args, int argc, struct target_s *target);
int arm720t_init_target(struct command_context_s *cmd_ctx, struct target_s
*target);
-int arm720t_quit();
+int arm720t_quit(void);
int arm720t_arch_state(struct target_s *target);
int arm720t_read_memory(struct target_s *target, u32 address, u32 size, u32
count, u8 *buffer);
int arm720t_write_memory(struct target_s *target, u32 address, u32 size, u32
count, u8 *buffer);
@@ -423,7 +423,7 @@
}
-int arm720t_quit()
+int arm720t_quit(void)
{
return ERROR_OK;
Index: src/flash/flash.h
===================================================================
--- src/flash/flash.h (revision 886)
+++ src/flash/flash.h (working copy)
@@ -80,7 +80,7 @@
extern int flash_erase_address_range(target_t *target, u32 addr, u32 length);
extern int flash_write(target_t *target, image_t *image, u32 *written, int
erase);
extern void flash_set_dirty(void);
-extern int flash_get_bank_count();
+extern int flash_get_bank_count(void);
extern int default_flash_blank_check(struct flash_bank_s *bank);
extern int default_flash_mem_blank_check(struct flash_bank_s *bank);
Index: src/flash/flash.c
===================================================================
--- src/flash/flash.c (revision 886)
+++ src/flash/flash.c (working copy)
@@ -233,7 +233,7 @@
return NULL;
}
-int flash_get_bank_count()
+int flash_get_bank_count(void)
{
flash_bank_t *p;
int i = 0;
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development
