Changeset 289

Timestamp:

May 6, 2017, 8:08:32 PM (7 years ago)

Author:

nmir-saito

Message:

tsk_apri_list変数を使わないようにtask.trbを変更

File:

• rubycfg_ssp/trunk/task.trb (modified) (9 diffs)

rubycfg_ssp/trunk/task.trb

@@ -50 +50 @@
   def initialize()
     super("tsk", "task")
-    @tsk_apri_list = []
     @reallocate_atskpri = {}
     @reallocate_etskpri = {}
@@ -62 +61 @@
 
     ($cfgData[:CRE_TSK].sort_by {|e| e[1][:atskpri].val}).each.with_index(1) do |e, index|
-      @tsk_apri_list.push(e[0])
       @reallocate_atskpri[e[0]] = index 
       $kernelCfgH.add("#define #{e[1][:tskid].str} #{index}")
@@ -145 +143 @@
 
       # atskpri が重複する場合 (E_PAR)
-      @tsk_apri_list.each do |id|
+      @reallocate_atskpri.each_key do |id|
         if (params[:tskid].val != id) && (params[:atskpri] == $cfgData[@api][id][:atskpri])
           error_illegal_id("E_PAR", params, :atskpri, :tskid)
@@ -196 +194 @@
     # タスク属性(tskatr)
     $kernelCfgC.append("const ATR\t_kernel_tinib_tskatr[TNUM_TSKID] = {")
-    @tsk_apri_list.each.with_index do |id, index|
+    @reallocate_atskpri.each_key.with_index do |id, index|
       tskatr = $cfgData[@api][id][:tskatr]
       $kernelCfgC.append(",") if index > 0
@@ -210 +208 @@
     # 拡張情報(exinf)
     $kernelCfgC.append("const intptr_t\t_kernel_tinib_exinf[TNUM_TSKID] = {")
-    @tsk_apri_list.each.with_index do |id, index|
+    @reallocate_atskpri.each_key.with_index do |id, index|
       exinf = $cfgData[@api][id][:exinf]
       $kernelCfgC.append(",") if index > 0
@@ -219 +217 @@
     # 起動番地(task)
     $kernelCfgC.append("const TASK\t_kernel_tinib_task[TNUM_TSKID] = {")
-    @tsk_apri_list.each.with_index do |id, index|
+    @reallocate_atskpri.each_key.with_index do |id, index|
       task = $cfgData[@api][id][:task]
       $kernelCfgC.append(",") if index > 0 
@@ -228 +226 @@
     # 実行時優先度(etskpri)
     $kernelCfgC.append("const uint_t\t_kernel_tinib_epriority[TNUM_TSKID] = {")
-    @tsk_apri_list.each.with_index do |id, index|
+    @reallocate_atskpri.each_key.with_index do |id, index|
       begin
         # 実行時優先度がDEF_EPR で定義されていない場合，起動優先度の設定値を使う
@@ -238 +236 @@
         end
  
-        @tsk_apri_list.each do |id2|
+        @reallocate_atskpri.each_key do |id2|
           if epri <= $cfgData[@api][id2][:atskpri]
             $kernelCfgC.append(",") if index > 0
@@ -258 +256 @@
     $kernelCfgC.add("/*")
     $kernelCfgC.add(" * Configuration result of task priority:")
-    @tsk_apri_list.each do |id|
+    @reallocate_atskpri.each_key do |id|
       $kernelCfgC.append(" * \t#{$cfgData[@api][id][:tskid]}:\tIPRI = #{@reallocate_atskpri[id]}")
       $kernelCfgC.add(", EXEPRI = #{@reallocate_etskpri[id]}")