Changeset 63


Ignore:
Timestamp:
Oct 19, 2013, 7:26:53 AM (10 years ago)
Author:
ertl-hiro
Message:

TA_MEMALLOCとTA_MBALLOCを廃止。

Location:
asp_wo_cfg/trunk/kernel
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • asp_wo_cfg/trunk/kernel/dataqueue.c

    r62 r63  
    211211                if (pk_cdtq->dtqcnt != 0 && p_dtqmb == NULL) {
    212212                        p_dtqmb = kernel_malloc(sizeof(DTQMB) * pk_cdtq->dtqcnt);
    213                         dtqatr |= TA_MBALLOC;
    214213                }
    215214                if (pk_cdtq->dtqcnt != 0 && p_dtqmb == NULL) {
  • asp_wo_cfg/trunk/kernel/kernel_impl.h

    r49 r63  
    66 *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
    77 *                              Toyohashi Univ. of Technology, JAPAN
    8  *  Copyright (C) 2004-2012 by Embedded and Real-Time Systems Laboratory
     8 *  Copyright (C) 2004-2013 by Embedded and Real-Time Systems Laboratory
    99 *              Graduate School of Information Science, Nagoya Univ., JAPAN
    1010 *
     
    139139#define TA_NOEXS                ((ATR)(-1))                     /* 未登録状態 */
    140140
    141 #ifndef TA_MEMALLOC
    142 #define TA_MEMALLOC             UINT_C(0x8000)          /* メモリ領域をカーネルで確保 */
    143 #endif /* TA_MEMALLOC */
    144 #ifndef TA_MBALLOC
    145 #define TA_MBALLOC              UINT_C(0x4000)          /* 管理領域をカーネルで確保 */
    146 #endif /* TA_MBALLOC */
    147 
    148141/*
    149142 *  ターゲット定義のエラーチェックマクロのデフォルト値の定義
  • asp_wo_cfg/trunk/kernel/mempfix.c

    r49 r63  
    66 *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
    77 *                              Toyohashi Univ. of Technology, JAPAN
    8  *  Copyright (C) 2005-2012 by Embedded and Real-Time Systems Laboratory
     8 *  Copyright (C) 2005-2013 by Embedded and Real-Time Systems Laboratory
    99 *              Graduate School of Information Science, Nagoya Univ., JAPAN
    1010 *
     
    210210                if (mpf == NULL) {
    211211                        mpf = kernel_malloc(pk_cmpf->blkcnt * ROUND_MPF_T(pk_cmpf->blksz));
    212                         mpfatr |= TA_MEMALLOC;
    213212                }
    214213                if (mpf == NULL) {
     
    218217                        if (p_mpfmb == NULL) {
    219218                                p_mpfmb = kernel_malloc(sizeof(MPFMB) * pk_cmpf->blkcnt);
    220                                 mpfatr |= TA_MBALLOC;
    221219                        }
    222220                        if (p_mpfmb == NULL) {
    223                                 if ((mpfatr & TA_MEMALLOC) != 0U) {
     221                                if (pk_cmpf->mpf == NULL) {
    224222                                        kernel_free(mpf);
    225223                                }
  • asp_wo_cfg/trunk/kernel/pridataq.c

    r62 r63  
    197197                if (pk_cpdq->pdqcnt != 0 && p_pdqmb == NULL) {
    198198                        p_pdqmb = kernel_malloc(sizeof(PDQMB) * pk_cpdq->pdqcnt);
    199                         pdqatr |= TA_MBALLOC;
    200199                }
    201200                if (pk_cpdq->pdqcnt != 0 && p_pdqmb == NULL) {
  • asp_wo_cfg/trunk/kernel/task_manage.c

    r51 r63  
    66 *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
    77 *                              Toyohashi Univ. of Technology, JAPAN
    8  *  Copyright (C) 2005-2012 by Embedded and Real-Time Systems Laboratory
     8 *  Copyright (C) 2005-2013 by Embedded and Real-Time Systems Laboratory
    99 *              Graduate School of Information Science, Nagoya Univ., JAPAN
    1010 *
     
    159159                if (stk == NULL) {
    160160                        stk = kernel_malloc(pk_ctsk->stksz);
    161                         tskatr |= TA_MEMALLOC;
    162161                }
    163162                if (stk == NULL) {
Note: See TracChangeset for help on using the changeset viewer.