Changeset 306 for asp3_wo_tecs/trunk/kernel/pridataq.trb

Timestamp:

Jun 27, 2017, 10:53:32 AM (7 years ago)

Author:

ertl-honda

Message:

3.1.0を反映

File:

• asp3_wo_tecs/trunk/kernel/pridataq.trb (modified) (4 diffs)

asp3_wo_tecs/trunk/kernel/pridataq.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: pridataq.trb 588 2016-02-05 12:54:58Z ertl-hiro $
+#   $Id: pridataq.trb 668 2016-03-03 13:57:53Z ertl-hiro $
 # 
 
@@ -67 +67 @@
 
   def prepare(key, params)
+    # パラメータが省略された時のデフォルト値の設定
+    params[:pdqmb] ||= "NULL"
+
     # pdqatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI1804ï¼½
     #（TA_TPRIä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -81 +84 @@
     # pdqmbがNULLã§ãªã„å ´åˆï¼ˆE_NOSPT）［ASPS0142ï¼½
     if params[:pdqmb] != "NULL"
-      error_illegal_id("E_PAR", params, :pdqmb, :pdqid)
+      error_illegal_id("E_NOSPT", params, :pdqmb, :pdqid)
     end
 
@@ -87 +90 @@
 ˆåº¦ãƒ‡ãƒ¼ã‚¿ã‚­ãƒ¥ãƒ¼ç®¡ç†é ˜åŸŸ
     if params[:pdqcnt] > 0
-      $kernelCfgC.add("static PDQMB _kernel_pdqmb_#{params[:pdqid]}" \
-                                                                                                "[#{params[:pdqcnt]}];")
+      pdqmbName = "_kernel_pdqmb_#{params[:pdqid]}"
+      $kernelCfgC.add("static PDQMB #{pdqmbName}[#{params[:pdqcnt]}];")
+      params[:pdqinib_pdqmb] = pdqmbName
+    else
+      params[:pdqinib_pdqmb] = "NULL"
     end
   end
 
   def generateInib(key, params)
-    if params[:pdqcnt] > 0
-      pdqmb = "_kernel_pdqmb_#{params[:pdqid]}"
-    else
-      pdqmb = "NULL"
-    end
     return("(#{params[:pdqatr]}), (#{params[:pdqcnt]}), " \
-                                                                        "(#{params[:maxdpri]}), #{pdqmb}")
+                                "(#{params[:maxdpri]}), #{params[:pdqinib_pdqmb]}")
   end
 end