GPIO Interrupts working, ambiq apollo3 mbed port

Author: Kyle Wenner

targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device/apollo3.h

@@ -147,10 +147,6 @@ typedef enum {
   #define __IOM  __IO
 #endif
 
-#ifdef OVERFLOW
-#undef OVERFLOW
-#endif
-
 /* ========================================  Start of section using anonymous unions  ======================================== */
 #if defined (__CC_ARM)
   #pragma push

targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device/cmsis.h

@@ -7,7 +7,7 @@
 #ifndef MBED_CMSIS_H
 #define MBED_CMSIS_H
 
-#include "apollo3.h"
+#include "am_mcu_apollo.h"
 #include "cmsis_nvic.h"
 
 #endif

targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device/gpio_api.c

@@ -28,7 +28,8 @@ SOFTWARE.
  * @param pin The pin to be set as GPIO
  * @return The GPIO port mask for this pin
  **/
-uint32_t gpio_set(PinName pin){
+uint32_t gpio_set(PinName pin)
+{
     MBED_ASSERT(pin != (PinName)NC);
     return (uint32_t)AM_HAL_GPIO_BIT(pin);
 }
@@ -38,7 +39,8 @@ uint32_t gpio_set(PinName pin){
  * @return 0 if object was initialized with NC
  * @return non-zero if object was initialized with a valid PinName
  **/
-int gpio_is_connected(const gpio_t *obj){
+int gpio_is_connected(const gpio_t *obj)
+{
     MBED_ASSERT(obj != NULL);
     return (int)(((PinName)obj->pad == (PinName)NC) ? 0 : 1);
 }
@@ -48,82 +50,170 @@ int gpio_is_connected(const gpio_t *obj){
  * @param obj The GPIO object to initialize
  * @param pin The GPIO pin to initialize (may be NC)
  */
-void gpio_init(gpio_t *obj, PinName pin){
+void gpio_init(gpio_t *obj, PinName pin)
+{
     MBED_ASSERT(obj != NULL);
     obj->pad = (ap3_uart_pad_t)pin;
     return;
 }
-
 /** Set the input pin mode
  *
  * @param obj  The GPIO object (must be connected)
  * @param mode The pin mode to be set
  */
-void gpio_mode(gpio_t *obj, PinMode mode){
+void gpio_mode(gpio_t *obj, PinMode mode)
+{
     MBED_ASSERT(gpio_is_connected(obj));
     MBED_ASSERT(mode < (PinMode)PinModeElements);
+    am_hal_gpio_pincfg_allow_t pinConfigBools;
 
-    obj->cfg.uFuncSel = 3; // gpio
+    obj->cfg.uFuncSel = AP3_PINCFG_FUNCSEL_GPIO; // gpio
 
-    if( mode & (PinMode)PowerSwNone ){ obj->cfg.ePowerSw = AM_HAL_GPIO_PIN_POWERSW_NONE; }
-    if( mode & (PinMode)PowerSwVDD ){ obj->cfg.ePowerSw = AM_HAL_GPIO_PIN_POWERSW_VDD; }
-    if( mode & (PinMode)PowerSwVSS ){ obj->cfg.ePowerSw = AM_HAL_GPIO_PIN_POWERSW_VSS; }
+    if (mode & (PinMode)PowerSwNone)
+    {
+        obj->cfg.ePowerSw = AM_HAL_GPIO_PIN_POWERSW_NONE;
+        pinConfigBools.powerSw = true;
+    }
+    if (mode & (PinMode)PowerSwVDD)
+    {
+        obj->cfg.ePowerSw = AM_HAL_GPIO_PIN_POWERSW_VDD;
+        pinConfigBools.powerSw = true;
+    }
+    if (mode & (PinMode)PowerSwVSS)
+    {
+        obj->cfg.ePowerSw = AM_HAL_GPIO_PIN_POWERSW_VSS;
+        pinConfigBools.powerSw = true;
+    }
 
-    if( mode & (PinMode)PullNone ){ obj->cfg.ePullup = AM_HAL_GPIO_PIN_PULLUP_NONE; }
-    if( mode & (PinMode)PullUp ){ obj->cfg.ePullup = AM_HAL_GPIO_PIN_PULLUP_WEAK; }
-    if( mode & (PinMode)PullDown ){ obj->cfg.ePullup = AM_HAL_GPIO_PIN_PULLDOWN; }
+    if (mode & (PinMode)PullNone)
+    {
+        obj->cfg.ePullup = AM_HAL_GPIO_PIN_PULLUP_NONE;
+        pinConfigBools.pullup = true;
+    }
+    if (mode & (PinMode)PullUp)
+    {
+        obj->cfg.ePullup = AM_HAL_GPIO_PIN_PULLUP_WEAK;
+        pinConfigBools.pullup = true;
+    }
+    if (mode & (PinMode)PullDown)
+    {
+        obj->cfg.ePullup = AM_HAL_GPIO_PIN_PULLDOWN;
+        pinConfigBools.pullup = true;
+    }
 
-    if( mode & (PinMode)DriveStrength2mA ){ obj->cfg.eDriveStrength = AM_HAL_GPIO_PIN_DRIVESTRENGTH_2MA; }
-    if( mode & (PinMode)DriveStrength4mA ){ obj->cfg.eDriveStrength = AM_HAL_GPIO_PIN_DRIVESTRENGTH_4MA; }
-    if( mode & (PinMode)DriveStrength8mA ){ obj->cfg.eDriveStrength = AM_HAL_GPIO_PIN_DRIVESTRENGTH_8MA; }
-    if( mode & (PinMode)DriveStrength12mA ){ obj->cfg.eDriveStrength = AM_HAL_GPIO_PIN_DRIVESTRENGTH_12MA; }
+    if (mode & (PinMode)DriveStrength2mA)
+    {
+        obj->cfg.eDriveStrength = AM_HAL_GPIO_PIN_DRIVESTRENGTH_2MA;
+        pinConfigBools.driveStrength = true;
+    }
+    if (mode & (PinMode)DriveStrength4mA)
+    {
+        obj->cfg.eDriveStrength = AM_HAL_GPIO_PIN_DRIVESTRENGTH_4MA;
+        pinConfigBools.driveStrength = true;
+    }
+    if (mode & (PinMode)DriveStrength8mA)
+    {
+        obj->cfg.eDriveStrength = AM_HAL_GPIO_PIN_DRIVESTRENGTH_8MA;
+        pinConfigBools.driveStrength = true;
+    }
+    if (mode & (PinMode)DriveStrength12mA)
+    {
+        obj->cfg.eDriveStrength = AM_HAL_GPIO_PIN_DRIVESTRENGTH_12MA;
+        pinConfigBools.driveStrength = true;
+    }
 
-    if( mode & (PinMode)OutDisable ){ obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_DISABLE; }
-    if( mode & (PinMode)OutPushPull ){ obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_PUSHPULL; }
-    if( mode & (PinMode)OutOpenDrain ){ obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_OPENDRAIN; }
-    if( mode & (PinMode)OutTristate ){ obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_TRISTATE; }
+    if (mode & (PinMode)OutDisable)
+    {
+        obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_DISABLE;
+        pinConfigBools.gpOutcfg = true;
+    }
+    if (mode & (PinMode)OutPushPull)
+    {
+        obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_PUSHPULL;
+        pinConfigBools.gpOutcfg = true;
+    }
+    if (mode & (PinMode)OutOpenDrain)
+    {
+        obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_OPENDRAIN;
+        pinConfigBools.gpOutcfg = true;
+    }
+    if (mode & (PinMode)OutTristate)
+    {
+        obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_TRISTATE;
+        pinConfigBools.gpOutcfg = true;
+    }
 
-    if( mode & (PinMode)InAuto ){ obj->cfg.eGPInput = AM_HAL_GPIO_PIN_INPUT_AUTO; }
-    if( mode & (PinMode)InNone ){ obj->cfg.eGPInput = AM_HAL_GPIO_PIN_INPUT_NONE; }
-    if( mode & (PinMode)InEnable ){ obj->cfg.eGPInput = AM_HAL_GPIO_PIN_INPUT_ENABLE; }
+    if (mode & (PinMode)InAuto)
+    {
+        obj->cfg.eGPInput = AM_HAL_GPIO_PIN_INPUT_AUTO;
+        pinConfigBools.gpInput = true;
+    }
+    if (mode & (PinMode)InNone)
+    {
+        obj->cfg.eGPInput = AM_HAL_GPIO_PIN_INPUT_NONE;
+        pinConfigBools.gpInput = true;
+    }
+    if (mode & (PinMode)InEnable)
+    {
+        obj->cfg.eGPInput = AM_HAL_GPIO_PIN_INPUT_ENABLE;
+        pinConfigBools.gpInput = true;
+    }
 
-    if( mode & (PinMode)ReadPin ){ obj->cfg.eGPRdZero = AM_HAL_GPIO_PIN_RDZERO_READPIN; }
-    if( mode & (PinMode)ReadZero ){ obj->cfg.eGPRdZero = AM_HAL_GPIO_PIN_RDZERO_ZERO; }
+    if (mode & (PinMode)ReadPin)
+    {
+        obj->cfg.eGPRdZero = AM_HAL_GPIO_PIN_RDZERO_READPIN;
+        pinConfigBools.gprdZero = true;
+    }
+    if (mode & (PinMode)ReadZero)
+    {
+        obj->cfg.eGPRdZero = AM_HAL_GPIO_PIN_RDZERO_ZERO;
+        pinConfigBools.gprdZero = true;
+    }
 
-    am_hal_gpio_pinconfig((uint32_t)(obj->pad), obj->cfg); // apply configuration
+    ap3_hal_gpio_pinconfig_partial((uint32_t)(obj->pad), obj->cfg, pinConfigBools); //padRegMsk.byte, GPConfigMsk.byte, padAltCfgMsk.byte); // apply configuration
 }
 
 /** Set the pin direction
  *
  * @param obj       The GPIO object (must be connected)
  * @param direction The pin direction to be set
  */
-void gpio_dir(gpio_t *obj, PinDirection direction){
+void gpio_dir(gpio_t *obj, PinDirection direction)
+{
     MBED_ASSERT(gpio_is_connected(obj));
     MBED_ASSERT(direction < (PinDirection)PIN_DIR_ELEMENTS);
+    am_hal_gpio_pincfg_allow_t pinConfigBools;
 
-    if( direction == (PinDirection)PIN_INPUT ){
+    if (direction == (PinDirection)PIN_INPUT)
+    {
         obj->cfg.eGPInput = AM_HAL_GPIO_PIN_INPUT_ENABLE;
+        pinConfigBools.gpInput = true;
         obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_DISABLE;
+        pinConfigBools.gpOutcfg = true;
     }
-    else if ( direction == (PinDirection)PIN_OUTPUT ){
+    else if (direction == (PinDirection)PIN_OUTPUT)
+    {
         obj->cfg.eGPOutcfg = AM_HAL_GPIO_PIN_OUTCFG_PUSHPULL;
+        pinConfigBools.gpOutcfg = false;
         obj->cfg.eDriveStrength = AM_HAL_GPIO_PIN_DRIVESTRENGTH_12MA;
-        obj->cfg.eGPInput = AM_HAL_GPIO_PIN_INPUT_ENABLE;
-        obj->cfg.eGPRdZero = AM_HAL_GPIO_PIN_RDZERO_READPIN;
-    }else{
+        obj->cfg.eGPInput = AM_HAL_GPIO_PIN_INPUT_NONE;
+        pinConfigBools.gpInput = false;
+    }
+    else
+    {
         MBED_ASSERT(false);
     }
 
-    am_hal_gpio_pinconfig((uint32_t)(obj->pad), obj->cfg); // apply configuration
+    ap3_hal_gpio_pinconfig_partial((uint32_t)(obj->pad), obj->cfg, pinConfigBools); //padRegMsk.byte, GPConfigMsk.byte, padAltCfgMsk.byte); // apply configuration
 }
 
 /** Set the output value
  *
  * @param obj   The GPIO object (must be connected)
  * @param value The value to be set
  */
-void gpio_write(gpio_t *obj, int value){
+void gpio_write(gpio_t *obj, int value)
+{
     MBED_ASSERT(gpio_is_connected(obj));
     (value) ? am_hal_gpio_output_set(obj->pad) : am_hal_gpio_output_clear(obj->pad);
 }
@@ -133,7 +223,8 @@ void gpio_write(gpio_t *obj, int value){
  * @param obj The GPIO object (must be connected)
  * @return An integer value 1 or 0
  */
-int gpio_read(gpio_t *obj){
+int gpio_read(gpio_t *obj)
+{
     MBED_ASSERT(gpio_is_connected(obj));
     uint32_t ui32BaseAddr = (obj->pad) / 8;
     uint32_t ui32BaseShift = (((obj->pad) % 8) * 4) + 1;
@@ -153,7 +244,8 @@ int gpio_read(gpio_t *obj){
  *
  * @return PinMap array
  */
-const PinMap *gpio_pinmap(void){
+const PinMap *gpio_pinmap(void)
+{
     MBED_ASSERT(false);
     return NULL;
-}
+}

targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device/gpio_irq_api.c

@@ -9,7 +9,6 @@ extern "C"
 #endif
 
     uint32_t ap3_gpio_enable_interrupts(uint32_t ui32Pin, am_hal_gpio_intdir_e eIntDir);
-
     /** GPIO IRQ HAL structure. gpio_irq_s is declared in the target's HAL
  */
     typedef struct gpio_irq_s gpio_irq_t;
@@ -46,21 +45,22 @@ extern "C"
     int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32_t id)
     {
         //grab the correct irq control object
-        ap3_gpio_irq_control_t control = gpio_irq_control[pin];
+        ap3_gpio_irq_control_t *control = &gpio_irq_control[pin];
 
         //Register locally
-        control.pad = pin;
-        control.handler = handler;
-        control.id = id;
-        control.events = IRQ_NONE;
+        control->pad = pin;
+        control->handler = handler;
+        control->id = id;
+        control->events = IRQ_NONE;
 
         //Attach to object
-        obj->control = &control;
+        obj->control = control;
 
         //Make sure the interrupt is set to none to reflect the new events value
-        ap3_gpio_enable_interrupts(control.pad, AM_HAL_GPIO_PIN_INTDIR_NONE);
+        ap3_gpio_enable_interrupts(control->pad, AM_HAL_GPIO_PIN_INTDIR_NONE);
 
         //Enable GPIO IRQ's in the NVIC
+        gpio_irq_enable(obj);
         NVIC_SetVector((IRQn_Type)GPIO_IRQn, (uint32_t)am_gpio_isr);
         NVIC_EnableIRQ((IRQn_Type)GPIO_IRQn);
         return 0;
@@ -74,7 +74,7 @@ extern "C"
         uint32_t pinNum = 0;
         while (gpio_int_mask)
         {
-            if (gpio_int_mask |= 0x0000000000000001)
+            if (gpio_int_mask & 0x0000000000000001)
             {
                 am_hal_gpio_interrupt_clear(AM_HAL_GPIO_BIT(pinNum));
                 ap3_gpio_irq_control_t irq_ctrl = gpio_irq_control[pinNum];
@@ -155,6 +155,8 @@ extern "C"
     /**@}*/
     uint32_t ap3_gpio_enable_interrupts(uint32_t ui32Pin, am_hal_gpio_intdir_e eIntDir)
     {
+        //GPConfigReg_t GPCfgMask = {.bit.INCFG = 1, .bit.INTD = 1};
+        // uint32_t ap3_hal_gpio_pinconfig_partial(ui32Pin, bfGpioCfg, 0, uint8_t GPCfgMask, 0);
         uint32_t ui32Padreg, ui32AltPadCfg, ui32GPCfg;
         uint32_t ui32Funcsel, ui32PowerSw;
         bool bClearEnable = false;

targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device/objects_gpio.h

@@ -122,6 +122,8 @@ extern "C"
         ap3_gpio_irq_control_t *control;
     } gpio_irq_s;
 
+#define AP3_PINCFG_FUNCSEL_GPIO 3
+
 #define AP3_GPIO_MAX_PADS (50)
 #define PADREG_FLD_76_S 6
 #define PADREG_FLD_FNSEL_S 3

targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device/serial_api.c

@@ -133,7 +133,7 @@ void uart_configure_pin_function(PinName pin, UARTName uart, const PinMap *map);
  * @param rx  The RX pin name
  */
 void serial_init(serial_t *obj, PinName tx, PinName rx)
-{
+{ //TODO: we should be able to call this multiple times
   // determine the UART to use
   UARTName uart_tx = (UARTName)pinmap_peripheral(tx, serial_tx_pinmap());
   UARTName uart_rx = (UARTName)pinmap_peripheral(rx, serial_rx_pinmap());