From 475513031190797ad0ac6b8044992babbc6a743d Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Fri, 29 Aug 2014 02:20:08 +0400 Subject: [PATCH] LPC11C24 warnings --- libuavcan/src/transport/uc_frame.cpp | 4 ++-- libuavcan_drivers/lpc11c24/driver/src/can.cpp | 2 ++ libuavcan_drivers/lpc11c24/driver/src/clock.cpp | 2 ++ libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/Makefile | 4 ++-- .../lpc11c24/test_olimex_lpc_p11c24/src/main.cpp | 2 +- .../lpc11c24/test_olimex_lpc_p11c24/src/sys/libstubs.cpp | 4 ++++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/libuavcan/src/transport/uc_frame.cpp b/libuavcan/src/transport/uc_frame.cpp index 8340c21ed6..510b60e6e3 100644 --- a/libuavcan/src/transport/uc_frame.cpp +++ b/libuavcan/src/transport/uc_frame.cpp @@ -17,13 +17,13 @@ int Frame::getMaxPayloadLen() const { case TransferTypeMessageBroadcast: { - return sizeof(payload_); + return int(sizeof(payload_)); } case TransferTypeServiceResponse: case TransferTypeServiceRequest: case TransferTypeMessageUnicast: { - return sizeof(payload_) - 1; + return int(sizeof(payload_)) - 1; } default: { diff --git a/libuavcan_drivers/lpc11c24/driver/src/can.cpp b/libuavcan_drivers/lpc11c24/driver/src/can.cpp index dd73cbcfd7..9e6fec89c2 100644 --- a/libuavcan_drivers/lpc11c24/driver/src/can.cpp +++ b/libuavcan_drivers/lpc11c24/driver/src/can.cpp @@ -410,6 +410,8 @@ void canErrorCallback(uint32_t error_info) } } +void CAN_IRQHandler(); + void CAN_IRQHandler() { uavcan_lpc11c24::last_irq_utc_timestamp = uavcan_lpc11c24::clock::getUtcUSecFromCanInterrupt(); diff --git a/libuavcan_drivers/lpc11c24/driver/src/clock.cpp b/libuavcan_drivers/lpc11c24/driver/src/clock.cpp index 21a4dc6a3e..2230635e8f 100644 --- a/libuavcan_drivers/lpc11c24/driver/src/clock.cpp +++ b/libuavcan_drivers/lpc11c24/driver/src/clock.cpp @@ -159,6 +159,8 @@ SystemClock& SystemClock::instance() extern "C" { +void SysTick_Handler(); + void SysTick_Handler() { using namespace uavcan_lpc11c24::clock; diff --git a/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/Makefile b/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/Makefile index 8d15223f54..d4e2f8d33d 100644 --- a/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/Makefile +++ b/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/Makefile @@ -11,7 +11,7 @@ CSRC := $(wildcard lpc_chip_11cxx_lib/src/*.c) \ DEF = -DFW_VERSION_MAJOR=1 -DFW_VERSION_MINOR=0 INC = -Isrc/sys \ - -Ilpc_chip_11cxx_lib/inc + -isystem lpc_chip_11cxx_lib/inc # # UAVCAN library @@ -52,7 +52,7 @@ DEF += -DNDEBUG -DCHIP_LPC11CXX -DCORE_M0 -DTHUMB_NO_INTERWORKING -U__STRICT_ANS FLAGS = -mthumb -mcpu=cortex-m0 -mno-thumb-interwork -flto -Os -g3 -Wall -Wextra -Werror -ffunction-sections \ -fdata-sections -fno-common -fno-exceptions -fno-unwind-tables -fno-stack-protector -fomit-frame-pointer \ -ftracer -ftree-loop-distribute-patterns -frename-registers -freorder-blocks -fconserve-stack \ - -Wfloat-equal + -Wfloat-equal -Wconversion -Wsign-conversion -Wmissing-declarations C_CPP_FLAGS = $(FLAGS) -MD -MP -MF $(DEPDIR)/$(@F).d diff --git a/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/src/main.cpp b/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/src/main.cpp index 9b38305baf..a5e7e85321 100644 --- a/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/src/main.cpp +++ b/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/src/main.cpp @@ -93,7 +93,7 @@ void init() void reverse(char* s) { - for (int i = 0, j = std::strlen(s) - 1; i < j; i++, j--) + for (int i = 0, j = int(std::strlen(s)) - 1; i < j; i++, j--) { const char c = s[i]; s[i] = s[j]; diff --git a/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/src/sys/libstubs.cpp b/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/src/sys/libstubs.cpp index ec0744cb11..b652e60649 100644 --- a/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/src/sys/libstubs.cpp +++ b/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/src/sys/libstubs.cpp @@ -7,6 +7,10 @@ #include #include +#if __GNUC__ +# pragma GCC diagnostic ignored "-Wmissing-declarations" +#endif + void* __dso_handle; void* operator new(size_t)