Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/syssvc/tLogTaskMain.c

Timestamp:

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

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/syssvc/tLogTaskMain.c (modified) (6 diffs)

EcnlProtoTool/trunk/asp3_dcre/syssvc/tLogTaskMain.c

@@ -1 +1 @@
 /*
- *  TOPPERS/ASP Kernel
- *      Toyohashi Open Platform for Embedded Real-Time Systems/
- *      Advanced Standard Profile Kernel
+ *  TOPPERS Software
+ *      Toyohashi Open Platform for Embedded Real-Time Systems
  * 
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2005-2016 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2018 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -82 +81 @@
         }
         else {
-                for (;;) {
+                while (true) {
                         if (cSysLog_refer(&rlog) < 0) {
                                 ercd = E_SYS;
@@ -113 +112 @@
                         rercd = dly_tsk(ATTR_flushWait);
                         if (rercd < 0) {
-                                ercd = (rercd == E_RLWAI) ? rercd : E_SYS;
+                                ercd = (MERCD(rercd) == E_RLWAI) ? rercd : E_SYS;
                                 goto error_exit;
                         }
@@ -130 +129 @@
 {
         SYSLOG  syslog;
-        uint_t  lost;
         ER_UINT rercd;
 
@@ -136 +134 @@
         syslog_0(LOG_NOTICE, "System logging task is started.");
 
-        for (;;) {
-                lost = 0U;
+        while (true) {
                 while ((rercd = cSysLog_read(&syslog)) >= 0) {
-                        lost += (uint_t) rercd;
-                        if (lost > 0U) {
-                                syslog_lostmsg(lost, logtask_putc);
-                                lost = 0U;
+                        if (((uint_t) rercd) > 0U) {
+                                syslog_lostmsg((uint_t) rercd, logtask_putc);
                         }
                         syslog_print(&syslog, logtask_putc);
-                        logtask_putc('\n');
                 }
-                if (lost > 0U) {
-                        syslog_lostmsg(lost, logtask_putc);
-                }
-                dly_tsk(ATTR_interval);
+                (void) dly_tsk(ATTR_interval);
         }
 }
@@ -189 +180 @@
                         syslog_lostmsg((uint_t) rercd, target_fput_log);
                 }
-                if (syslog.logtype >= LOG_TYPE_COMMENT) {
-                        syslog_print(&syslog, target_fput_log);
-                        target_fput_log('\n');
-                }
+                syslog_print(&syslog, target_fput_log);
         }
 }