Add pinmaps to Ameba

c1728p9 · c1728p9 · commit c7a19461b4cd · 2019-02-08T09:10:47.000-06:00
Add testing pinmaps to the Ameba along with fixing build errors.
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/PeripheralPins.h b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/PeripheralPins.h
@@ -26,6 +26,8 @@ extern "C" {
 // for spi_api.c
 extern const PinMap PinMap_SSI_MOSI[];
 extern const PinMap PinMap_SSI_MISO[];
+extern const PinMap PinMap_SSI_SCLK[];
+extern const PinMap PinMap_SSI_SSEL[];
 
 // for serial_api.c
 extern const PinMap PinMap_UART_TX[];
@@ -38,6 +40,12 @@ extern const PinMap PinMap_PWM[];
 extern const PinMap PinMap_I2C_SDA[];
 extern const PinMap PinMap_I2C_SCL[];
 
+// for analogin_api.c
+extern const PinMap PinMap_ADC[];
+
+// for analogout_api.c
+extern const PinMap PinMap_DAC[];
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/TARGET_RTL8195A/PeripheralPins.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/TARGET_RTL8195A/PeripheralPins.c
@@ -41,6 +41,31 @@ const PinMap PinMap_SSI_MISO[] = {
     {NC,    NC,     0}
 };
 
+// For testing only
+const PinMap PinMap_SSI_SCLK[] = {
+    {PC_1,  RTL_PIN_PERI(SPI0, 0, S1), /* Unused */ 0},
+    {PA_2,  RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},
+    {PA_2,  RTL_PIN_PERI(SPI1, 1, S1), /* Unused */ 0},
+    {PA_2,  RTL_PIN_PERI(SPI1, 1, S2), /* Unused */ 0},
+    {PD_5,  RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},
+    {PD_5,  RTL_PIN_PERI(SPI1, 1, S1), /* Unused */ 0},
+    {PD_5,  RTL_PIN_PERI(SPI1, 1, S2), /* Unused */ 0},
+
+    {NC,    NC,     0}
+};
+
+// For testing only
+const PinMap PinMap_SSI_SSEL[] = {
+    {PE_5,  RTL_PIN_PERI(SPI0, 0, S2), /* Unused */ 0},
+    {PC_5,  RTL_PIN_PERI(SPI0, 0, S2), /* Unused */ 0},
+    {PC_4,  RTL_PIN_PERI(SPI0, 0, S1), /* Unused */ 0},
+    {PC_0,  RTL_PIN_PERI(SPI0, 0, S0), /* Unused */ 0},
+    {PA_4,  RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},
+    {PD_4,  RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},
+
+    {NC,    NC,     0}
+};
+
 // for serial_api.c
 const PinMap PinMap_UART_TX[] = {
     {PC_3,  RTL_PIN_PERI(UART0, 0, S0), RTL_PIN_FUNC(UART0, S0)},
@@ -139,3 +164,19 @@ const PinMap PinMap_I2C_SCL[] = {
 
     {NC,    NC,     0}
 };
+
+// For testing only
+const PinMap PinMap_ADC[] = {
+    {A1,    /* Unused */ 0, /* Unused */ 0},
+    {A2,    /* Unused */ 0, /* Unused */ 0},
+
+    {NC,    NC,     0}
+};
+
+// For testing only
+const PinMap PinMap_DAC[] = {
+    {DA_0,  /* Unused */ 0, /* Unused */ 0},
+    {DA_1,  /* Unused */ 0, /* Unused */ 0},
+
+    {NC,    NC,     0}
+};
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/analogin_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/analogin_api.c
@@ -18,6 +18,7 @@
 #include "PinNames.h"
 #include "hal_adc.h"
 #include "analogin_api.h"
+#include "PeripheralPins.h"
 
 #ifdef CONFIG_MBED_ENABLED
 #include "platform_stdlib.h"
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/analogout_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/analogout_api.c
@@ -21,6 +21,7 @@
 
 #include "cmsis.h"
 #include "pinmap.h"
+#include "PeripheralPins.h"
 #include <string.h>
 
 #define DAC_POSITIVE_FULL_SCALE  0x7E0
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/serial_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/serial_api.c
@@ -542,11 +542,23 @@ const PinMap *serial_rx_pinmap()
 
 const PinMap *serial_cts_pinmap()
 {
+#if !DEVICE_SERIAL_FC
+    static const PinMap PinMap_UART_CTS[] = {
+        {NC, NC, 0}
+    };
+#endif
+
     return PinMap_UART_CTS;
 }
 
 const PinMap *serial_rts_pinmap()
 {
+#if !DEVICE_SERIAL_FC
+    static const PinMap PinMap_UART_RTS[] = {
+        {NC, NC, 0}
+    };
+#endif
+
     return PinMap_UART_RTS;
 }
 
diff --git a/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/spi_api.c b/targets/TARGET_Realtek/TARGET_AMEBA/TARGET_MCU_RTL8195A/spi_api.c
@@ -67,6 +67,31 @@ static const PinMap PinMap_SSI_MISO[] = {
     {PD_3,  RTL_PIN_PERI(SPI2, 2, S2), RTL_PIN_FUNC(SPI2, S2)},
     {NC,    NC,     0}
 };
+
+// For testing only
+static const PinMap PinMap_SSI_SCLK[] = {
+    {PC_1,  RTL_PIN_PERI(SPI0, 0, S1), /* Unused */ 0},
+    {PA_2,  RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},
+    {PA_2,  RTL_PIN_PERI(SPI1, 1, S1), /* Unused */ 0},
+    {PA_2,  RTL_PIN_PERI(SPI1, 1, S2), /* Unused */ 0},
+    {PD_5,  RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},
+    {PD_5,  RTL_PIN_PERI(SPI1, 1, S1), /* Unused */ 0},
+    {PD_5,  RTL_PIN_PERI(SPI1, 1, S2), /* Unused */ 0},
+
+    {NC,    NC,     0}
+};
+
+// For testing only
+static const PinMap PinMap_SSI_SSEL[] = {
+    {PE_5,  RTL_PIN_PERI(SPI0, 0, S2), /* Unused */ 0},
+    {PC_5,  RTL_PIN_PERI(SPI0, 0, S2), /* Unused */ 0},
+    {PC_4,  RTL_PIN_PERI(SPI0, 0, S1), /* Unused */ 0},
+    {PC_0,  RTL_PIN_PERI(SPI0, 0, S0), /* Unused */ 0},
+    {PA_4,  RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},
+    {PD_4,  RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},
+
+    {NC,    NC,     0}
+};
 #endif
 
 void spi_init (spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel)
@@ -375,41 +400,41 @@ void spi_rx_done_callback(VOID *obj)
 
 const PinMap *spi_master_mosi_pinmap()
 {
-    return PinMap_SPI_MOSI;
+    return PinMap_SSI_MOSI;
 }
 
 const PinMap *spi_master_miso_pinmap()
 {
-    return PinMap_SPI_MISO;
+    return PinMap_SSI_MISO;
 }
 
 const PinMap *spi_master_clk_pinmap()
 {
-    return PinMap_SPI_SCLK;
+    return PinMap_SSI_SCLK;
 }
 
 const PinMap *spi_master_cs_pinmap()
 {
-    return PinMap_SPI_SSEL;
+    return PinMap_SSI_SSEL;
 }
 
 const PinMap *spi_slave_mosi_pinmap()
 {
-    return PinMap_SPI_MOSI;
+    return PinMap_SSI_MOSI;
 }
 
 const PinMap *spi_slave_miso_pinmap()
 {
-    return PinMap_SPI_MISO;
+    return PinMap_SSI_MISO;
 }
 
 const PinMap *spi_slave_clk_pinmap()
 {
-    return PinMap_SPI_SCLK;
+    return PinMap_SSI_SCLK;
 }
 
 const PinMap *spi_slave_cs_pinmap()
 {
-    return PinMap_SPI_SSEL;
+    return PinMap_SSI_SSEL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -542,11 +542,23 @@ const PinMap *serial_rx_pinmap()`
`542`	`542`
`543`	`543`	`const PinMap *serial_cts_pinmap()`
`544`	`544`	`{`
	`545`	`+#if !DEVICE_SERIAL_FC`
	`546`	`+ static const PinMap PinMap_UART_CTS[] = {`
	`547`	`+ {NC, NC, 0}`
	`548`	`+ };`
	`549`	`+#endif`
	`550`	`+`
`545`	`551`	`return PinMap_UART_CTS;`
`546`	`552`	`}`
`547`	`553`
`548`	`554`	`const PinMap *serial_rts_pinmap()`
`549`	`555`	`{`
	`556`	`+#if !DEVICE_SERIAL_FC`
	`557`	`+ static const PinMap PinMap_UART_RTS[] = {`
	`558`	`+ {NC, NC, 0}`
	`559`	`+ };`
	`560`	`+#endif`
	`561`	`+`
`550`	`562`	`return PinMap_UART_RTS;`
`551`	`563`	`}`
`552`	`564`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,31 @@ static const PinMap PinMap_SSI_MISO[] = {`
`67`	`67`	`{PD_3, RTL_PIN_PERI(SPI2, 2, S2), RTL_PIN_FUNC(SPI2, S2)},`
`68`	`68`	`{NC, NC, 0}`
`69`	`69`	`};`
	`70`	`+`
	`71`	`+// For testing only`
	`72`	`+static const PinMap PinMap_SSI_SCLK[] = {`
	`73`	`+ {PC_1, RTL_PIN_PERI(SPI0, 0, S1), /* Unused */ 0},`
	`74`	`+ {PA_2, RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},`
	`75`	`+ {PA_2, RTL_PIN_PERI(SPI1, 1, S1), /* Unused */ 0},`
	`76`	`+ {PA_2, RTL_PIN_PERI(SPI1, 1, S2), /* Unused */ 0},`
	`77`	`+ {PD_5, RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},`
	`78`	`+ {PD_5, RTL_PIN_PERI(SPI1, 1, S1), /* Unused */ 0},`
	`79`	`+ {PD_5, RTL_PIN_PERI(SPI1, 1, S2), /* Unused */ 0},`
	`80`	`+`
	`81`	`+ {NC, NC, 0}`
	`82`	`+};`
	`83`	`+`
	`84`	`+// For testing only`
	`85`	`+static const PinMap PinMap_SSI_SSEL[] = {`
	`86`	`+ {PE_5, RTL_PIN_PERI(SPI0, 0, S2), /* Unused */ 0},`
	`87`	`+ {PC_5, RTL_PIN_PERI(SPI0, 0, S2), /* Unused */ 0},`
	`88`	`+ {PC_4, RTL_PIN_PERI(SPI0, 0, S1), /* Unused */ 0},`
	`89`	`+ {PC_0, RTL_PIN_PERI(SPI0, 0, S0), /* Unused */ 0},`
	`90`	`+ {PA_4, RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},`
	`91`	`+ {PD_4, RTL_PIN_PERI(SPI1, 1, S0), /* Unused */ 0},`
	`92`	`+`
	`93`	`+ {NC, NC, 0}`
	`94`	`+};`
`70`	`95`	`#endif`
`71`	`96`
`72`	`97`	`void spi_init (spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel)`
`@@ -375,41 +400,41 @@ void spi_rx_done_callback(VOID *obj)`
`375`	`400`
`376`	`401`	`const PinMap *spi_master_mosi_pinmap()`
`377`	`402`	`{`
`378`		`- return PinMap_SPI_MOSI;`
	`403`	`+ return PinMap_SSI_MOSI;`
`379`	`404`	`}`
`380`	`405`
`381`	`406`	`const PinMap *spi_master_miso_pinmap()`
`382`	`407`	`{`
`383`		`- return PinMap_SPI_MISO;`
	`408`	`+ return PinMap_SSI_MISO;`
`384`	`409`	`}`
`385`	`410`
`386`	`411`	`const PinMap *spi_master_clk_pinmap()`
`387`	`412`	`{`
`388`		`- return PinMap_SPI_SCLK;`
	`413`	`+ return PinMap_SSI_SCLK;`
`389`	`414`	`}`
`390`	`415`
`391`	`416`	`const PinMap *spi_master_cs_pinmap()`
`392`	`417`	`{`
`393`		`- return PinMap_SPI_SSEL;`
	`418`	`+ return PinMap_SSI_SSEL;`
`394`	`419`	`}`
`395`	`420`
`396`	`421`	`const PinMap *spi_slave_mosi_pinmap()`
`397`	`422`	`{`
`398`		`- return PinMap_SPI_MOSI;`
	`423`	`+ return PinMap_SSI_MOSI;`
`399`	`424`	`}`
`400`	`425`
`401`	`426`	`const PinMap *spi_slave_miso_pinmap()`
`402`	`427`	`{`
`403`		`- return PinMap_SPI_MISO;`
	`428`	`+ return PinMap_SSI_MISO;`
`404`	`429`	`}`
`405`	`430`
`406`	`431`	`const PinMap *spi_slave_clk_pinmap()`
`407`	`432`	`{`
`408`		`- return PinMap_SPI_SCLK;`
	`433`	`+ return PinMap_SSI_SCLK;`
`409`	`434`	`}`
`410`	`435`
`411`	`436`	`const PinMap *spi_slave_cs_pinmap()`
`412`	`437`	`{`
`413`		`- return PinMap_SPI_SSEL;`
	`438`	`+ return PinMap_SSI_SSEL;`
`414`	`439`	`}`
`415`	`440`