Changeset 305 for asp3_wo_tecs/trunk/kernel/task.trb

Timestamp:

Jun 26, 2017, 6:45:41 PM (7 years ago)

Author:

ertl-honda

Message:

3.0.0のリリース版に追従

File:

• asp3_wo_tecs/trunk/kernel/task.trb (modified) (6 diffs)

asp3_wo_tecs/trunk/kernel/task.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: task.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: task.trb 596 2016-02-06 17:08:56Z ertl-hiro $
 # 
 
@@ -65 +65 @@
   end
 
-  def prepare(id, params)
+  def prepare(key, params)
     # tskatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI1028ï¼½
     #（TA_ACT，TA_NOACTQUE，TARGET_TSKATRä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -83 +83 @@
     end
 
-    # stkszãŒã‚¹ã‚¿ãƒƒã‚¯é ˜åŸŸã®ã‚µã‚¤ã‚ºã¨ã—ã¦æ­£ã—ããªã„å ´åˆï¼»NGKI1056ï¼½
-    if (params[:stksz] & ($CHECK_STKSZ_ALIGN - 1)) != 0
-      error_wrong_id("E_PAR", params, :stksz, :tskid, "not aligned")
-    end
-
     # ã‚¹ã‚¿ãƒƒã‚¯é ˜åŸŸã®è¨­å®šï¼»NGKI1041ï¼½
     if params[:stk] == "NULL"
@@ -94 +89 @@
       params[:tinib_stk] = "_kernel_stack_#{params[:tskid]}"
     else
+      # stkszãŒã‚¹ã‚¿ãƒƒã‚¯é ˜åŸŸã®ã‚µã‚¤ã‚ºã¨ã—ã¦æ­£ã—ããªã„å ´åˆï¼»NGKI1056ï¼½
+      if (params[:stksz] & ($CHECK_STKSZ_ALIGN - 1)) != 0
+        error_wrong_id("E_PAR", params, :stksz, :tskid, "not aligned")
+      end
+
       params[:tinib_stksz] = params[:stksz]
       params[:tinib_stk] = "(void *)(#{params[:stk]})"
@@ -99 +99 @@
   end
 
-  def generateInib(id, params)
+  def generateInib(key, params)
     if $USE_TSKINICTXB == 1
-      tskinictxb = GenerateTskinictxb(id, params)
+      tskinictxb = GenerateTskinictxb(key, params)
     else
       tskinictxb = "#{params[:tinib_stksz]}, #{params[:tinib_stk]}"
@@ -124 +124 @@
 $kernelCfgC.add("const ID _kernel_torder_table[TNUM_TSKID] = { ")
 $kernelCfgC.append("\t")
-$cfgData[:CRE_TSK].each_with_index do |(id, params), index|
+$cfgData[:CRE_TSK].each_with_index do |(key, params), index|
   $kernelCfgC.append(", ") if index > 0
   $kernelCfgC.append("#{params[:tskid]}")