Index: AES_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/AES_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/AES_TEST/user/main.c	(working copy)
@@ -68,8 +68,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud
Index: DES_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/DES_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/DES_TEST/user/main.c	(working copy)
@@ -70,8 +70,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud
Index: RSA_GENKEY_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/RSA_GENKEY_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/RSA_GENKEY_TEST/user/main.c	(working copy)
@@ -72,8 +72,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud
Index: RSA_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/RSA_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/RSA_TEST/user/main.c	(working copy)
@@ -106,8 +106,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud
Index: RSA_TRIPLE_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/RSA_TRIPLE_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/RSA_TRIPLE_TEST/user/main.c	(working copy)
@@ -106,8 +106,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud
Index: SHA_ENHNCE_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/SHA_ENHNCE_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/SHA_ENHNCE_TEST/user/main.c	(working copy)
@@ -69,8 +69,8 @@
 	UART_InitTypeDef UART_InitStruct;
 
 	/* Configure serial ports RX and TX for IO. */
-	UART0_TX_IO_CONFIG
-	UART0_RX_IO_CONFIG
+	GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+	GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
 	/* USARTx configured as follow:
   - BaudRate = 115200 baud
Index: SHA_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/SHA_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/SHA_TEST/user/main.c	(working copy)
@@ -69,8 +69,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud
Index: SM2_ENC&DEC_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/SM2_ENC&DEC_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/SM2_ENC&DEC_TEST/user/main.c	(working copy)
@@ -159,8 +159,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud
Index: SM2_SIGNATURE_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/SM2_SIGNATURE_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/SM2_SIGNATURE_TEST/user/main.c	(working copy)
@@ -111,8 +111,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud
Index: SM2_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/SM2_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/SM2_TEST/user/main.c	(working copy)
@@ -98,8 +98,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud
Index: SM4_TEST/user/main.c
===================================================================
--- /YC3121_demo/ModuleDemo/CryptTest/SM4_TEST/user/main.c	(revision 671)
+++ /YC3121_demo/ModuleDemo/CryptTest/SM4_TEST/user/main.c	(working copy)
@@ -68,8 +68,8 @@
     UART_InitTypeDef UART_InitStruct;
 
     /* Configure serial ports RX and TX for IO. */
-    UART0_TX_IO_CONFIG
-    UART0_RX_IO_CONFIG
+    GPIO_Config(UART0_TX_PORT, UART0_TX_PIN, UART0_TXD);
+    GPIO_Config(UART0_RX_PORT, UART0_RX_PIN, UART0_RXD);
 
     /* USARTx configured as follow:
     - BaudRate = 115200 baud