K64F - pins addition to mbed HAL, uart - 4 instances, fix i2c instance which was not stored

0xc0170 · 0xc0170 · commit 957573e2cd42 · 2014-03-25T11:46:57.000+01:00
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/PeripheralNames.h b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/PeripheralNames.h
@@ -30,6 +30,8 @@ typedef enum {
     UART_0 = 0,
     UART_1 = 1,
     UART_2 = 2,
+    UART_3 = 3,
+    UART_4 = 4,
 } UARTName;
 
 #define STDIO_UART_TX     USBTX
@@ -38,6 +40,8 @@ typedef enum {
 
 typedef enum {
     I2C_0 = 0,
+    I2C_1 = 1,
+    I2C_2 = 2,
 } I2CName;
 
 #define TPM_SHIFT   8
@@ -81,6 +85,9 @@ typedef enum {
     ADC0_SE13 = (0 << ADC_INSTANCE_SHIFT) | 13,
     ADC0_SE14 = (0 << ADC_INSTANCE_SHIFT) | 14,
     ADC0_SE15 = (0 << ADC_INSTANCE_SHIFT) | 15,
+    ADC0_SE16 = (0 << ADC_INSTANCE_SHIFT) | 16,
+    ADC0_SE17 = (0 << ADC_INSTANCE_SHIFT) | 17,
+    ADC0_SE18 = (0 << ADC_INSTANCE_SHIFT) | 18,
     ADC1_SE4b = (1 << ADC_INSTANCE_SHIFT) | 4,
     ADC1_SE5b = (1 << ADC_INSTANCE_SHIFT) | 5,
     ADC1_SE6b = (1 << ADC_INSTANCE_SHIFT) | 6,
@@ -90,7 +97,10 @@ typedef enum {
     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
+    ADC1_SE15 = (1 << ADC_INSTANCE_SHIFT) | 15,
+    ADC1_SE16 = (1 << ADC_INSTANCE_SHIFT) | 16,
+    ADC1_SE17 = (1 << ADC_INSTANCE_SHIFT) | 17,
+    ADC1_SE18 = (1 << ADC_INSTANCE_SHIFT) | 18,
 } ADCName;
 
 typedef enum {
@@ -100,6 +110,8 @@ typedef enum {
 
 typedef enum {
     SPI_0 = 0,
+    SPI_1 = 1,
+    SPI_2 = 2,
 } SPIName;
 
 #ifdef __cplusplus
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/analogin_api.c
@@ -25,8 +25,26 @@
 #define MAX_FADC 6000000
 
 static const PinMap PinMap_ADC[] = {
-    {PTC0, ADC0_SE14, 0},
-    {NC,   NC,        0}
+    {PTC2,  ADC0_SE4b, 0},
+    {PTC8,  ADC1_SE4b, 0},
+    {PTC9,  ADC0_SE5b, 0},
+    {PTD1,  ADC0_SE5b, 0},
+    {PTC10, ADC0_SE6b, 0},
+    {PTD5,  ADC0_SE6b, 0},
+    {PTC11, ADC0_SE7b, 0},
+    {PTD7,  ADC0_SE7b, 0},
+    {PTB0 , ADC0_SE8 , 0},
+    {PTB1 , ADC0_SE9 , 0},
+    {PTB2 , ADC0_SE12, 0},
+    {PTB3 , ADC0_SE13, 0},
+    {PTC0 , ADC0_SE14, 0},
+    {PTB10, ADC1_SE14, 0},
+    {PTB11, ADC1_SE15, 0},
+    {PTC1 , ADC0_SE15, 0},
+    {PTE24, ADC0_SE17, 0},
+    {PTA17, ADC1_SE17, 0},
+    {PTE25, ADC0_SE18, 0},
+    {NC   , NC       , 0}
 };
 
 void analogin_init(analogin_t *obj, PinName pin) {
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/i2c_api.c
@@ -23,11 +23,24 @@
 
 static const PinMap PinMap_I2C_SDA[] = {
     {PTE25, I2C_0, 5},
+    {PTB1 , I2C_0, 2},
+    {PTB3 , I2C_0, 2},
+    {PTC11, I2C_1, 2},
+    {PTA13, I2C_2, 5},
+    {PTD3 , I2C_0, 7},
+    {PTE0 , I2C_1, 6},
     {NC   , NC   , 0}
 };
 
 static const PinMap PinMap_I2C_SCL[] = {
     {PTE24, I2C_0, 5},
+    {PTB0 , I2C_0, 2},
+    {PTB2 , I2C_0, 2},
+    {PTC10, I2C_1, 2},
+    {PTA12, I2C_2, 5},
+    {PTA14, I2C_2, 5},
+    {PTD2 , I2C_0, 7},
+    {PTE1 , I2C_1, 6},
     {NC   , NC   , 0}
 };
 
@@ -36,13 +49,13 @@ static uint8_t first_read;
 void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
     uint32_t i2c_sda = pinmap_peripheral(sda, PinMap_I2C_SDA);
     uint32_t i2c_scl = pinmap_peripheral(scl, PinMap_I2C_SCL);
-    uint32_t i2c_instance = pinmap_merge(i2c_sda, i2c_scl);
-    if ((int)i2c_instance == NC) {
+    obj->instance = pinmap_merge(i2c_sda, i2c_scl);
+    if ((int)obj->instance == NC) {
         error("I2C pin mapping failed");
     }
 
-    clock_manager_set_gate(kClockModuleI2C, i2c_instance, true);
-    i2c_hal_enable(i2c_instance);
+    clock_manager_set_gate(kClockModuleI2C, obj->instance, true);
+    i2c_hal_enable(obj->instance);
     i2c_frequency(obj, 100000);
 
     pinmap_pinout(sda, PinMap_I2C_SDA);
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/serial_api.c
@@ -29,20 +29,39 @@
 
 /* TODO:
     putchar/getchar 9 and 10 bits support
-    5 UARTS implementation
 */
 
 static const PinMap PinMap_UART_TX[] = {
     {PTB17, UART_0, 3},
+    {PTC17, UART_3, 3},
+    {PTD7 , UART_0, 3},
+    {PTD3 , UART_2, 3},
+    {PTC4 , UART_1, 3},
+    {PTC15, UART_4, 3},
+    {PTB11, UART_3, 3},
+    {PTA14, UART_0, 3},
+    {PTE24, UART_4, 3},
+    {PTE4 , UART_3, 3},
+    {PTE0,  UART_1, 3},
     {NC  ,  NC    , 0}
 };
 
 static const PinMap PinMap_UART_RX[] = {
     {PTB16, UART_0, 3},
+    {PTE1 , UART_1, 3},
+    {PTE5 , UART_3, 3},
+    {PTE25, UART_4, 3},
+    {PTA15, UART_0, 3},
+    {PTC16, UART_3, 3},
+    {PTB10, UART_3, 3},
+    {PTC3 , UART_1, 3},
+    {PTC14, UART_4, 3},
+    {PTD2 , UART_2, 3},
+    {PTC6 , UART_0, 3},
     {NC  ,  NC    , 0}
 };
 
-#define UART_NUM    3
+#define UART_NUM    4
 
 static uint32_t serial_irq_ids[UART_NUM] = {0};
 static uart_irq_handler irq_handler;
@@ -65,17 +84,11 @@ static uint32_t serial_get_clock(uint32_t uart_instance)
 void serial_init(serial_t *obj, PinName tx, PinName rx) {
     uint32_t uart_tx = pinmap_peripheral(tx, PinMap_UART_TX);
     uint32_t uart_rx = pinmap_peripheral(rx, PinMap_UART_RX);
-    uint32_t uart_instance = (UARTName)pinmap_merge(uart_tx, uart_rx);
-    if ((int)uart_instance == NC) {
+    obj->index = (UARTName)pinmap_merge(uart_tx, uart_rx);
+    if ((int)obj->index == NC) {
         error("Serial pinout mapping failed");
     }
 
-    switch (uart_instance) {
-        case UART_0: obj->index = 0; break;
-        case UART_1: obj->index = 1; break;
-        case UART_2: obj->index = 2; break;
-    }
-
     uart_config_t uart_config;
     uart_config.baudRate = 9600;
     uart_config.bitCountPerChar = kUart8BitsPerChar;
@@ -95,7 +108,7 @@ void serial_init(serial_t *obj, PinName tx, PinName rx) {
     pin_mode(tx, PullUp);
     pin_mode(rx, PullUp);
 
-    if (uart_instance == STDIO_UART) {
+    if (obj->index == STDIO_UART) {
         stdio_uart_inited = 1;
         memcpy(&stdio_uart, obj, sizeof(serial_t));
     }
@@ -141,6 +154,14 @@ void uart2_irq() {
     uart_irq(uart_hal_is_transmit_data_register_empty(2), uart_hal_is_receive_data_register_full(2), 2);
 }
 
+void uart3_irq() {
+    uart_irq(uart_hal_is_transmit_data_register_empty(3), uart_hal_is_receive_data_register_full(3), 3);
+}
+
+void uart4_irq() {
+    uart_irq(uart_hal_is_transmit_data_register_empty(4), uart_hal_is_receive_data_register_full(4), 4);
+}
+
 void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) {
     irq_handler = handler;
     serial_irq_ids[obj->index] = id;
@@ -154,6 +175,8 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
         case 0: irq_n=UART0_RX_TX_IRQn; vector = (uint32_t)&uart0_irq; break;
         case 1: irq_n=UART1_RX_TX_IRQn; vector = (uint32_t)&uart1_irq; break;
         case 2: irq_n=UART2_RX_TX_IRQn; vector = (uint32_t)&uart2_irq; break;
+        case 3: irq_n=UART3_RX_TX_IRQn; vector = (uint32_t)&uart3_irq; break;
+        case 4: irq_n=UART4_RX_TX_IRQn; vector = (uint32_t)&uart4_irq; break;
     }
 
     if (enable) {
diff --git a/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c b/libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_K64F/spi_api.c
@@ -24,23 +24,51 @@
 #include "fsl_dspi_hal.h"
 
 static const PinMap PinMap_SPI_SCLK[] = {
-    {PTD1, SPI_0, 2},
-    {NC  , NC   , 0}
+    {PTD1 , SPI_0, 2},
+    {PTE2 , SPI_1, 2},
+    {PTA15, SPI_0, 2},
+    {PTB11, SPI_1, 2},
+    {PTB21, SPI_2, 2},
+    {PTC5 , SPI_0, 2},
+    {PTD5 , SPI_1, 7},
+    {NC   , NC   , 0}
 };
 
 static const PinMap PinMap_SPI_MOSI[] = {
-    {PTD2, SPI_0, 2},
-    {NC  , NC   , 0}
+    {PTD2 , SPI_0, 2},
+    {PTE1 , SPI_1, 2},
+    {PTE3 , SPI_1, 7},
+    {PTA16, SPI_0, 2},
+    {PTB16, SPI_1, 2},
+    {PTB22, SPI_2, 2},
+    {PTC6 , SPI_0, 2},
+    {PTD2 , SPI_0, 2},
+    {PTD6 , SPI_0, 7},
+    {NC   , NC   , 0}
 };
 
 static const PinMap PinMap_SPI_MISO[] = {
-    {PTD3, SPI_0, 2},
-    {NC  , NC   , 0}
+    {PTD3 , SPI_0, 2},
+    {PTE1 , SPI_1, 7},
+    {PTE3 , SPI_1, 2},
+    {PTA17, SPI_0, 2},
+    {PTB17, SPI_1, 2},
+    {PTB23, SPI_2, 2},
+    {PTC7 , SPI_0, 2},
+    {PTD3 , SPI_0, 2},
+    {PTD7 , SPI_1, 7},
+    {NC   , NC   , 0}
 };
 
 static const PinMap PinMap_SPI_SSEL[] = {
-    {PTD0, SPI_0, 2},
-    {NC  , NC   , 0}
+    {PTD0 , SPI_0, 2},
+    {PTE4 , SPI_1, 2},
+    {PTA14, SPI_0, 2},
+    {PTB10, SPI_1, 2},
+    {PTB20, SPI_2, 2},
+    {PTC4 , SPI_0, 2},
+    {PTD4 , SPI_1, 7},
+    {NC   , NC   , 0}
 };
 
 static void spi_set_delays(uint32_t instance) {
