From 818f82c5bd2aad9b2fc70e20ce5b6fb706f9e9f0 Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 11:50:52 -0500 Subject: [PATCH 1/9] Typecasting to int to resolve warning:#68-D: integer conversion resulted in a change of sign --- .../FEATURE_STORAGE/cfstore/source/configuration_store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c b/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c index da1a492faf6..a988de6ebc7 100644 --- a/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c +++ b/features/storage/FEATURE_STORAGE/cfstore/source/configuration_store.c @@ -2392,7 +2392,7 @@ static int32_t cfstore_delete_ex(cfstore_area_hkvt_t* hkvt) memset(ctx->area_0_tail-kv_size, 0, kv_size); /* The KV area has shrunk so a negative size_diff should be indicated to cfstore_file_update(). */ - ret = cfstore_file_update(hkvt->head, -1 * kv_size); + ret = cfstore_file_update(hkvt->head, -1 *(int32_t)kv_size); if(ret < ARM_DRIVER_OK){ CFSTORE_ERRLOG("%s:Error:file update failed\n", __func__); goto out0; From 9c9586a3885899cacc6f4f51649a6c8d9067c69b Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 11:56:41 -0500 Subject: [PATCH 2/9] moving static at the start to resolve warning:'static' is not at beginning of declaration [-Wold-style-declaration] --- .../TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c | 4 ++-- .../TARGET_MCU_K64F/drivers/fsl_flash.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c index b844547e60a..fff64ed74a6 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c @@ -402,7 +402,7 @@ static void (*callFlashCommonBitOperation)(FTFx_REG32_ACCESS_TYPE base, * @endcode * Note2: The binary code is generated by IAR 7.70.1 */ -const static uint16_t s_flashRunCommandFunctionCode[] = { +static const uint16_t s_flashRunCommandFunctionCode[] = { 0x2180, /* MOVS R1, #128 ; 0x80 */ 0x7001, /* STRB R1, [R0] */ /* @4: */ @@ -432,7 +432,7 @@ const static uint16_t s_flashRunCommandFunctionCode[] = { * @endcode * Note2: The binary code is generated by IAR 7.70.1 */ -const static uint16_t s_flashCommonBitOperationFunctionCode[] = { +static const uint16_t s_flashCommonBitOperationFunctionCode[] = { 0xb510, /* PUSH {R4, LR} */ 0x2900, /* CMP R1, #0 */ 0xd005, /* BEQ.N @12 */ diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c index b844547e60a..fff64ed74a6 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c @@ -402,7 +402,7 @@ static void (*callFlashCommonBitOperation)(FTFx_REG32_ACCESS_TYPE base, * @endcode * Note2: The binary code is generated by IAR 7.70.1 */ -const static uint16_t s_flashRunCommandFunctionCode[] = { +static const uint16_t s_flashRunCommandFunctionCode[] = { 0x2180, /* MOVS R1, #128 ; 0x80 */ 0x7001, /* STRB R1, [R0] */ /* @4: */ @@ -432,7 +432,7 @@ const static uint16_t s_flashRunCommandFunctionCode[] = { * @endcode * Note2: The binary code is generated by IAR 7.70.1 */ -const static uint16_t s_flashCommonBitOperationFunctionCode[] = { +static const uint16_t s_flashCommonBitOperationFunctionCode[] = { 0xb510, /* PUSH {R4, LR} */ 0x2900, /* CMP R1, #0 */ 0xd005, /* BEQ.N @12 */ From cc6de51688dec8ffc6a96d239b53bbf883cbb043 Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 12:07:02 -0500 Subject: [PATCH 3/9] Resolving warning: #2524-D: #pragma pop with no matching #pragma push : Pragma push for CC_ARM option is inside GNUC define, same hierarchy to be followed while pop --- .../TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c | 5 +++-- .../TARGET_MCU_K64F/drivers/fsl_flash.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c index fff64ed74a6..c9de4ecfe90 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/drivers/fsl_flash.c @@ -2734,11 +2734,12 @@ void flash_cache_clear(flash_config_t *config) __DSB(); #endif /* FLASH_DRIVER_IS_FLASH_RESIDENT */ } +#if (defined(__GNUC__)) +/* #pragma GCC pop_options */ +#else #if (defined(__CC_ARM)) #pragma pop #endif -#if (defined(__GNUC__)) -/* #pragma GCC pop_options */ #endif #if FLASH_DRIVER_IS_FLASH_RESIDENT diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c index fff64ed74a6..c9de4ecfe90 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_flash.c @@ -2734,11 +2734,12 @@ void flash_cache_clear(flash_config_t *config) __DSB(); #endif /* FLASH_DRIVER_IS_FLASH_RESIDENT */ } +#if (defined(__GNUC__)) +/* #pragma GCC pop_options */ +#else #if (defined(__CC_ARM)) #pragma pop #endif -#if (defined(__GNUC__)) -/* #pragma GCC pop_options */ #endif #if FLASH_DRIVER_IS_FLASH_RESIDENT From 8e1fe0a6b7d234bdfd84cc672c07f935807eb2fd Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 12:08:34 -0500 Subject: [PATCH 4/9] Added newline at end of file --- .../TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_common.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_common.c index fa1bd4b9629..2d4a3b28e9d 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_common.c +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_common.c @@ -158,4 +158,4 @@ void DisableDeepSleepIRQ(IRQn_Type interrupt) DisableIRQ(interrupt); /* also disable interrupt at NVIC */ /* SYSCON->STARTERCLR[index] = 1u << intNumber; */ } -#endif /*CPU_QN908X */ \ No newline at end of file +#endif /*CPU_QN908X */ From 35a436672b72e95cf9df897b9d260dc18f2d064b Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 12:09:37 -0500 Subject: [PATCH 5/9] Resolving warning: unused variable 'instance' [-Wunused-variable] --- .../TARGET_MCU_K64F/drivers/fsl_enet.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_enet.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_enet.c index 76505738b5e..b1fa0b019f6 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_enet.c +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/drivers/fsl_enet.c @@ -316,9 +316,8 @@ void ENET_Init(ENET_Type *base, assert(bufferConfig->rxBufferAlign); assert(macAddr); - uint32_t instance = ENET_GetInstance(base); - #if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) + uint32_t instance = ENET_GetInstance(base); /* Ungate ENET clock. */ CLOCK_EnableClock(s_enetClock[instance]); #endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */ @@ -413,7 +412,7 @@ static void ENET_SetMacController(ENET_Type *base, uint32_t tcr = 0; uint32_t ecr = 0; uint32_t macSpecialConfig = config->macSpecialConfig; - uint32_t instance = ENET_GetInstance(base); + ENET_GetInstance(base); /* Configures MAC receive controller with user configure structure. */ rcr = ENET_RCR_NLC(!!(macSpecialConfig & kENET_ControlRxPayloadCheckEnable)) | From 251fae34ac177afc514a08339b9f73888d964ea2 Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 12:14:04 -0500 Subject: [PATCH 6/9] Resolving: unused variable 'mode' [-Wunused-variable]. mode is used to determine kMCG_ModePEE in case of PEE to switch back manually as default after wakeup MCG is in PBE mode. this is required only when PEE mode is required --- targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/api/sleep.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/api/sleep.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/api/sleep.c index 08f32b86917..3ee9439a277 100644 --- a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/api/sleep.c +++ b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/api/sleep.c @@ -28,8 +28,11 @@ void hal_sleep(void) void hal_deepsleep(void) { #if (defined(FSL_FEATURE_SOC_MCG_COUNT) && FSL_FEATURE_SOC_MCG_COUNT) +#if defined(kMCG_ModePEE) mcg_mode_t mode = CLOCK_GetMode(); #endif +#endif + SMC_SetPowerModeProtection(SMC, kSMC_AllowPowerModeAll); SMC_SetPowerModeVlps(SMC); From 9b5f5a5472e2c9f22a01b62e38a01852eb58d4fb Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 13:37:19 -0500 Subject: [PATCH 7/9] Typecasting to resolve warning: integer conversion resulted in a change of sign --- platform/mbed_mktime.c | 2 +- platform/mbed_rtc_time.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/mbed_mktime.c b/platform/mbed_mktime.c index 49b4a4a6102..6954e723f4f 100644 --- a/platform/mbed_mktime.c +++ b/platform/mbed_mktime.c @@ -105,7 +105,7 @@ time_t _rtc_mktime(const struct tm* time) { } if (result > INT32_MAX) { - return -1; + return (time_t) -1; } return result; diff --git a/platform/mbed_rtc_time.cpp b/platform/mbed_rtc_time.cpp index 6f26fb27a8b..7a0ef488343 100644 --- a/platform/mbed_rtc_time.cpp +++ b/platform/mbed_rtc_time.cpp @@ -53,7 +53,7 @@ time_t time(time_t *timer) } } - time_t t = -1; + time_t t = (time_t)-1; if (_rtc_read != NULL) { t = _rtc_read(); } From 1ece5ff8a8cebf0d245e6a1a51c8b9c49c004702 Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 14:59:24 -0500 Subject: [PATCH 8/9] Using size_t instead of integer type to resolve warning: comparison between signed and unsigned integer expressions --- drivers/CAN.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/CAN.cpp b/drivers/CAN.cpp index 675a47f2382..50647e5526e 100644 --- a/drivers/CAN.cpp +++ b/drivers/CAN.cpp @@ -26,7 +26,7 @@ static void donothing() {} CAN::CAN(PinName rd, PinName td) : _can(), _irq() { // No lock needed in constructor - for (int i = 0; i < sizeof _irq / sizeof _irq[0]; i++) { + for (size_t i = 0; i < sizeof _irq / sizeof _irq[0]; i++) { _irq[i] = callback(donothing); } @@ -37,7 +37,7 @@ CAN::CAN(PinName rd, PinName td) : _can(), _irq() { CAN::CAN(PinName rd, PinName td, int hz) : _can(), _irq() { // No lock needed in constructor - for (int i = 0; i < sizeof _irq / sizeof _irq[0]; i++) { + for (size_t i = 0; i < sizeof _irq / sizeof _irq[0]; i++) { _irq[i].attach(donothing); } From 7e9ea9c6657b32be628a5a0bfacc4d3081ac45ce Mon Sep 17 00:00:00 2001 From: Deepika Date: Thu, 15 Jun 2017 15:20:26 -0500 Subject: [PATCH 9/9] Resolved format warnings: format '%d' expects argument of type 'int', but argument 3 has type 'u32_t[-Wformat=] --- .../lwip-eth/arch/TARGET_NXP/lpc17_emac.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c b/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c index 7c1966aa4d2..a9aef9a524c 100644 --- a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c +++ b/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c @@ -192,7 +192,7 @@ static void lpc_rxqueue_pbuf(struct lpc_enetdata *lpc_enetif, struct pbuf *p) LPC_EMAC->RxConsumeIndex = idx; LWIP_DEBUGF(UDP_LPC_EMAC | LWIP_DBG_TRACE, - ("lpc_rxqueue_pbuf: pbuf packet queued: %p (free desc=%d)\n", p, + ("lpc_rxqueue_pbuf: pbuf packet queued: %p (free desc=%"U32_F")\n", p, lpc_enetif->rx_free_descs)); } @@ -215,7 +215,7 @@ s32_t lpc_rx_queue(struct netif *netif) p = pbuf_alloc(PBUF_RAW, (u16_t) EMAC_ETH_MAX_FLEN, PBUF_RAM); if (p == NULL) { LWIP_DEBUGF(UDP_LPC_EMAC | LWIP_DBG_TRACE, - ("lpc_rx_queue: could not allocate RX pbuf (free desc=%d)\n", + ("lpc_rx_queue: could not allocate RX pbuf (free desc=%"U32_F")\n", lpc_enetif->rx_free_descs)); return queued; } @@ -341,7 +341,7 @@ static struct pbuf *lpc_low_level_input(struct netif *netif) lpc_rxqueue_pbuf(lpc_enetif, p); LWIP_DEBUGF(UDP_LPC_EMAC | LWIP_DBG_TRACE, - ("lpc_low_level_input: Packet dropped with errors (0x%x)\n", + ("lpc_low_level_input: Packet dropped with errors (%"X32_F")\n", lpc_enetif->prxs[idx].statusinfo)); p = NULL; @@ -365,10 +365,10 @@ static struct pbuf *lpc_low_level_input(struct netif *netif) /* Re-queue the pbuf for receive */ p->len = origLength; - lpc_rxqueue_pbuf(lpc_enetif, p); + lpc_rxqueue_pbuf(lpc_enetif, p); LWIP_DEBUGF(UDP_LPC_EMAC | LWIP_DBG_TRACE, - ("lpc_low_level_input: Packet index %d dropped for OOM\n", + ("lpc_low_level_input: Packet index %"U32_F" dropped for OOM\n", idx)); #ifdef LOCK_RX_THREAD @@ -381,7 +381,7 @@ static struct pbuf *lpc_low_level_input(struct netif *netif) } LWIP_DEBUGF(UDP_LPC_EMAC | LWIP_DBG_TRACE, - ("lpc_low_level_input: Packet received: %p, size %d (index=%d)\n", + ("lpc_low_level_input: Packet received: %p, size %"U32_F" (index=%"U32_F")\n", p, length, idx)); /* Save size */ @@ -479,7 +479,7 @@ static void lpc_tx_reclaim_st(struct lpc_enetdata *lpc_enetif, u32_t cidx) while (cidx != lpc_enetif->lpc_last_tx_idx) { if (lpc_enetif->txb[lpc_enetif->lpc_last_tx_idx] != NULL) { LWIP_DEBUGF(UDP_LPC_EMAC | LWIP_DBG_TRACE, - ("lpc_tx_reclaim_st: Freeing packet %p (index %d)\n", + ("lpc_tx_reclaim_st: Freeing packet %p (index %"U32_F")\n", lpc_enetif->txb[lpc_enetif->lpc_last_tx_idx], lpc_enetif->lpc_last_tx_idx)); pbuf_free(lpc_enetif->txb[lpc_enetif->lpc_last_tx_idx]); @@ -646,8 +646,8 @@ static err_t lpc_low_level_output(struct netif *netif, struct pbuf *p) } LWIP_DEBUGF(UDP_LPC_EMAC | LWIP_DBG_TRACE, - ("lpc_low_level_output: pbuf packet(%p) sent, chain#=%d," - " size = %d (index=%d)\n", q->payload, dn, q->len, idx)); + ("lpc_low_level_output: pbuf packet(%p) sent, chain#=%"S32_F"," + " size = %d (index=%"U32_F")\n", q->payload, dn, q->len, idx)); lpc_enetif->ptxd[idx].packet = (u32_t) q->payload;