From 67a96410e39933bb6c5293444bd69df57af6be9a Mon Sep 17 00:00:00 2001 From: Gareth McMullin Date: Tue, 16 Apr 2013 12:28:06 -0700 Subject: libftdi: Clean up warnings. --- src/platforms/libftdi/Makefile.inc | 2 +- src/platforms/libftdi/gdb_if.c | 4 +++- src/platforms/libftdi/jtagtap.c | 5 ++--- src/platforms/libftdi/platform.c | 8 ++++++++ src/platforms/libftdi/platform.h | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) (limited to 'src/platforms') diff --git a/src/platforms/libftdi/Makefile.inc b/src/platforms/libftdi/Makefile.inc index fa6292b..f7cc9c5 100644 --- a/src/platforms/libftdi/Makefile.inc +++ b/src/platforms/libftdi/Makefile.inc @@ -1,2 +1,2 @@ -CFLAGS += -DLIBFTDI +CFLAGS += -DLIBFTDI -Wno-format LDFLAGS += -lftdi -lusb diff --git a/src/platforms/libftdi/gdb_if.c b/src/platforms/libftdi/gdb_if.c index 4b4f4a5..ff49b57 100644 --- a/src/platforms/libftdi/gdb_if.c +++ b/src/platforms/libftdi/gdb_if.c @@ -108,7 +108,9 @@ unsigned char gdb_if_getchar_to(int timeout) void gdb_if_putchar(unsigned char c, int flush) { - if(gdb_if_conn > 0) + (void)flush; + + if (gdb_if_conn > 0) send(gdb_if_conn, &c, 1, 0); } diff --git a/src/platforms/libftdi/jtagtap.c b/src/platforms/libftdi/jtagtap.c index cd58707..c914646 100644 --- a/src/platforms/libftdi/jtagtap.c +++ b/src/platforms/libftdi/jtagtap.c @@ -51,12 +51,11 @@ int jtagtap_init(void) { - int err; - assert(ftdic != NULL); /* Go to JTAG mode for SWJ-DP */ - for(int i = 0; i <= 50; i++) jtagtap_next(1, 0); /* Reset SW-DP */ + for (int i = 0; i <= 50; i++) + jtagtap_next(1, 0); /* Reset SW-DP */ jtagtap_tms_seq(0xE73C, 16); /* SWD to JTAG sequence */ jtagtap_soft_reset(); diff --git a/src/platforms/libftdi/platform.c b/src/platforms/libftdi/platform.c index e3cad35..ec2a8f1 100644 --- a/src/platforms/libftdi/platform.c +++ b/src/platforms/libftdi/platform.c @@ -267,3 +267,11 @@ void platform_delay(uint32_t delay) usleep(delay * 100000); } +void morse(const char *msg, char repeat) +{ + (void)repeat; + + if (msg != NULL) + fprintf(stderr,"%s\n", msg); +} + diff --git a/src/platforms/libftdi/platform.h b/src/platforms/libftdi/platform.h index e23bf96..5ce45fd 100644 --- a/src/platforms/libftdi/platform.h +++ b/src/platforms/libftdi/platform.h @@ -40,12 +40,12 @@ #define PLATFORM_FATAL_ERROR(error) abort() #define PLATFORM_SET_FATAL_ERROR_RECOVERY() -#define morse(x, y) fprintf(stderr,"%s\n", x) #define morse_msg 0 extern struct ftdi_context *ftdic; int platform_init(int argc, char **argv); +void morse(const char *msg, char repeat); const char *platform_target_voltage(void); void platform_delay(uint32_t delay); -- cgit v1.2.3