Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/kernel/pridataq.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/pridataq.c (modified) (13 diffs)

EcnlProtoTool/trunk/asp3_dcre/kernel/pridataq.c

@@ -6 +6 @@
  *  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
  * 
@@ -335 +335 @@
         p_pdqmb = pk_cpdq->pdqmb;
 
-        CHECK_RSATR(pdqatr, TA_TPRI);
+        CHECK_VALIDATR(pdqatr, TA_TPRI);
         CHECK_PAR(VALID_DPRI(maxdpri));
+        if (p_pdqmb != NULL) {
+                CHECK_PAR(MB_ALIGN(p_pdqmb));
+        }
 
         lock_cpu();
@@ -344 +347 @@
         else {
                 if (pdqcnt != 0 && p_pdqmb == NULL) {
-                        p_pdqmb = kernel_malloc(sizeof(PDQMB) * pdqcnt);
+                        p_pdqmb = malloc_mpk(sizeof(PDQMB) * pdqcnt);
                         pdqatr |= TA_MBALLOC;
                 }
@@ -405 +408 @@
                 p_pdqinib = (PDQINIB *)(p_pdqcb->p_pdqinib);
                 if ((p_pdqinib->pdqatr & TA_MBALLOC) != 0U) {
-                        kernel_free(p_pdqinib->p_pdqmb);
+                        free_mpk(p_pdqinib->p_pdqmb);
                 }
                 p_pdqinib->pdqatr = TA_NOEXS;
@@ -431 +434 @@
 snd_pdq(ID pdqid, intptr_t data, PRI datapri)
 {
-        PDQCB   *p_pdqcb;
-        WINFO_SPDQ winfo_spdq;
-        ER              ercd;
+        PDQCB           *p_pdqcb;
+        WINFO_SPDQ      winfo_spdq;
+        ER                      ercd;
 
         LOG_SND_PDQ_ENTER(pdqid, data, datapri);
@@ -460 +463 @@
                 winfo_spdq.data = data;
                 winfo_spdq.datapri = datapri;
-                p_runtsk->tstat = TS_WAITING_SPDQ;
-                wobj_make_wait((WOBJCB *) p_pdqcb, (WINFO_WOBJ *) &winfo_spdq);
+                wobj_make_wait((WOBJCB *) p_pdqcb, TS_WAITING_SPDQ,
+                                                                                        (WINFO_WOBJ *) &winfo_spdq);
                 dispatch();
                 ercd = winfo_spdq.winfo.wercd;
@@ -504 +507 @@
                         }
                         else {
-                                request_dispatch();
+                                request_dispatch_retint();
                         }
                 }
@@ -529 +532 @@
 tsnd_pdq(ID pdqid, intptr_t data, PRI datapri, TMO tmout)
 {
-        PDQCB   *p_pdqcb;
-        WINFO_SPDQ winfo_spdq;
-        TMEVTB  tmevtb;
-        ER              ercd;
+        PDQCB           *p_pdqcb;
+        WINFO_SPDQ      winfo_spdq;
+        TMEVTB          tmevtb;
+        ER                      ercd;
 
         LOG_TSND_PDQ_ENTER(pdqid, data, datapri, tmout);
@@ -563 +566 @@
                 winfo_spdq.data = data;
                 winfo_spdq.datapri = datapri;
-                p_runtsk->tstat = TS_WAITING_SPDQ;
-                wobj_make_wait_tmout((WOBJCB *) p_pdqcb, (WINFO_WOBJ *) &winfo_spdq,
-                                                                                                                &tmevtb, tmout);
+                wobj_make_wait_tmout((WOBJCB *) p_pdqcb, TS_WAITING_SPDQ,
+                                                                (WINFO_WOBJ *) &winfo_spdq, &tmevtb, tmout);
                 dispatch();
                 ercd = winfo_spdq.winfo.wercd;
@@ -586 +588 @@
 rcv_pdq(ID pdqid, intptr_t *p_data, PRI *p_datapri)
 {
-        PDQCB   *p_pdqcb;
-        WINFO_RPDQ winfo_rpdq;
-        ER              ercd;
+        PDQCB           *p_pdqcb;
+        WINFO_RPDQ      winfo_rpdq;
+        ER                      ercd;
 
         LOG_RCV_PDQ_ENTER(pdqid, p_data, p_datapri);
@@ -609 +611 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_RPDQ;
-                make_wait(&(winfo_rpdq.winfo));
+                make_wait(TS_WAITING_RPDQ, &(winfo_rpdq.winfo));
                 queue_insert_prev(&(p_pdqcb->rwait_queue), &(p_runtsk->task_queue));
                 winfo_rpdq.p_pdqcb = p_pdqcb;
@@ -676 +677 @@
 trcv_pdq(ID pdqid, intptr_t *p_data, PRI *p_datapri, TMO tmout)
 {
-        PDQCB   *p_pdqcb;
-        WINFO_RPDQ winfo_rpdq;
-        TMEVTB  tmevtb;
-        ER              ercd;
+        PDQCB           *p_pdqcb;
+        WINFO_RPDQ      winfo_rpdq;
+        TMEVTB          tmevtb;
+        ER                      ercd;
 
         LOG_TRCV_PDQ_ENTER(pdqid, p_data, p_datapri, tmout);
@@ -704 +705 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_RPDQ;
-                make_wait_tmout(&(winfo_rpdq.winfo), &tmevtb, tmout);
+                make_wait_tmout(TS_WAITING_RPDQ, &(winfo_rpdq.winfo), &tmevtb, tmout);
                 queue_insert_prev(&(p_pdqcb->rwait_queue), &(p_runtsk->task_queue));
                 winfo_rpdq.p_pdqcb = p_pdqcb;