Merge pull request #1547 from Parthasarathy/master

Fixed GCC Compiler warnings

Author: 0xc0170

libraries/mbed/targets/cmsis/TARGET_Atmel/TARGET_SAM_CortexM0P/utils/compiler.h

@@ -139,13 +139,14 @@
 #endif
 
 /* Define WEAK attribute */
-#if defined   ( __CC_ARM   )
-#   define WEAK __attribute__ ((weak))
-#elif defined ( __ICCARM__ )
-#   define WEAK __weak
-#elif defined (  __GNUC__  )
-#   define WEAK __attribute__ ((weak))
-#endif
+//defined in toochain.h
+//#if defined   ( __CC_ARM   )
+//#   define WEAK __attribute__ ((weak))
+//#elif defined ( __ICCARM__ )
+//#   define WEAK __weak
+//#elif defined (  __GNUC__  )
+//#   define WEAK __attribute__ ((weak))
+//#endif
 
 /* Define NO_INIT attribute */
 #if defined   ( __CC_ARM   )

libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/TARGET_SAMR21G18A/PeripheralPins.c

@@ -218,7 +218,7 @@ const struct pwm_pin_channel pwn_pins[] = {
     {PB31, PWM_0, 1},
 
     /* Not connected */
-    {NC  , NC   , NC}
+    {(PinName) NC  ,(PWMName) NC   ,(uint8_t) NC}
 };
 
 

libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/TARGET_SAMR21G18A/SAMR21_XPLAINED_PRO/mbed_overrides.c

@@ -17,6 +17,7 @@
 #include "compiler.h"
 #include "system.h"
 
+
 uint8_t g_sys_init = 0;
 
 //called before main - implement here if board needs it ortherwise, let

libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/analogin_api.c

@@ -192,10 +192,10 @@ void analogin_init(analogin_t *obj, PinName pin)
     static uint8_t init_flag = 0;
 
     pos_input = pinmap_find_peripheral(pin, PinMap_ADC);
-    MBED_ASSERT(pos_input != NC);
+    MBED_ASSERT(pos_input != (uint32_t)NC);
 
     adc_get_config_defaults(&(obj->config_adc));
-    obj->config_adc.positive_input = pos_input;
+    obj->config_adc.positive_input = (enum adc_positive_input)pos_input;
     if (init_flag == 0) {  // ADC init and enable to be done only once.
         adc_init(&adc_instance, ADC, &(obj->config_adc));
         adc_enable(&adc_instance);

libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/dma_api.c

@@ -83,7 +83,7 @@ static void dma_handler(const struct dma_resource* const resource)
         return;
     }
 
-    callback_func = dma_channels[channel_index].handler;
+    callback_func = (void(*)(void))(dma_channels[channel_index].handler);
     if (callback_func) {
         callback_func();
     }
@@ -268,7 +268,6 @@ bool dma_start_transfer(int channelid)
  */
 bool dma_busy(int channelid)
 {
-    int res = 0;
     /* Sanity check arguments */
     MBED_ASSERT(channelid < CONF_MAX_USED_CHANNEL_NUM);
 
@@ -278,7 +277,8 @@ bool dma_busy(int channelid)
 
     if (channel_index >= CONF_MAX_USED_CHANNEL_NUM) {
         /* This channel is not active! return zero for now */
-        res = 0;
+        //res = 0;
+        return 0;
     }
 
     return dma_is_busy(&dma_channels[channel_index].resource);
@@ -292,7 +292,6 @@ bool dma_busy(int channelid)
  */
 bool dma_is_transfer_complete(int channelid)
 {
-    int res = 0;
     /* Sanity check arguments */
     MBED_ASSERT(channelid < CONF_MAX_USED_CHANNEL_NUM);
 
@@ -302,7 +301,8 @@ bool dma_is_transfer_complete(int channelid)
 
     if (channel_index >= CONF_MAX_USED_CHANNEL_NUM) {
         /* This channel is not active! return zero for now */
-        res = 0;
+        // res = 0;
+        return 0;
     }
 
     return (STATUS_OK == dma_get_job_status(&dma_channels[channel_index].resource));
@@ -332,10 +332,10 @@ void dma_set_handler(int channelid, uint32_t handler, uint32_t event)
 
     dma_channels[channel_index].handler = handler;
     if (event & DMA_TRANSFER_ERROR) {
-        dma_register_callback(&dma_channels[channel_index].resource, dma_handler, DMA_CALLBACK_TRANSFER_ERROR);
+        dma_register_callback(&dma_channels[channel_index].resource, (dma_callback_t)dma_handler, DMA_CALLBACK_TRANSFER_ERROR);
     }
     if (event & DMA_TRANSFER_COMPLETE) {
-        dma_register_callback(&dma_channels[channel_index].resource, dma_handler, DMA_CALLBACK_TRANSFER_DONE);
+        dma_register_callback(&dma_channels[channel_index].resource, (dma_callback_t)dma_handler, DMA_CALLBACK_TRANSFER_DONE);
     }
 
     /* Set interrupt vector if someone have removed it */

libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/dma_api_HAL.h

@@ -103,4 +103,4 @@ void dma_set_handler(int channelid, uint32_t handler, uint32_t event);
 }
 #endif
 
-#endif /* _DMA_API_HAL_H */
+#endif /* _DMA_API_HAL_H */

libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/drivers/system/clock/TARGET_SAMD21/clock.c

@@ -487,40 +487,29 @@ enum status_code system_clock_source_write_calibration(
 {
     switch (clock_source) {
         case SYSTEM_CLOCK_SOURCE_OSC8M:
-
                     if (calibration_value > 0xfff || freq_range > 4) {
                     return STATUS_ERR_INVALID_ARG;
                 }
-
             SYSCTRL->OSC8M.bit.CALIB  = calibration_value;
             SYSCTRL->OSC8M.bit.FRANGE = freq_range;
             break;
-
         case SYSTEM_CLOCK_SOURCE_OSC32K:
-
             if (calibration_value > 128) {
                 return STATUS_ERR_INVALID_ARG;
             }
-
             _system_osc32k_wait_for_sync();
             SYSCTRL->OSC32K.bit.CALIB = calibration_value;
             break;
-
         case SYSTEM_CLOCK_SOURCE_ULP32K:
-
             if (calibration_value > 32) {
                 return STATUS_ERR_INVALID_ARG;
             }
-
             SYSCTRL->OSCULP32K.bit.CALIB = calibration_value;
             break;
-
         default:
             Assert(false);
             return STATUS_ERR_INVALID_ARG;
-            break;
     }
-
     return STATUS_OK;
 }
 

libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/drivers/system/clock/TARGET_SAMR21/clock.c

@@ -518,7 +518,7 @@ enum status_code system_clock_source_write_calibration(
         default:
             Assert(false);
             return STATUS_ERR_INVALID_ARG;
-            break;
+
     }
 
     return STATUS_OK;

libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/drivers/system/system.c

@@ -45,6 +45,7 @@
  */
 
 #include <system.h>
+#include <toolchain.h>
 
 /**
  * \internal

libraries/mbed/targets/hal/TARGET_Atmel/TARGET_SAM_CortexM0P/gpio_api.c

@@ -55,7 +55,7 @@ void gpio_mode(gpio_t *obj, PinMode mode)
     struct port_config pin_conf;
 
     obj->mode = mode;
-    pin_conf.direction = obj->direction;
+    pin_conf.direction = (enum port_pin_dir)obj->direction;
     pin_conf.powersave  = obj->powersave;
     switch (mode) {
         case PullNone :
@@ -75,9 +75,8 @@ void gpio_dir(gpio_t *obj, PinDirection direction)
 {
     MBED_ASSERT(obj->pin != (PinName)NC);
     struct port_config pin_conf;
-
     obj->direction = direction;
-    pin_conf.input_pull = obj->mode;
+    pin_conf.input_pull = (enum port_pin_pull)obj->mode;
     pin_conf.powersave  = obj->powersave;
     switch (direction) {
         case PIN_INPUT :