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

EcnlProtoTool/trunk/asp3_dcre/kernel/dataqueue.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
  * 
@@ -356 +356 @@
         p_dtqmb = pk_cdtq->dtqmb;
 
-        CHECK_RSATR(dtqatr, TA_TPRI);
+        CHECK_VALIDATR(dtqatr, TA_TPRI);
+        if (p_dtqmb != NULL) {
+                CHECK_PAR(MB_ALIGN(p_dtqmb));
+        }
 
         lock_cpu();
@@ -364 +367 @@
         else {
                 if (dtqcnt != 0 && p_dtqmb == NULL) {
-                        p_dtqmb = kernel_malloc(sizeof(DTQMB) * dtqcnt);
+                        p_dtqmb = malloc_mpk(sizeof(DTQMB) * dtqcnt);
                         dtqatr |= TA_MBALLOC;
                 }
@@ -423 +426 @@
                 p_dtqinib = (DTQINIB *)(p_dtqcb->p_dtqinib);
                 if ((p_dtqinib->dtqatr & TA_MBALLOC) != 0U) {
-                        kernel_free(p_dtqinib->p_dtqmb);
+                        free_mpk(p_dtqinib->p_dtqmb);
                 }
                 p_dtqinib->dtqatr = TA_NOEXS;
@@ -449 +452 @@
 snd_dtq(ID dtqid, intptr_t data)
 {
-        DTQCB   *p_dtqcb;
-        WINFO_SDTQ winfo_sdtq;
-        ER              ercd;
+        DTQCB           *p_dtqcb;
+        WINFO_SDTQ      winfo_sdtq;
+        ER                      ercd;
 
         LOG_SND_DTQ_ENTER(dtqid, data);
@@ -473 +476 @@
         else {
                 winfo_sdtq.data = data;
-                p_runtsk->tstat = TS_WAITING_SDTQ;
-                wobj_make_wait((WOBJCB *) p_dtqcb, (WINFO_WOBJ *) &winfo_sdtq);
+                wobj_make_wait((WOBJCB *) p_dtqcb, TS_WAITING_SDTQ,
+                                                                                        (WINFO_WOBJ *) &winfo_sdtq);
                 dispatch();
                 ercd = winfo_sdtq.winfo.wercd;
@@ -513 +516 @@
                         }
                         else {
-                                request_dispatch();
+                                request_dispatch_retint();
                         }
                 }
@@ -538 +541 @@
 tsnd_dtq(ID dtqid, intptr_t data, TMO tmout)
 {
-        DTQCB   *p_dtqcb;
-        WINFO_SDTQ winfo_sdtq;
-        TMEVTB  tmevtb;
-        ER              ercd;
+        DTQCB           *p_dtqcb;
+        WINFO_SDTQ      winfo_sdtq;
+        TMEVTB          tmevtb;
+        ER                      ercd;
 
         LOG_TSND_DTQ_ENTER(dtqid, data, tmout);
@@ -567 +570 @@
         else {
                 winfo_sdtq.data = data;
-                p_runtsk->tstat = TS_WAITING_SDTQ;
-                wobj_make_wait_tmout((WOBJCB *) p_dtqcb, (WINFO_WOBJ *) &winfo_sdtq,
-                                                                                                                &tmevtb, tmout);
+                wobj_make_wait_tmout((WOBJCB *) p_dtqcb, TS_WAITING_SDTQ,
+                                                                (WINFO_WOBJ *) &winfo_sdtq, &tmevtb, tmout);
                 dispatch();
                 ercd = winfo_sdtq.winfo.wercd;
@@ -612 +614 @@
                         }
                         else {
-                                request_dispatch();
+                                request_dispatch_retint();
                         }
                 }
-        ercd = E_OK;
+                ercd = E_OK;
         }
         unlock_cpu();
@@ -634 +636 @@
 rcv_dtq(ID dtqid, intptr_t *p_data)
 {
-        DTQCB   *p_dtqcb;
-        WINFO_RDTQ winfo_rdtq;
-        ER              ercd;
+        DTQCB           *p_dtqcb;
+        WINFO_RDTQ      winfo_rdtq;
+        ER                      ercd;
 
         LOG_RCV_DTQ_ENTER(dtqid, p_data);
@@ -657 +659 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_RDTQ;
-                make_wait(&(winfo_rdtq.winfo));
+                make_wait(TS_WAITING_RDTQ, &(winfo_rdtq.winfo));
                 queue_insert_prev(&(p_dtqcb->rwait_queue), &(p_runtsk->task_queue));
                 winfo_rdtq.p_dtqcb = p_dtqcb;
@@ -723 +724 @@
 trcv_dtq(ID dtqid, intptr_t *p_data, TMO tmout)
 {
-        DTQCB   *p_dtqcb;
-        WINFO_RDTQ winfo_rdtq;
-        TMEVTB  tmevtb;
-        ER              ercd;
+        DTQCB           *p_dtqcb;
+        WINFO_RDTQ      winfo_rdtq;
+        TMEVTB          tmevtb;
+        ER                      ercd;
 
         LOG_TRCV_DTQ_ENTER(dtqid, p_data, tmout);
@@ -751 +752 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_RDTQ;
-                make_wait_tmout(&(winfo_rdtq.winfo), &tmevtb, tmout);
+                make_wait_tmout(TS_WAITING_RDTQ, &(winfo_rdtq.winfo), &tmevtb, tmout);
                 queue_insert_prev(&(p_dtqcb->rwait_queue), &(p_runtsk->task_queue));
                 winfo_rdtq.p_dtqcb = p_dtqcb;