Changeset 305 for asp3_wo_tecs/trunk/kernel/kernel.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/kernel.trb (modified) (12 diffs)

asp3_wo_tecs/trunk/kernel/kernel.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 #
-#   $Id: kernel.trb 572 2016-02-01 14:40:09Z ertl-hiro $
+#   $Id: kernel.trb 588 2016-02-05 12:54:58Z ertl-hiro $
 #
 
@@ -136 +136 @@
 
     # オブジェクトのID番号のマクロ定義の生成
-    $cfgData[@api].sort.each do |id, params|
+    $cfgData[@api].sort.each do |key, params|
       $kernelCfgH.add("#define #{params[@objid]}\t#{params[@objid].val}")
     end
@@ -142 +142 @@
 
     # オブジェクトのID番号を保持する変数
-    if $USE_EXTERNAL_ID
-      $cfgData[@api].sort.each do |id, params|
+    if !$USE_EXTERNAL_ID.nil?
+      $cfgData[@api].sort.each do |key, params|
         $kernelCfgC.add("const ID #{params[@objid]}_id" \
                                                                                 " = #{params[@objid].val};")
@@ -157 +157 @@
     if $cfgData[@api].size > 0
       # äº‹å‰æº–å‚™ï¼ˆã‚¨ãƒ©ãƒ¼ãƒã‚§ãƒƒã‚¯ï¼Œãƒ¡ãƒ¢ãƒªé ˜åŸŸã®ç”Ÿæˆï¼‰
-      $cfgData[@api].sort.each do |id, params|
-        prepare(id, params)
+      $cfgData[@api].sort.each do |key, params|
+        prepare(key, params)
       end
 
@@ -171 +171 @@
       $kernelCfgC.add("const #{@OBJ_S}INIB _kernel_#{@obj_s}inib_table" \
                                                                                                         "[TNUM_#{@OBJ}ID] = {")
-      $cfgData[@api].sort.each_with_index do |(id, params), index|
+      $cfgData[@api].sort.each_with_index do |(key, params), index|
         $kernelCfgC.add(",") if index > 0
-        $kernelCfgC.append("\t{ " + generateInib(id, params) + " }")
+        $kernelCfgC.append("\t{ " + generateInib(key, params) + " }")
       end
       $kernelCfgC.add
@@ -197 +197 @@
 #  通知ハンドラの生成関数
 #
-def generateNotifyHandler(id, params, objid)
+def generateNotifyHandler(key, params, objid)
   # ãƒ‘ãƒ©ãƒ¡ãƒ¼ã‚¿ã‚’å¤‰æ•°ã«æ ¼ç´
   nfymode = params[:nfymode]
@@ -376 +376 @@
 
   # DEF_ICSãŒã‚ã‚‹å ´åˆã®å‡¦ç†
-  params = $cfgData[:DEF_ICS].values[0]
+  params = $cfgData[:DEF_ICS][1]
 
   # istkszがターゲット定義の最小値（TARGET_MIN_ISTKSZï¼Œæœªå®šç¾©ã®å ´åˆã¯1）
@@ -439 +439 @@
 
 # エラーチェック
-$cfgData[:ATT_INI].each do |id, params|
+$cfgData[:ATT_INI].each do |key, params|
   # iniatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI3241ï¼½
   #（TA_NULLã§ãªã„å ´åˆï¼‰
@@ -453 +453 @@
 {
 EOS
-$cfgData[:ATT_INI].each do |id, params|
+$cfgData[:ATT_INI].each do |key, params|
   $kernelCfgC.add("\t((INIRTN)(#{params[:inirtn]}))" \
                                                                 "((intptr_t)(#{params[:exinf]}));")
@@ -465 +465 @@
 
 # エラーチェック
-$cfgData[:ATT_TER].each do |id, params|
+$cfgData[:ATT_TER].each do |key, params|
   # teratrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI3248ï¼½
   #（TA_NULLã§ãªã„å ´åˆï¼‰
@@ -479 +479 @@
 {
 EOS
-$cfgData[:ATT_TER].reverse_each do |id, params|
+$cfgData[:ATT_TER].reverse_each do |key, params|
   $kernelCfgC.add("\t((TERRTN)(#{params[:terrtn]}))" \
                                                                 "((intptr_t)(#{params[:exinf]}));")
@@ -489 +489 @@
 #
 $kernelCfgH.append(<<EOS)
-
 #endif /* TOPPERS_KERNEL_CFG_H */
 EOS