Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/kernel/eventflag.c

Timestamp:

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

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/kernel/eventflag.c (modified) (12 diffs)

EcnlProtoTool/trunk/asp3_dcre/kernel/eventflag.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2005-2017 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
  * 
@@ -216 +216 @@
         flgatr = pk_cflg->flgatr;
 
-        CHECK_RSATR(flgatr, TA_TPRI|TA_WMUL|TA_CLR);
+        CHECK_VALIDATR(flgatr, TA_TPRI|TA_WMUL|TA_CLR);
 
         lock_cpu();
@@ -292 +292 @@
 set_flg(ID flgid, FLGPTN setptn)
 {
-        FLGCB   *p_flgcb;
-        QUEUE   *p_queue;
-        TCB             *p_tcb;
-        WINFO_FLG *p_winfo_flg;
-        ER              ercd;
+        FLGCB           *p_flgcb;
+        QUEUE           *p_queue;
+        TCB                     *p_tcb;
+        WINFO_FLG       *p_winfo_flg;
+        bool_t          lock;
+        ER                      ercd;
 
         LOG_SET_FLG_ENTER(flgid, setptn);
-        CHECK_UNL();
+        lock = sense_lock();
         CHECK_ID(VALID_FLGID(flgid));
         p_flgcb = get_flgcb(flgid);
 
-        lock_cpu();
+        if (!lock)
+                lock_cpu();
         if (p_flgcb->p_flginib->flgatr == TA_NOEXS) {
                 ercd = E_NOEXS;
@@ -328 +330 @@
                         }
                         else {
-                                request_dispatch();
+                                request_dispatch_retint();
                         }
                 }
                 ercd = E_OK;
         }
-        unlock_cpu();
+        if (!lock)
+                unlock_cpu();
 
   error_exit:
@@ -351 +354 @@
 {
         FLGCB   *p_flgcb;
+        bool_t lock;
         ER              ercd;
 
         LOG_CLR_FLG_ENTER(flgid, clrptn);
-        CHECK_TSKCTX_UNL();
+        lock = sense_lock();
         CHECK_ID(VALID_FLGID(flgid));
         p_flgcb = get_flgcb(flgid);
 
-        lock_cpu();
+        if (!lock)
+                lock_cpu();
         if (p_flgcb->p_flginib->flgatr == TA_NOEXS) {
                 ercd = E_NOEXS;
@@ -366 +371 @@
                 ercd = E_OK;
         }
-        unlock_cpu();
+        if (!lock)
+                unlock_cpu();
 
   error_exit:
@@ -383 +389 @@
 wai_flg(ID flgid, FLGPTN waiptn, MODE wfmode, FLGPTN *p_flgptn)
 {
-        FLGCB   *p_flgcb;
-        WINFO_FLG winfo_flg;
-        ER              ercd;
+        FLGCB           *p_flgcb;
+        WINFO_FLG       winfo_flg;
+        ER                      ercd;
 
         LOG_WAI_FLG_ENTER(flgid, waiptn, wfmode, p_flgptn);
@@ -411 +417 @@
                 winfo_flg.waiptn = waiptn;
                 winfo_flg.wfmode = wfmode;
-                p_runtsk->tstat = TS_WAITING_FLG;
-                wobj_make_wait((WOBJCB *) p_flgcb, (WINFO_WOBJ *) &winfo_flg);
+                wobj_make_wait((WOBJCB *) p_flgcb, TS_WAITING_FLG,
+                                                                                        (WINFO_WOBJ *) &winfo_flg);
                 dispatch();
                 ercd = winfo_flg.winfo.wercd;
@@ -477 +483 @@
 twai_flg(ID flgid, FLGPTN waiptn, MODE wfmode, FLGPTN *p_flgptn, TMO tmout)
 {
-        FLGCB   *p_flgcb;
-        WINFO_FLG winfo_flg;
-        TMEVTB  tmevtb;
-        ER              ercd;
+        FLGCB           *p_flgcb;
+        WINFO_FLG       winfo_flg;
+        TMEVTB          tmevtb;
+        ER                      ercd;
 
         LOG_TWAI_FLG_ENTER(flgid, waiptn, wfmode, p_flgptn, tmout);
@@ -510 +516 @@
                 winfo_flg.waiptn = waiptn;
                 winfo_flg.wfmode = wfmode;
-                p_runtsk->tstat = TS_WAITING_FLG;
-                wobj_make_wait_tmout((WOBJCB *) p_flgcb, (WINFO_WOBJ *) &winfo_flg,
-                                                                                                                &tmevtb, tmout);
+                wobj_make_wait_tmout((WOBJCB *) p_flgcb, TS_WAITING_FLG,
+                                                                (WINFO_WOBJ *) &winfo_flg, &tmevtb, tmout);
                 dispatch();
                 ercd = winfo_flg.winfo.wercd;
@@ -575 +580 @@
         FLGCB   *p_flgcb;
         ER              ercd;
-    
+        bool_t lock;
+
         LOG_REF_FLG_ENTER(flgid, pk_rflg);
-        CHECK_TSKCTX_UNL();
+        lock = sense_lock();
         CHECK_ID(VALID_FLGID(flgid));
         p_flgcb = get_flgcb(flgid);
 
-        lock_cpu();
+        if (!lock)
+                lock_cpu();
         if (p_flgcb->p_flginib->flgatr == TA_NOEXS) {
                 ercd = E_NOEXS;
@@ -590 +597 @@
                 ercd = E_OK;
         }
-        unlock_cpu();
+        if (!lock)
+                unlock_cpu();
 
   error_exit: