Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/tUartPL011.c

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/tUartPL011.c (modified) (4 diffs)

EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/tUartPL011.c

@@ -1 +1 @@
 /*
- *  TOPPERS/ASP Kernel
- *      Toyohashi Open Platform for Embedded Real-Time Systems/
- *      Advanced Standard Profile Kernel
- * 
- *  Copyright (C) 2006-2016 by Embedded and Real-Time Systems Laboratory
+ *  TOPPERS Software
+ *      Toyohashi Open Platform for Embedded Real-Time Systems
+ * 
+ *  Copyright (C) 2006-2018 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -95 +94 @@
         CELLCB  *p_cellcb = GET_CELLCB(idx);
 
-        /*
-         *  UARTをディスエーブル
-         */
-        sil_wrw_mem(UART_CR(ATTR_baseAddress), 0U);
-
-        /*
-         *  エラーフラグをクリア
-         */
-        sil_wrw_mem(UART_ECR(ATTR_baseAddress), 0U);
-
-        /*
-         *  FIFOを空にする
-         */
-        while (uart_pl011_getready(p_cellcb)) {
-                (void) uart_pl011_getchar(p_cellcb);
-        }
-
-        /*
-         *  ボーレートと通信規格を設定
-         */
-        sil_wrw_mem(UART_IBRD(ATTR_baseAddress), ATTR_ibrd);
-        sil_wrw_mem(UART_FBRD(ATTR_baseAddress), ATTR_fbrd);
-        sil_wrw_mem(UART_LCR_H(ATTR_baseAddress), ATTR_lcr_h);
-                
-        /*
-         *  UARTをイネーブル
-         */
-        sil_wrw_mem(UART_CR(ATTR_baseAddress),
+        if (!VAR_opened) {
+                /*
+                 *  既にオープンしている場合は、二重にオープンしない．
+                 */
+
+                /*
+                 *  UARTをディスエーブル
+                 */
+                sil_wrw_mem(UART_CR(ATTR_baseAddress), 0U);
+
+                /*
+                 *  エラーフラグをクリア
+                 */
+                sil_wrw_mem(UART_ECR(ATTR_baseAddress), 0U);
+
+                /*
+                 *  FIFOを空にする
+                 */
+                while (uart_pl011_getready(p_cellcb)) {
+                        (void) uart_pl011_getchar(p_cellcb);
+                }
+
+                /*
+                 *  ボーレートと通信規格を設定
+                 */
+                sil_wrw_mem(UART_IBRD(ATTR_baseAddress), ATTR_ibrd);
+                sil_wrw_mem(UART_FBRD(ATTR_baseAddress), ATTR_fbrd);
+                sil_wrw_mem(UART_LCR_H(ATTR_baseAddress), ATTR_lcr_h);
+
+                /*
+                 *  UARTをイネーブル
+                 */
+                sil_wrw_mem(UART_CR(ATTR_baseAddress),
                                                 UART_CR_UARTEN|UART_CR_TXE|UART_CR_RXE);
+
+                VAR_opened = true;
+        }
 }
 
@@ -134 +141 @@
         CELLCB  *p_cellcb = GET_CELLCB(idx);
 
-        /*
-         *  UARTをディスエーブル
-         */
-        sil_wrw_mem(UART_CR(ATTR_baseAddress), 0U);
+        if (VAR_opened) {
+                /*
+                 *  UARTをディスエーブル
+                 */
+                sil_wrw_mem(UART_CR(ATTR_baseAddress), 0U);
+
+                VAR_opened = false;
+        }
 }
 
@@ -232 +243 @@
         }
 }
+
+/*
+ *  SIOドライバの終了処理
+ */
+void
+eTerminate_main(CELLIDX idx)
+{
+        eSIOPort_close(idx);
+}