Changeset 63 for asp_wo_cfg/trunk/kernel/mempfix.c

Timestamp:

Oct 19, 2013, 7:26:53 AM (11 years ago)

Author:

ertl-hiro

Message:

TA_MEMALLOCとTA_MBALLOCを廃止。

File:

• asp_wo_cfg/trunk/kernel/mempfix.c (modified) (3 diffs)

asp_wo_cfg/trunk/kernel/mempfix.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2005-2012 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2013 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -210 +210 @@
                 if (mpf == NULL) {
                         mpf = kernel_malloc(pk_cmpf->blkcnt * ROUND_MPF_T(pk_cmpf->blksz));
-                        mpfatr |= TA_MEMALLOC;
                 }
                 if (mpf == NULL) {
@@ -218 +217 @@
                         if (p_mpfmb == NULL) {
                                 p_mpfmb = kernel_malloc(sizeof(MPFMB) * pk_cmpf->blkcnt);
-                                mpfatr |= TA_MBALLOC;
                         }
                         if (p_mpfmb == NULL) {
-                                if ((mpfatr & TA_MEMALLOC) != 0U) {
+                                if (pk_cmpf->mpf == NULL) {
                                         kernel_free(mpf);
                                 }