rewrite-SPICEdev, fix ngspiceMODULEinit.c.xml too

src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml

@@ -35,75 +35,72 @@
 #include "$(module)init.h"
 
 SPICEdev $(module)info = {
-  {   "$module",
+    .DEVpublic = {
-      "$module created by adms",
+        .name = "$module",
-      &$(module)nSize,
+        .description = "$module created by adms",
-      &$(module)nSize,
+        .terms = &$(module)nSize,
-      $(module)names,
+        .numNames = &$(module)nSize,
-      &$(module)pTSize,
+        .termNames = $(module)names,
-      $(module)pTable,
+        .numInstanceParms = &$(module)pTSize,
-      &$(module)mPTSize,
+        .instanceParms = $(module)pTable,
-      $(module)mPTable,
+        .numModelParms = &$(module)mPTSize,
+        .modelParms = $(module)mPTable,
+        .flags = DEV_DEFAULT,
+
 #ifdef XSPICE
-/*----  Fixed by SDB 5.2.2003 to enable XSPICE/tclspice integration  -----*/
+        .cm_func = NULL,
-        NULL,  /* This is a SPICE device, it has no MIF info data */
+        .num_conn = 0,
-
+        .conn = NULL,
-        0,     /* This is a SPICE device, it has no MIF info data */
+        .num_param = 0,
-        NULL,  /* This is a SPICE device, it has no MIF info data */
+        .param = NULL,
-
+        .num_inst_var = 0,
-        0,     /* This is a SPICE device, it has no MIF info data */
+        .inst_var = NULL,
-        NULL,  /* This is a SPICE device, it has no MIF info data */
-
-        0,     /* This is a SPICE device, it has no MIF info data */
-        NULL,  /* This is a SPICE device, it has no MIF info data */
-/*---------------------------  End of SDB fix   -------------------------*/
 #endif
-      DEV_DEFAULT
+    },
-  },
+
+    .DEVparam = $(module)par,
+    .DEVmodParam = $(module)mParam,
+    .DEVload = $(module)load,
+    .DEVsetup = $(module)setup,
+    .DEVunsetup = $(module)unsetup,
+    .DEVpzSetup = $(module)setup,
+    .DEVtemperature = $(module)temp,
+    .DEVtrunc = $(module)trunc,
+    .DEVfindBranch = NULL,
+    .DEVacLoad = $(module)acLoad,
+    .DEVaccept = NULL,
+    .DEVdestroy = $(module)destroy,
+    .DEVmodDelete = $(module)mDelete,
+    .DEVdelete = $(module)delete,
+    .DEVsetic = NULL,
+    .DEVask = $(module)ask,
+    .DEVmodAsk = $(module)mAsk,
+    .DEVpzLoad = $(module)pzLoad,
+    .DEVconvTest = NULL,
+    .DEVsenSetup = NULL,
+    .DEVsenLoad = NULL,
+    .DEVsenUpdate = NULL,
+    .DEVsenAcLoad = NULL,
+    .DEVsenPrint = NULL,
+    .DEVsenTrunc = NULL,
+    .DEVdisto = NULL,
+    .DEVnoise = NULL,
+    .DEVsoaCheck = NULL,
+    .DEVinstSize = &$(module)iSize,
+    .DEVmodSize = &$(module)mSize,
 
-    $(module)par,    /* DEVparam       */
-    $(module)mParam,   /* DEVmodParam    */
-    $(module)load,     /* DEVload        */
-    $(module)setup,    /* DEVsetup       */
-    $(module)unsetup,  /* DEVunsetup     */
-    $(module)setup,    /* DEVpzSetup     */
-    $(module)temp,     /* DEVtemperature */
-    $(module)trunc,    /* DEVtrunc       */
-    NULL,         /* DEVfindBranch  */
-    $(module)acLoad,   /* DEVacLoad      */
-    NULL,         /* DEVaccept      */
-    $(module)destroy,  /* DEVdestroy     */
-    $(module)mDelete,  /* DEVmodDelete   */
-    $(module)delete,   /* DEVdelete      */
-    NULL,    /* DEVsetic       */
-    $(module)ask,      /* DEVask         */
-    $(module)mAsk,     /* DEVmodAsk      */
-    $(module)pzLoad,   /* DEVpzLoad      */
-    NULL, /* DEVconvTest    */
-    NULL,         /* DEVsenSetup    */
-    NULL,         /* DEVsenLoad     */
-    NULL,         /* DEVsenUpdate   */
-    NULL,         /* DEVsenAcLoad   */
-    NULL,         /* DEVsenPrint    */
-    NULL,         /* DEVsenTrunc    */
-    NULL,         /* DEVdisto       */
-    NULL,         /* DEVnoise       */
-    NULL,         /* DEVsoaCheck    */
 #ifdef CIDER
-    NULL,         /* DEVdump       */
+    .DEVdump = NULL,
-    NULL,         /* DEVacct       */
+    .DEVacct = NULL,
-#endif                                                         
+#endif
-    &$(module)iSize,   /* DEVinstSize    */
-    &$(module)mSize    /* DEVmodSize     */
-
 };
 
+
 SPICEdev *
 get_$(module)_info(void)
 {
     return &$(module)info;
 }
-
 </admst:template>