Merge remote-tracking branch 'origin/xdccore-H-sasha' into master_ggentree
diff --git a/src/packages/xdc/rov/Model.xs b/src/packages/xdc/rov/Model.xs
index ea138e3..d2b57c8 100644
--- a/src/packages/xdc/rov/Model.xs
+++ b/src/packages/xdc/rov/Model.xs
@@ -513,6 +513,7 @@
                                 /* All C modules belong to the package "C" */
                                 mod.name = "C." + modCaps.moduleName;
                                 mod.viewMap = modCaps.viewMap;
+                                mod.argsMap = modCaps.argsMap;
                                 mod.capsule = modCaps;
                                 Program.addCMod(mod);
                                 cmodules.push(mod.name);
diff --git a/src/packages/xdc/rov/Program.xs b/src/packages/xdc/rov/Program.xs
index fb0d0af..aa8e804 100644
--- a/src/packages/xdc/rov/Program.xs
+++ b/src/packages/xdc/rov/Program.xs
@@ -846,6 +846,7 @@
             vMap["type"] = ViewInfo.MODULE_DATA;
             vMap["viewInitFxn"] = cmod.viewMap[i].fxn;
             vMap["structName"] = cmod.viewMap[i].structName;
+            vMap["argsName"] = cmod.viewMap[i].argsName;
             mod.viewInfo.viewMap[cmod.viewMap[i].name] = vMap;
             mod.useMod[cmod.viewMap[i].structName] =
                 cmod.capsule[cmod.viewMap[i].structName];
@@ -862,6 +863,12 @@
             Object.defineProperty(prot, "$status", {enumerable: false});
         }
     }
+    if (cmod.argsMap && cmod.argsMap.length > 0) {
+        for (var ki = 0; ki < cmod.argsMap.length; ki++) {
+            var args = cmod.argsMap[ki];
+            mod.viewInfo.argsMap[args.name] = { description: args.description, args: args.args};
+        }
+    }
     cmodTab[mod.name] = mod;
 }