[FIX] K64F - adc, sgtl driver updates

Author: 0xc0170

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

@@ -19,27 +19,27 @@
 #include "pinmap.h"
 #include "error.h"
 #include "fsl_adc_driver.h"
-
+#include "PeripheralNames.h"
+ 
 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_config_t module_config;
+    adc_user_config_t module_config;
     uint32_t instance = obj->adc >> ADC_SHIFT;
 
     module_config.clockSourceMode = kAdcClockSourceBusClk;
     module_config.clockSourceDividerMode = kAdcClockDivider8;
     module_config.resolutionMode = kAdcSingleDiff16;
     module_config.referenceVoltageMode = kAdcVoltageVref;
-    module_config.isContinuousEnabled = true;
-    module_config.calibrationParam = NULL;
+    module_config.isContinuousEnabled = false;
 
     adc_init(instance, &module_config);
 
-    obj->channel_cfg.channelId =(adc_channel_mode_t)(obj->adc & 0x7F);
+    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;

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

@@ -0,0 +1,87 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "analogout_api.h"
+
+#include "cmsis.h"
+#include "pinmap.h"
+#include "error.h"
+#include "fsl_gpio_driver.h"
+
+#define RANGE_12BIT     0xFFF
+
+const PinMap PinMap_DAC[] = {
+    {PTE23, DAC_0, 0},
+    {NC   , NC   , 0}
+};
+
+void analogout_init(dac_t *obj, PinName pin) {
+    obj->dac = (DACName)pinmap_peripheral(pin, PinMap_DAC);
+    if (obj->dac == (DACName)NC) {
+        error("DAC pin mapping failed");
+    }
+
+    SIM->SCGC6 |= SIM_SCGC6_DAC0_MASK;
+
+    uint32_t port = (uint32_t)pin >> GPIO_PORT_SHIFT;
+    SIM->SCGC5 |= 1 << (SIM_SCGC5_PORTA_SHIFT + port);
+
+    DAC0->DAT[obj->dac].DATH = 0;
+    DAC0->DAT[obj->dac].DATL = 0;
+
+    DAC0->C1 = DAC_C1_DACBFMD_MASK;     // One-Time Scan Mode
+
+    DAC0->C0 = DAC_C0_DACEN_MASK        // Enable
+             | DAC_C0_DACSWTRG_MASK;    // Software Trigger
+
+    pinmap_pinout(pin, PinMap_DAC);
+
+    analogout_write_u16(obj, 0);
+}
+
+void analogout_free(dac_t *obj) {}
+
+static inline void dac_write(dac_t *obj, int value) {
+    DAC0->DAT[obj->dac].DATL = (uint8_t)( value       & 0xFF);
+    DAC0->DAT[obj->dac].DATH = (uint8_t)((value >> 8) & 0xFF);
+}
+
+static inline int dac_read(dac_t *obj) {
+    return ((DAC0->DAT[obj->dac].DATH << 8) | DAC0->DAT[obj->dac].DATL);
+}
+
+void analogout_write(dac_t *obj, float value) {
+    if (value < 0.0f) {
+        dac_write(obj, 0);
+    } else if (value > 1.0f) {
+        dac_write(obj, RANGE_12BIT);
+    } else {
+        dac_write(obj, value * (float)RANGE_12BIT);
+    }
+}
+
+void analogout_write_u16(dac_t *obj, uint16_t value) {
+    dac_write(obj, value >> 4); // 12-bit
+}
+
+float analogout_read(dac_t *obj) {
+    uint32_t value = dac_read(obj);
+    return (float)value * (1.0f / (float)RANGE_12BIT);
+}
+
+uint16_t analogout_read_u16(dac_t *obj) {
+    uint32_t value = dac_read(obj); // 12-bit
+    return (value << 4) | ((value >> 8) & 0x003F);
+}

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

@@ -23,7 +23,7 @@
 #define DEVICE_INTERRUPTIN      1
 
 #define DEVICE_ANALOGIN         1
-#define DEVICE_ANALOGOUT        0
+#define DEVICE_ANALOGOUT        1
 
 #define DEVICE_SERIAL           1
 

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

@@ -58,6 +58,10 @@ struct spi_s {
     uint32_t instance;
 };
 
+struct dac_s {
+    DACName dac;
+};
+
 #include "gpio_object.h"
 
 #ifdef __cplusplus

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/boards/common/sgtl5000/fsl_sgtl5000_driver.h

@@ -123,7 +123,7 @@ extern "C" {
 /*!
  * @brief sgtl5000 initialize function.
  *
- * This function would call sgtl_i2c_init(), and in this fuction, some configurations
+ * This function would call sgtl_i2c_init(), and in this function, some configurations
  * are fixed. The second parameter is NULL to sgtl5000 in this version. If users want
  * to change the settings, they have to use sgtl_write_reg() or sgtl_modify_reg()
  * to set the register value of sgtl5000.
@@ -147,7 +147,7 @@ sgtl_status_t sgtl_i2c_init(sgtl_handler_t *handler);
 sgtl_status_t sgtl_deinit(sgtl_handler_t *handler);
 
 /*!
- * @brief Configure the data foramt of audio data.
+ * @brief Configure the data format of audio data.
  *
  * This function would configure the registers about the sample rate, bit depths.
  * @param handler Sgtl5000 handler structure pointer.

libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/boards/common/sgtl5000/src/fsl_sgtl5000_driver.c

@@ -32,6 +32,7 @@
 /*******************************************************************************
  *Code
  ******************************************************************************/
+ static volatile uint32_t i2c_state = 0;
 
 /*FUNCTION**********************************************************************
  *
@@ -41,7 +42,11 @@
  *END**************************************************************************/
 sgtl_status_t sgtl_init(sgtl_handler_t *handler, void *codec_config)
 {
-    sgtl_i2c_init(handler);
+    if(i2c_state == 0)
+    {
+        sgtl_i2c_init(handler);
+    }
+    i2c_state ++;
     /*
     * Power Supply Configuration
     * NOTE: This next 2 Write calls is needed ONLY if VDDD is internally driven by the chip.
@@ -185,7 +190,11 @@ sgtl_status_t sgtl_i2c_init(sgtl_handler_t *handler)
  *END**************************************************************************/
 sgtl_status_t sgtl_deinit(sgtl_handler_t *handler)
 {
-    i2c_master_shutdown(&handler->master);
+    i2c_state --;
+    if(i2c_state == 0)
+    {
+        i2c_master_shutdown(&handler->master);
+    }
     return kStatus_SGTL_Success;
 }
 
@@ -304,7 +313,7 @@ sgtl_status_t sgtl_write_reg(sgtl_handler_t *handler, uint16_t reg, uint16_t val
     buff[2] = (val & 0xFF00U) >> 8U;
     buff[3] = val & 0xFF;
 
-    i2c_master_transfer(master, device , kI2CWrite, 0, 0, buff, 4, &transferred, kSyncWaitForever);
+    i2c_master_transfer(master, device , kI2CWrite, true, 0, 0, buff, 4, &transferred, kSyncWaitForever);
     return kStatus_SGTL_Success;
 }
 
@@ -324,12 +333,12 @@ sgtl_status_t sgtl_read_reg(sgtl_handler_t *handler, uint16_t reg, uint16_t *val
     uint8_t retval = 0;
     buff[0] = (reg & 0xFF00U) >> 8U;
     buff[1] = reg & 0xFF;
-    retval = i2c_master_transfer(master, device , kI2CWrite, 0, 0, buff, 2, &transferred, kSyncWaitForever);
+    retval = i2c_master_transfer(master, device , kI2CWrite, true, 0, 0, buff, 2, &transferred, kSyncWaitForever);
     if(retval != kStatus_SGTL_Success)
     {
         return kStatus_SGTL_Fail;
     }
-    retval = i2c_master_transfer(master, device , kI2CRead, 0, 0, data, 2, &transferred, kSyncWaitForever);
+    retval = i2c_master_transfer(master, device , kI2CRead, true, 0, 0, data, 2, &transferred, kSyncWaitForever);
     *val = (uint16_t)(((uint32_t)data[0] << 8U) | (uint32_t)data[1]); 
     return kStatus_SGTL_Success;
 }