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

asp3_wo_tecs/trunk/kernel/dataqueue.trb

@@ -53 +53 @@
 #   ã®è²¬ä»»ã‚’è² ã‚ãªã„ï¼Ž
 # 
-#   $Id: dataqueue.trb 588 2016-02-05 12:54:58Z ertl-hiro $
+#   $Id: dataqueue.trb 668 2016-03-03 13:57:53Z ertl-hiro $
 # 
 
@@ -66 +66 @@
 
   def prepare(key, params)
+    # パラメータが省略された時のデフォルト値の設定
+    params[:dtqmb] ||= "NULL"
+
     # dtqatrãŒç„¡åŠ¹ã®å ´åˆï¼ˆE_RSATR）［NGKI1669ï¼½
     #（TA_TPRIä»¥å¤–ã®ãƒ“ãƒƒãƒˆãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã‚‹å ´åˆï¼‰
@@ -74 +77 @@
     # dtqmbがNULLã§ãªã„å ´åˆï¼ˆE_NOSPT）［ASPS0132ï¼½
     if params[:dtqmb] != "NULL"
-      error_illegal_id("E_PAR", params, :dtqmb, :dtqid)
+      error_illegal_id("E_NOSPT", params, :dtqmb, :dtqid)
     end
 
     # ãƒ‡ãƒ¼ã‚¿ã‚­ãƒ¥ãƒ¼ç®¡ç†é ˜åŸŸ
     if params[:dtqcnt] > 0
-      $kernelCfgC.add("static DTQMB _kernel_dtqmb_#{params[:dtqid]}" \
-                                                                                                "[#{params[:dtqcnt]}];")
+      dtqmbName = "_kernel_dtqmb_#{params[:dtqid]}"
+      $kernelCfgC.add("static DTQMB #{dtqmbName}[#{params[:dtqcnt]}];")
+      params[:dtqinib_dtqmb] = dtqmbName
+    else
+      params[:dtqinib_dtqmb] = "NULL"
     end
   end
 
   def generateInib(key, params)
-    if params[:dtqcnt] > 0
-      dtqmb = "_kernel_dtqmb_#{params[:dtqid]}"
-    else
-      dtqmb = "NULL"
-    end
-    return("(#{params[:dtqatr]}), (#{params[:dtqcnt]}), #{dtqmb}")
+    return("(#{params[:dtqatr]}), (#{params[:dtqcnt]}), " \
+                                                                                "#{params[:dtqinib_dtqmb]}")
   end
 end