KSDK - drivers layer removal, mbed HAL using only KSDK HAL

	- ADC corrections with channels, and clock configuration

Author: 0xc0170

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/PeripheralNames.h

@@ -68,28 +68,29 @@ typedef enum {
     PWM_24 = (2 << TPM_SHIFT) | (7),  // FTM2 CH7
 } PWMName;
 
-#define ADC_SHIFT 8
+#define ADC_INSTANCE_SHIFT           8
+#define ADC_B_CHANNEL_SHIFT          5
 typedef enum {
-    ADC0_SE4b = (0 << ADC_SHIFT) | 4,
-    ADC0_SE5b = (0 << ADC_SHIFT) | 5,
-    ADC0_SE6b = (0 << ADC_SHIFT) | 6,
-    ADC0_SE7b = (0 << ADC_SHIFT) | 7,
-    ADC0_SE8  = (0 << ADC_SHIFT) | 8,
-    ADC0_SE9  = (0 << ADC_SHIFT) | 9,
-    ADC0_SE12 = (0 << ADC_SHIFT) | 12,
-    ADC0_SE13 = (0 << ADC_SHIFT) | 13,
-    ADC0_SE14 = (0 << ADC_SHIFT) | 14,
-    ADC0_SE15 = (0 << ADC_SHIFT) | 15,
-    ADC1_SE4b = (1 << ADC_SHIFT) | 4,
-    ADC1_SE5b = (1 << ADC_SHIFT) | 5,
-    ADC1_SE6b = (1 << ADC_SHIFT) | 6,
-    ADC1_SE7b = (1 << ADC_SHIFT) | 7,
-    ADC1_SE8  = (1 << ADC_SHIFT) | 8,
-    ADC1_SE9  = (1 << ADC_SHIFT) | 9,
-    ADC1_SE12 = (1 << ADC_SHIFT) | 12,
-    ADC1_SE13 = (1 << ADC_SHIFT) | 13,
-    ADC1_SE14 = (1 << ADC_SHIFT) | 14,
-    ADC1_SE15 = (1 << ADC_SHIFT) | 15
+    ADC0_SE4b = (0 << ADC_INSTANCE_SHIFT) | (1 << ADC_B_CHANNEL_SHIFT) | 4,
+    ADC0_SE5b = (0 << ADC_INSTANCE_SHIFT) | (1 << ADC_B_CHANNEL_SHIFT) | 5,
+    ADC0_SE6b = (0 << ADC_INSTANCE_SHIFT) | (1 << ADC_B_CHANNEL_SHIFT) | 6,
+    ADC0_SE7b = (0 << ADC_INSTANCE_SHIFT) | (1 << ADC_B_CHANNEL_SHIFT) | 7,
+    ADC0_SE8  = (0 << ADC_INSTANCE_SHIFT) | 8,
+    ADC0_SE9  = (0 << ADC_INSTANCE_SHIFT) | 9,
+    ADC0_SE12 = (0 << ADC_INSTANCE_SHIFT) | 12,
+    ADC0_SE13 = (0 << ADC_INSTANCE_SHIFT) | 13,
+    ADC0_SE14 = (0 << ADC_INSTANCE_SHIFT) | 14,
+    ADC0_SE15 = (0 << ADC_INSTANCE_SHIFT) | 15,
+    ADC1_SE4b = (1 << ADC_INSTANCE_SHIFT) | 4,
+    ADC1_SE5b = (1 << ADC_INSTANCE_SHIFT) | 5,
+    ADC1_SE6b = (1 << ADC_INSTANCE_SHIFT) | 6,
+    ADC1_SE7b = (1 << ADC_INSTANCE_SHIFT) | 7,
+    ADC1_SE8  = (1 << ADC_INSTANCE_SHIFT) | 8,
+    ADC1_SE9  = (1 << ADC_INSTANCE_SHIFT) | 9,
+    ADC1_SE12 = (1 << ADC_INSTANCE_SHIFT) | 12,
+    ADC1_SE13 = (1 << ADC_INSTANCE_SHIFT) | 13,
+    ADC1_SE14 = (1 << ADC_INSTANCE_SHIFT) | 14,
+    ADC1_SE15 = (1 << ADC_INSTANCE_SHIFT) | 15
 } ADCName;
 
 typedef enum {

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/PinNames.h

@@ -17,7 +17,6 @@
 #define MBED_PINNAMES_H
 
 #include "cmsis.h"
-#include "fsl_gpio_driver.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,6 +27,8 @@ typedef enum {
     PIN_OUTPUT
 } PinDirection;
 
+#define GPIO_PORT_SHIFT 12
+
 typedef enum {
     /* PTA0 - PTA3 reserved for JTAG pins */
     PTA4 = (0 << GPIO_PORT_SHIFT | 4),

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c

@@ -18,38 +18,57 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "error.h"
-#include "fsl_adc_driver.h"
 #include "PeripheralNames.h"
- 
+#include "fsl_adc_hal.h"
+#include "fsl_clock_manager.h"
+
+#define MAX_FADC 6000000
+
 static const PinMap PinMap_ADC[] = {
     {PTC0, ADC0_SE14, 0},
     {NC,   NC,        0}
 };
 
 void analogin_init(analogin_t *obj, PinName pin) {
     obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
-    adc_user_config_t module_config;
-    uint32_t instance = obj->adc >> ADC_SHIFT;
+    if (obj->adc == (ADCName)NC) {
+        error("ADC pin mapping failed");
+    }
+    uint32_t instance = obj->adc >> ADC_INSTANCE_SHIFT;
 
-    module_config.clockSourceMode = kAdcClockSourceBusClk;
-    module_config.clockSourceDividerMode = kAdcClockDivider8;
-    module_config.resolutionMode = kAdcSingleDiff16;
-    module_config.referenceVoltageMode = kAdcVoltageVref;
-    module_config.isContinuousEnabled = false;
+    clock_manager_set_gate(kClockModuleADC, instance, true);
 
-    adc_init(instance, &module_config);
+    uint32_t bus_clock;
+    clock_manager_get_frequency(kBusClock, &bus_clock);
+    uint32_t clkdiv;
+    for (clkdiv = 0; clkdiv < 4; clkdiv++) {
+        if ((bus_clock >> clkdiv) <= MAX_FADC)
+            break;
+    }
+    if (clkdiv == 4) {//Set max div
+        clkdiv = 0x7;
+    }
 
-    obj->channel_cfg.channelId =(adc_channel_mode_t)(obj->adc & 0xF);
-    obj->channel_cfg.isDifferentialEnabled = false;
-    obj->channel_cfg.isInterruptEnabled = false;
-    obj->channel_cfg.muxSelect =  kAdcChannelMuxB;
-    adc_start_conversion(instance, &obj->channel_cfg);
+    adc_hal_set_clock_source_mode(instance, (adc_clock_source_mode_t)(clkdiv >> 2));
+    adc_hal_set_clock_divider_mode(instance, (adc_clock_divider_mode_t)(clkdiv & 0x3));
+    adc_hal_set_reference_voltage_mode(instance, kAdcVoltageVref);
+    adc_hal_set_resolution_mode(instance, kAdcSingleDiff16);
+    adc_hal_configure_continuous_conversion(instance, false);
 
+    adc_group_mux_mode_t mode  = (obj->adc & (1 << ADC_B_CHANNEL_SHIFT)) ?
+                                 kAdcChannelMuxB : kAdcChannelMuxA;
+    adc_hal_disable(instance, mode);
+    adc_hal_set_group_mux(instance, mode);
+    adc_hal_enable(instance, mode, (adc_channel_mode_t)(obj->adc & 0xF), false);
 }
 
 uint16_t analogin_read_u16(analogin_t *obj) {
-    adc_start_conversion(obj->adc >> ADC_SHIFT, &obj->channel_cfg);
-    return (uint16_t)adc_get_conversion_value(obj->adc >> ADC_SHIFT, &obj->channel_cfg);
+    uint32_t instance = obj->adc >> ADC_INSTANCE_SHIFT;
+    adc_group_mux_mode_t mode  = (obj->adc & (1 << ADC_B_CHANNEL_SHIFT)) ?
+                                 kAdcChannelMuxB : kAdcChannelMuxA;
+    adc_hal_enable(instance, mode, (adc_channel_mode_t)(obj->adc & 0xF), false);
+    while (!adc_hal_is_conversion_completed(instance, mode));
+    return adc_hal_get_conversion_value(instance, mode);
 }
 
 float analogin_read(analogin_t *obj) {

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogout_api.c

@@ -18,7 +18,6 @@
 #include "cmsis.h"
 #include "pinmap.h"
 #include "error.h"
-#include "fsl_gpio_driver.h"
 
 #define RANGE_12BIT     0xFFF
 

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_api.c

@@ -15,7 +15,9 @@
  */
 #include "gpio_api.h"
 #include "pinmap.h"
-#include "fsl_gpio_driver.h"
+#include "fsl_port_hal.h"
+#include "fsl_gpio_hal.h"
+#include "fsl_sim_hal.h"
 
 uint32_t gpio_set(PinName pin) {
     uint32_t pin_num = pin & 0xFF;
@@ -29,38 +31,36 @@ void gpio_init(gpio_t *obj, PinName pin, PinDirection direction) {
         return;
     }
 
-    if (direction) {
-        gpio_output_pin_t output = {0};
+    obj->pinName = pin;
+    uint32_t port = pin >> GPIO_PORT_SHIFT;
+    uint32_t pin_num = pin & 0xFF;
+    clock_hal_set_gate(kSimClockModulePORT, port, true);
 
-        obj->pinName = pin;
-        output.pinName = pin;
-        output.config.outputLogic = 0;
-        output.config.slewRate = kPortSlowSlewRate;
-        output.config.driveStrength = kPortLowDriveStrength,
-        sdk_gpio_output_pin_init((const gpio_output_pin_t *)&output);
+    if (direction) {
+        gpio_hal_set_pin_direction(port, pin_num, kGpioDigitalOutput);
+        gpio_hal_write_pin_output(port, pin_num, 1);
     } else {
-        gpio_input_pin_t input = {0};
-        obj->pinName = pin;
-        input.pinName = pin;
-        input.config.isPullEnable = true;
-        input.config.pullSelect = kPortPullUp;
-        input.config.isPassiveFilterEnabled = false;
-        input.config.interrupt = kPortIntDisabled;
-        sdk_gpio_input_pin_init((const gpio_input_pin_t *)&input);
+        gpio_hal_set_pin_direction(port, pin_num, kGpioDigitalInput);
+        port_hal_configure_pull(port, pin_num, true);
+        port_hal_pull_select(port, pin_num, kPortPullUp);
     }
+    port_hal_mux_control(port, pin_num, kPortMuxAsGpio);
 }
 
 void gpio_mode(gpio_t *obj, PinMode mode) {
     pin_mode(obj->pinName, mode);
 }
 
 void gpio_dir(gpio_t *obj, PinDirection direction) {
+    uint32_t port = obj->pinName >> GPIO_PORT_SHIFT;
+    uint32_t pin_num = obj->pinName & 0xFF;
+
     switch (direction) {
         case PIN_INPUT:
-            sdk_gpio_set_pin_direction(obj->pinName, kGpioDigitalInput);
+            gpio_hal_set_pin_direction(port, pin_num, kGpioDigitalInput);
             break;
         case PIN_OUTPUT:
-            sdk_gpio_set_pin_direction(obj->pinName, kGpioDigitalOutput);
+            gpio_hal_set_pin_direction(port, pin_num, kGpioDigitalOutput);
             break;
     }
 }

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_irq_api.c

@@ -17,7 +17,6 @@
 #include "cmsis.h"
 
 #include "gpio_irq_api.h"
-#include "fsl_gpio_driver.h"
 #include "fsl_gpio_hal.h"
 #include "fsl_port_hal.h"
 #include "error.h"

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/gpio_object.h

@@ -16,7 +16,7 @@
 #ifndef MBED_GPIO_OBJECT_H
 #define MBED_GPIO_OBJECT_H
 
-#include "fsl_gpio_driver.h"
+#include "fsl_gpio_hal.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,11 +27,17 @@ typedef struct {
 } gpio_t;
 
 static inline void gpio_write(gpio_t *obj, int value) {
-    sdk_gpio_write_pin_output(obj->pinName, (uint32_t)value);
+    uint32_t port = obj->pinName >> GPIO_PORT_SHIFT;
+    uint32_t pin = obj->pinName & 0xFF;
+
+    gpio_hal_write_pin_output(port, pin, value);
 }
 
 static inline int gpio_read(gpio_t *obj) {
-    return (int)sdk_gpio_read_pin_input(obj->pinName);
+    uint32_t port = obj->pinName >> GPIO_PORT_SHIFT;
+    uint32_t pin = obj->pinName & 0xFF;
+
+    return (int)gpio_hal_read_pin_input(port, pin);
 }
 
 #ifdef __cplusplus

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/objects.h

@@ -20,7 +20,6 @@
 #include "PortNames.h"
 #include "PeripheralNames.h"
 #include "PinNames.h"
-#include "fsl_adc_driver.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,7 +46,6 @@ struct serial_s {
 
 struct analogin_s {
     ADCName adc;
-    adc_channel_config_t channel_cfg;
 };
 
 struct i2c_s {

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/pinmap.c

@@ -16,6 +16,7 @@
 #include "pinmap.h"
 #include "error.h"
 #include "fsl_clock_manager.h"
+#include "fsl_port_hal.h"
 
 void pin_function(PinName pin, int function) {
     if (pin == (PinName)NC) {

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/us_ticker.c

@@ -16,7 +16,7 @@
 #include <stddef.h>
 #include "us_ticker_api.h"
 #include "PeripheralNames.h"
-#include "fsl_pit_driver.h"
+#include "fsl_pit_hal.h"
 #include "fsl_sim_hal.h"
 #include "fsl_clock_manager.h"
 #include "fsl_clock_configs.h"