Changeset 63 for asp_wo_cfg/trunk

Timestamp:

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

Author:

ertl-hiro

Message:

TA_MEMALLOCとTA_MBALLOCを廃止。

Location:

asp_wo_cfg/trunk/kernel

Files:

• dataqueue.c (modified) (1 diff)
• kernel_impl.h (modified) (2 diffs)
• mempfix.c (modified) (3 diffs)
• pridataq.c (modified) (1 diff)
• task_manage.c (modified) (2 diffs)

asp_wo_cfg/trunk/kernel/dataqueue.c

@@ -211 +211 @@
                 if (pk_cdtq->dtqcnt != 0 && p_dtqmb == NULL) {
                         p_dtqmb = kernel_malloc(sizeof(DTQMB) * pk_cdtq->dtqcnt);
-                        dtqatr |= TA_MBALLOC;
                 }
                 if (pk_cdtq->dtqcnt != 0 && p_dtqmb == NULL) {

asp_wo_cfg/trunk/kernel/kernel_impl.h

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2004-2012 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2004-2013 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -139 +139 @@
 #define TA_NOEXS                ((ATR)(-1))                     /* 未登録状態 */
 
-#ifndef TA_MEMALLOC
-#define TA_MEMALLOC             UINT_C(0x8000)          /* メモリ領域をカーネルで確保 */
-#endif /* TA_MEMALLOC */
-#ifndef TA_MBALLOC
-#define TA_MBALLOC              UINT_C(0x4000)          /* 管理領域をカーネルで確保 */
-#endif /* TA_MBALLOC */
-
 /*
  *  ターゲット定義のエラーチェックマクロのデフォルト値の定義

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);
                                 }

asp_wo_cfg/trunk/kernel/pridataq.c

@@ -197 +197 @@
                 if (pk_cpdq->pdqcnt != 0 && p_pdqmb == NULL) {
                         p_pdqmb = kernel_malloc(sizeof(PDQMB) * pk_cpdq->pdqcnt);
-                        pdqatr |= TA_MBALLOC;
                 }
                 if (pk_cpdq->pdqcnt != 0 && p_pdqmb == NULL) {

asp_wo_cfg/trunk/kernel/task_manage.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
  * 
@@ -159 +159 @@
                 if (stk == NULL) {
                         stk = kernel_malloc(pk_ctsk->stksz);
-                        tskatr |= TA_MEMALLOC;
                 }
                 if (stk == NULL) {