psp102 white spaces and admsXml adaptions

src/spicelib/devices/adms/psp102/admsva/PSP102_module.include

@@ -734,6 +734,9 @@
 
     analog begin
 
+`ifdef insideADMS
+        `INITIAL_MODEL
+`endif
         begin : initial_model
         // Code independent of bias or instance parameters
         // This block needs to be evaluated only once
@@ -830,6 +833,9 @@
 
         end // initial_model
 
+`ifdef insideADMS
+        `INITIAL_INSTANCE
+`endif
         begin : initial_instance
         // Code independent of bias, but dependent on instance parameters,
         //   (including code dependent on parameters which could IN PRINCIPLE be scaled)

src/spicelib/devices/adms/psp102/admsva/SIMKIT_macrodefs.include

@@ -30,18 +30,22 @@
 `define CLIP_HIGH(val,max)     ((val)<(max)?(val):(max))
 `define CLIP_BOTH(val,min,max) ((val)>(min)?((val)<(max)?(val):(max)):(min))
 
-    // Note 1: In this va-code, the `P-macro is defined such that its argument
+// Note 1: In this va-code, the `P-macro is defined such that its argument
-    // is ignored during compilation; in this source code it acts as
+// is ignored during compilation; in this source code it acts as
-    // a comment
+// a comment
-    // Note 2: In this va-code, the "from" keyword in the parameter
+// Note 2: In this va-code, the "from" keyword in the parameter
-    // list is not used. Silent clipping is used instead. One could enable
+// list is not used. Silent clipping is used instead. One could enable
-    // the Verilog-A range checking by redefining the `from-macro below.
+// the Verilog-A range checking by redefining the `from-macro below.
-    `define P(txt)
+`define P(txt)
-    `define AT_MODEL
+`ifdef insideADMS
-    `define AT_INSTANCE
+    `define from(lower,upper) from[lower:upper]
-    `define AT_NOISE
+    `define INITIAL_MODEL @(initial_model)
+    `define INITIAL_INSTANCE @(initial_instance)
+`else
     `define from(lower,upper)
-//    `define from(lower,upper) from[lower:upper]
+    `define INITIAL_MODEL
+    `define INITIAL_INSTANCE
+`endif
 
 // Some  functions
 `define MAX(x,y)              ((x)>(y)?(x):(y))

src/spicelib/devices/adms/psp102/admsva/psp102.va

@@ -33,15 +33,15 @@
 // `undef LocalModel
 // `define Binning
 
-module PSP102VA(D, G, S, B)
+module PSP102VA(D, G, S, B);
 
-`P(
+//`P(
-  info = "PSP MOSFET Model"
+//  info = "PSP MOSFET Model"
-  version = `VERS
+//  version = `VERS
-  revision = `VREV
+//  revision = `VREV
-  simkit:name = "psp1020"
+//  simkit:name = "psp1020"
-  simkit:desc = "psp_1020"
+//  simkit:desc = "psp_1020"
-);
+//)
 
 `include "PSP102_module.include"