PSOC6: update the HAL implementation to latest PDL

Integrate the latest fixes to the PSoC 6 HAL.

Author: vmedcy

targets/TARGET_Cypress/TARGET_PSOC6/analogin_api.c

@@ -18,6 +18,7 @@
 #include "device.h"
 #include "analogin_api.h"
 #include "cy_sar.h"
+#include "cy_sysanalog.h"
 #include "psoc6_utils.h"
 #include "mbed_assert.h"
 #include "mbed_error.h"
@@ -106,10 +107,14 @@ static void sar_init(analogin_t *obj)
         }
         Cy_SysClk_PeriphSetDivider(CY_SYSCLK_DIV_8_BIT,
                                    sar_clock_divider,
-                                   ((CY_CLK_PERICLK_FREQ_HZ + SAR_BASE_CLOCK_HZ / 2) / SAR_BASE_CLOCK_HZ) - 1);
+                                   ((cy_PeriClkFreqHz + SAR_BASE_CLOCK_HZ / 2) / SAR_BASE_CLOCK_HZ) - 1);
         Cy_SysClk_PeriphEnableDivider(CY_SYSCLK_DIV_8_BIT, sar_clock_divider);
         Cy_SysClk_PeriphAssignDivider(obj->clock, CY_SYSCLK_DIV_8_BIT, sar_clock_divider);
 
+        /* Init and Enable the Analog Reference for SAR ADC operation */
+        Cy_SysAnalog_Init(&Cy_SysAnalog_Fast_Local);
+        Cy_SysAnalog_Enable();
+
         Cy_SAR_Init(obj->base, &sar_config);
         Cy_SAR_Enable(obj->base);
     }
@@ -126,18 +131,22 @@ void analogin_init(analogin_t *obj, PinName pin)
 
     sar = pinmap_peripheral(pin, PinMap_ADC);
     if (sar != (uint32_t)NC) {
-        if (cy_reserve_io_pin(pin)) {
+	
+	if ((0 != cy_reserve_io_pin(pin)) && !sar_initialized) {
             error("ANALOG IN pin reservation conflict.");
         }
-        obj->base = (SAR_Type*)CY_PERIPHERAL_BASE(sar);
+		
+        /* Initialize object */
+        obj->base = (SAR_Type*) CY_PERIPHERAL_BASE(sar);
         obj->pin = pin;
         obj->channel_mask = 1 << CY_PIN(pin);
 
-        // Configure clock.
+        /* Configure SAR hardware */
         sar_function = pinmap_function(pin, PinMap_ADC);
         obj->clock = CY_PIN_CLOCK(sar_function);
         sar_init(obj);
         pin_function(pin, sar_function);
+
     } else {
         error("ANALOG IN pinout mismatch.");
     }

targets/TARGET_Cypress/TARGET_PSOC6/analogout_api.c

@@ -66,11 +66,10 @@ static void ctdac_init(dac_t *obj)
         dac_clock_divider = cy_clk_allocate_divider(CY_SYSCLK_DIV_8_BIT);
         if (dac_clock_divider == CY_INVALID_DIVIDER) {
             error("CTDAC clock divider allocation failed.");
-            return;
         }
         Cy_SysClk_PeriphSetDivider(CY_SYSCLK_DIV_8_BIT,
                                    dac_clock_divider,
-                                   ((CY_CLK_PERICLK_FREQ_HZ + CTDAC_BASE_CLOCK_HZ / 2) / CTDAC_BASE_CLOCK_HZ) - 1);
+                                   ((cy_PeriClkFreqHz + CTDAC_BASE_CLOCK_HZ / 2) / CTDAC_BASE_CLOCK_HZ) - 1);
         Cy_SysClk_PeriphEnableDivider(CY_SYSCLK_DIV_8_BIT, dac_clock_divider);
         Cy_SysClk_PeriphAssignDivider(obj->clock, CY_SYSCLK_DIV_8_BIT, dac_clock_divider);
 
@@ -90,25 +89,37 @@ void analogout_init(dac_t *obj, PinName pin)
 
     dac = pinmap_peripheral(pin, PinMap_DAC);
     if (dac != (uint32_t)NC) {
-        if (cy_reserve_io_pin(pin)) {
+      
+	if ((0 != cy_reserve_io_pin(pin)) && !ctdac_initialized) {
             error("ANALOG OUT pin reservation conflict.");
         }
+		
+        /* Initialize object */
         obj->base = (CTDAC_Type*)CY_PERIPHERAL_BASE(dac);
         obj->pin = pin;
 
-        // Configure clock.
+        /* Configure CTDAC hardware */
         dac_function = pinmap_function(pin, PinMap_DAC);
         obj->clock = CY_PIN_CLOCK(dac_function);
         pin_function(pin, dac_function);
+        
+        if (P9_6 != pin) {
+            const PinName directOutput = P9_6; 
+
+            /* Connect P9_6 to the AMUXA bus to drive output */
+            Cy_GPIO_SetHSIOM(Cy_GPIO_PortToAddr(CY_PORT(directOutput)), CY_PIN(directOutput), HSIOM_SEL_AMUXA);
+        }
+        
         ctdac_init(obj);
+        
     } else {
         error("ANALOG OUT pinout mismatch.");
     }
 }
 
 void analogout_free(dac_t *obj)
 {
-    // Not supported yet.
+    /* MBED AnalogIn driver does not call this function in destructor */ 
 }
 
 void analogout_write(dac_t *obj, float value)

targets/TARGET_Cypress/TARGET_PSOC6/flash_api.c

@@ -16,7 +16,7 @@
 
 #include "device.h"
 #include "flash_api.h"
-#include "drivers/peripheral/flash/cy_flash.h"
+#include "cy_flash.h"
 
 #if DEVICE_FLASH
 

targets/TARGET_Cypress/TARGET_PSOC6/gpio_api.c

@@ -60,19 +60,14 @@ void gpio_init(gpio_t *obj, PinName pin)
 
     MBED_ASSERT(CY_PIN(obj->pin) < 8); // PSoC6 architecture supports 8 pins per port.
 
-    /*
-     * Perform i/o reservation only if this is called outside of critical section/interrupt context.
-     * This is a workaround for mbed_die() implementation, which configures LED1 inside critical section.
-     * Normally user is advised to perform all of the i/o configuration at the program beginning,
-     * or elsewhere in the running thread context. when we detect that we are in the wrong context here,
-     * we assume it's explicitly called from mbed_die() or other fault handling, so eventual forcing
-     * of the pin mode is deliberate and should not cause more problems.
-     */
+    /* Ignore pin reservation result because there is not possibility to release 
+     * reserved HW resource. The MBED does not provide proper destructors for 
+     * doing that.
+    */
     if (!(IsIrqMode() || IsIrqMasked())) {
-        if (cy_reserve_io_pin(pin)) {
-            error("GPIO pin reservation conflict.");
-        }
+      (void) cy_reserve_io_pin(pin);
     }
+    
     obj->port = Cy_GPIO_PortToAddr(CY_PORT(obj->pin));
 
     const uint32_t outputVal = 0;

targets/TARGET_Cypress/TARGET_PSOC6/gpio_object.h

@@ -22,7 +22,7 @@
 #include "PinNamesTypes.h"
 #include "PinNames.h"
 
-#include "drivers/peripheral/gpio/cy_gpio.h"
+#include "cy_gpio.h"
 
 #ifdef __cplusplus
 extern "C" {