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

EcnlProtoTool/trunk/asp3_dcre/kernel/mempfix.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
  * 
@@ -226 +226 @@
         p_mpfmb = pk_cmpf->mpfmb;
 
-        CHECK_RSATR(mpfatr, TA_TPRI);
+        CHECK_VALIDATR(mpfatr, TA_TPRI);
         CHECK_PAR(blkcnt != 0);
         CHECK_PAR(blksz != 0);
@@ -242 +242 @@
         else {
                 if (mpf == NULL) {
-                        mpf = kernel_malloc(ROUND_MPF_T(blksz) * blkcnt);
+                        mpf = malloc_mpk(ROUND_MPF_T(blksz) * blkcnt);
                         mpfatr |= TA_MEMALLOC;
                 }
@@ -250 +250 @@
                 else {
                         if (p_mpfmb == NULL) {
-                                p_mpfmb = kernel_malloc(sizeof(MPFMB) * blkcnt);
+                                p_mpfmb = malloc_mpk(sizeof(MPFMB) * blkcnt);
                                 mpfatr |= TA_MBALLOC;
                         }
                         if (p_mpfmb == NULL) {
-                                if (mpf == NULL) {
-                                        kernel_free(mpf);
+                                if (pk_cmpf->mpf == NULL) {
+                                        free_mpk(mpf);
                                 }
                                 ercd = E_NOMEM;
@@ -313 +313 @@
                 p_mpfinib = (MPFINIB *)(p_mpfcb->p_mpfinib);
                 if ((p_mpfinib->mpfatr & TA_MEMALLOC) != 0U) {
-                        kernel_free(p_mpfinib->mpf);
+                        free_mpk(p_mpfinib->mpf);
                 }
                 if ((p_mpfinib->mpfatr & TA_MBALLOC) != 0U) {
-                        kernel_free(p_mpfinib->p_mpfmb);
+                        free_mpk(p_mpfinib->p_mpfmb);
                 }
                 p_mpfinib->mpfatr = TA_NOEXS;
@@ -342 +342 @@
 get_mpf(ID mpfid, void **p_blk)
 {
-        MPFCB   *p_mpfcb;
-        WINFO_MPF winfo_mpf;
-        ER              ercd;
+        MPFCB           *p_mpfcb;
+        WINFO_MPF       winfo_mpf;
+        ER                      ercd;
 
         LOG_GET_MPF_ENTER(mpfid, p_blk);
@@ -363 +363 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_MPF;
-                wobj_make_wait((WOBJCB *) p_mpfcb, (WINFO_WOBJ *) &winfo_mpf);
+                wobj_make_wait((WOBJCB *) p_mpfcb, TS_WAITING_MPF,
+                                                                                        (WINFO_WOBJ *) &winfo_mpf);
                 dispatch();
                 ercd = winfo_mpf.winfo.wercd;
@@ -424 +424 @@
 tget_mpf(ID mpfid, void **p_blk, TMO tmout)
 {
-        MPFCB   *p_mpfcb;
-        WINFO_MPF winfo_mpf;
-        TMEVTB  tmevtb;
-        ER              ercd;
+        MPFCB           *p_mpfcb;
+        WINFO_MPF       winfo_mpf;
+        TMEVTB          tmevtb;
+        ER                      ercd;
 
         LOG_TGET_MPF_ENTER(mpfid, p_blk, tmout);
@@ -450 +450 @@
         }
         else {
-                p_runtsk->tstat = TS_WAITING_MPF;
-                wobj_make_wait_tmout((WOBJCB *) p_mpfcb, (WINFO_WOBJ *) &winfo_mpf,
-                                                                                                                &tmevtb, tmout);
+                wobj_make_wait_tmout((WOBJCB *) p_mpfcb, TS_WAITING_MPF,
+                                                                (WINFO_WOBJ *) &winfo_mpf, &tmevtb, tmout);
                 dispatch();
                 ercd = winfo_mpf.winfo.wercd;