Fixed automerge problems.

Author: radhika-raghavendran

targets/TARGET_ONSEMI/TARGET_NCS36510/clock.h

@@ -82,7 +82,7 @@
 
 #define CLOCK_ENABLE(a)         CLOCKREG->PDIS.WORD &= ~(1 << a)
 #define CLOCK_DISABLE(a)        CLOCKREG->PDIS.WORD |= (uint32_t)(1 << a)
-#define CLOCK_IS_ENABLED(a)     (((CLOCKREG->PDIS.WORD) >> a) & 1)?0:1
+#define CLOCK_IS_ENABLED(a)     (((CLOCKREG->PDIS.WORD >> a) & 1)?0:1)
 
 /*************************************************************************************************
 *                                                                                                *

targets/TARGET_ONSEMI/TARGET_NCS36510/gpio_api.c

@@ -109,9 +109,6 @@ void gpio_init(gpio_t *obj, PinName pin)
     /** - Get PAD IO register address for the PAD number */
     PadReg_t *PadRegOffset = (PadReg_t*)(PADREG_BASE + (pin * PAD_REG_ADRS_BYTE_SIZE));
 
-    /* - Disable the GPIO clock */
-    CLOCK_DISABLE(CLOCK_GPIO);
-
     /** - Enable the clock for PAD peripheral device */
     CLOCK_ENABLE(CLOCK_PAD);
 
@@ -153,8 +150,6 @@ void gpio_dir(gpio_t *obj, PinDirection direction)
         obj->GPIOMEMBASE->W_OUT = obj->gpioMask;
     }
 
-    /* - Disable the GPIO clock */
-    CLOCK_DISABLE(CLOCK_GPIO);
 }
 
 /** Set the output value
@@ -164,6 +159,7 @@ void gpio_dir(gpio_t *obj, PinDirection direction)
  */
 void gpio_write(gpio_t *obj, int value)
 {
+
     /* Enable the GPIO clock */
     if(!CLOCK_IS_ENABLED(CLOCK_GPIO)) {
         CLOCK_ENABLE(CLOCK_GPIO);
@@ -176,8 +172,6 @@ void gpio_write(gpio_t *obj, int value)
         obj->GPIOMEMBASE->R_IRQ_W_CLEAR = obj->gpioMask;
     }
 
-    /* - Disable the GPIO clock */
-    CLOCK_DISABLE(CLOCK_GPIO);
 }
 
 /** Read the input value
@@ -196,8 +190,5 @@ int gpio_read(gpio_t *obj)
 
     ret = (obj->GPIOMEMBASE->R_STATE_W_SET & obj->gpioMask) ? 1: 0;
 
-    /* - Disable the GPIO clock */
-    CLOCK_DISABLE(CLOCK_GPIO);
-
     return ret;
 }

targets/TARGET_ONSEMI/TARGET_NCS36510/gpio_irq_api.c

@@ -86,7 +86,7 @@ void fGpioHandler(void)
 {
     uint8_t index;
     uint32_t active_interrupts = 0;
-    gpio_irq_event event;
+    gpio_irq_event event = IRQ_NONE;
     GpioReg_pt gpioBase;
 
     /* Enable the GPIO clock */
@@ -108,12 +108,9 @@ void fGpioHandler(void)
                 if ((gpioBase->IRQ_POLARITY_SET >> index) &0x01)  {
                     /* Edge triggered high */
                     event = IRQ_RISE;
-                } else if ((gpioBase->IRQ_POLARITY_CLEAR >> index) &0x01) {
+                } else {
                     /* Edge triggered low */
                     event = IRQ_FALL;
-                } else {
-                    /* Edge none */
-                    event = IRQ_NONE;
                 }
             }
             gpioBase->IRQ_CLEAR = (0x1 << index);
@@ -156,10 +153,6 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
     obj->GPIOMEMBASE = GPIOREG;
 
     /* Set default values for the pin interrupt */
-    /* TODO: Only one DIO line is configured using this function; overrides other DIO line setting
-     * If mbed layer wants to call this function repeatedly for setting multiple DIO lines as input
-     * then change this setting to  obj->GPIOMEMBASE->W_IN |= obj->pinMask. All parameter setting needs to change from = to |=
-     */
     obj->GPIOMEMBASE->W_IN = obj->pinMask;
     obj->GPIOMEMBASE->IRQ_EDGE = obj->pinMask;
     obj->GPIOMEMBASE->IRQ_POLARITY_SET = obj->pinMask;
@@ -185,8 +178,8 @@ void gpio_irq_free(gpio_irq_t *obj)
         CLOCK_ENABLE(CLOCK_GPIO);
     }
 
-    /* Make the pin as output in order to release it */
-    obj->GPIOMEMBASE->W_OUT = obj->pinMask;
+    /* Disable IRQs to indicate that it is now free */
+    obj->GPIOMEMBASE->IRQ_ENABLE_CLEAR = obj->pinMask;
     gpioIds[obj->pin] = 0;
 }
 
@@ -198,7 +191,6 @@ void gpio_irq_free(gpio_irq_t *obj)
  */
 void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable)
 {
-
     /* Enable the GPIO clock */
     if(!CLOCK_IS_ENABLED(CLOCK_GPIO)) {
         CLOCK_ENABLE(CLOCK_GPIO);
@@ -266,6 +258,7 @@ void gpio_irq_enable(gpio_irq_t *obj)
  */
 void gpio_irq_disable(gpio_irq_t *obj)
 {
+
     /* Enable the GPIO clock */
     if(!CLOCK_IS_ENABLED(CLOCK_GPIO)) {
         CLOCK_ENABLE(CLOCK_GPIO);