Changeset 70

Timestamp:

Apr 17, 2014, 8:04:43 AM (10 years ago)

Author:

ertl-hiro

Message:

ASPカーネルの動的生成パッケージに追従。

Location:

asp_wo_cfg/trunk

Files:

• README.txt (modified) (1 diff)
• include/kernel.h (modified) (2 diffs)
• kernel/dataqueue.c (modified) (2 diffs)
• kernel/mempfix.c (modified) (2 diffs)
• kernel/pridataq.c (modified) (2 diffs)
• kernel/task_manage.c (modified) (2 diffs)

asp_wo_cfg/trunk/README.txt

@@ -1 +1 @@
 
-        TOPPERS/ASP Kernel without Configurator（Release 1.9.0）
+        TOPPERS/ASP Kernel without Configurator（Release 1.9.1）
                 Toyohashi Open Platform for Embedded Real-Time Systems/
                 Advanced Standard Profile Kernel

asp_wo_cfg/trunk/include/kernel.h

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2004-2013 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2004-2014 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -556 +556 @@
 #define TKERNEL_PRID    UINT_C(0x0007)  /* カーネルの識別番号 */
 #define TKERNEL_SPVER   UINT_C(0xf516)  /* カーネル仕様のバージョン番号 */
-#define TKERNEL_PRVER   UINT_C(0x1090)  /* カーネルのバージョン番号 */
+#define TKERNEL_PRVER   UINT_C(0x1091)  /* カーネルのバージョン番号 */
 
 /*

asp_wo_cfg/trunk/kernel/dataqueue.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2005-2013 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2014 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -201 +201 @@
         CHECK_DTQID(dtqid);
         CHECK_RSATR(pk_cdtq->dtqatr, TA_TPRI);
+        if (pk_cdtq->dtqmb != NULL) {
+                CHECK_ALIGN_MB(pk_cdtq->dtqmb);
+        }
         dtqatr = pk_cdtq->dtqatr;
         p_dtqmb = pk_cdtq->dtqmb;

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-2013 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2014 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -197 +197 @@
         CHECK_PAR(pk_cmpf->blkcnt != 0);
         CHECK_PAR(pk_cmpf->blksz != 0);
-        CHECK_ALIGN_MPF(pk_cmpf->mpf);
-        CHECK_ALIGN_MB(pk_cmpf->mpfmb);
+        if (pk_cmpf->mpf != NULL) {
+                CHECK_ALIGN_MPF(pk_cmpf->mpf);
+        }
+        if (pk_cmpf->mpfmb != NULL) {
+                CHECK_ALIGN_MB(pk_cmpf->mpfmb);
+        }
         mpfatr = pk_cmpf->mpfatr;
         mpf = pk_cmpf->mpf;

asp_wo_cfg/trunk/kernel/pridataq.c

@@ -6 +6 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2005-2013 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2014 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -187 +187 @@
         CHECK_RSATR(pk_cpdq->pdqatr, TA_TPRI);
         CHECK_DPRI(pk_cpdq->maxdpri);
+        if (pk_cpdq->pdqmb != NULL) {
+                CHECK_ALIGN_MB(pk_cpdq->pdqmb);
+        }
         pdqatr = pk_cpdq->pdqatr;
         p_pdqmb = pk_cpdq->pdqmb;

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-2013 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2005-2014 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -148 +148 @@
         CHECK_STKSZ_MIN(pk_ctsk->stksz);
         CHECK_ALIGN_STKSZ(pk_ctsk->stksz);
-        CHECK_ALIGN_STACK(pk_ctsk->stk);
+        if (pk_ctsk->stk != NULL) {
+                CHECK_ALIGN_STACK(pk_ctsk->stk);
+        }
         tskatr = pk_ctsk->tskatr;
         stk = pk_ctsk->stk;