From afb4ad7921f7b406f28c4a7add56aaa9ff74a6c7 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Fri, 12 Aug 2011 15:18:41 +0000
Subject: [PATCH] pull two -adms3 fixes into -adms

---
 ChangeLog                                     | 17 +++++++++++
 .../devices/adms/admst/ngspiceMODULEask.c.xml |  9 +++++-
 .../admst/ngspiceMODULEguesstopology.c.xml    |  7 ++++-
 .../adms/admst/ngspiceMODULEload.c.xml        | 11 +++----
 .../adms/admst/ngspiceMODULEmask.c.xml        |  6 +++-
 .../devices/adms/admst/ngspiceMODULEpar.c.xml |  8 ++++-
 .../adms/admst/ngspiceMODULEpzld.c.xml        |  6 +++-
 .../adms/admst/ngspiceMODULEtemp.c.xml        |  6 +++-
 .../devices/adms/admst/ngspiceMakefile.am.xml | 30 ++++++++++++++++++-
 9 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84421ffdd..92e24d55b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-08-12  Robert Larice
+ * src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml ,
+ * src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml ,
+ * src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml ,
+ * src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml ,
+ * src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml ,
+ * src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml ,
+ * src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml ,
+ * src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml :
+   pull two -adms3 fixes into -adms
+     2011-07-25
+       convert K&R function definitions to ansi style
+       and declare a debug function `static'
+     2011-07-26
+       swallow unsed variable warnings in adms generated code,
+       upgrade dependencies
+
 2011-08-12  Robert Larice
  * src/frontend/plotting/Makefile.am ,
  * src/frontend/plotting/grid.c ,
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
index 70cad51ec..4f963542a 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.6  2011-01-13 17:05:46  dwarning
+  Revision 1.7  2011-08-12 15:18:41  rlar
+  pull two -adms3 fixes into -adms
+
+  Revision 1.6  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.5  2007/04/24 08:59:09  r29173
@@ -66,6 +69,10 @@
 int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *select)
 {
   $(module)instance *instance = ($(module)instance*)inst;
+  NG_IGNOREABLE(ckt);
+  NG_IGNOREABLE(value);
+  NG_IGNOREABLE(select);
+  NG_IGNOREABLE(instance);
   switch (which) {
   <admst:for-each select="variable[parametertype='instance' and input='yes']">
     <admst:value-of select="name"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
index 3c6ad279b..cffb94835 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.14  2011-01-13 17:05:46  dwarning
+  Revision 1.15  2011-08-12 15:18:41  rlar
+  pull two -adms3 fixes into -adms
+
+  Revision 1.14  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.13  2007/05/11 07:19:58  r29173
@@ -283,6 +286,8 @@
 int $(module)guesstopology (SMPmatrix *matrix, CKTcircuit *ckt, $(module)model *model, $(module)instance *here)
      /* guess topology */
 {
+  NG_IGNOREABLE(matrix);
+  NG_IGNOREABLE(ckt);
 <admst:template match="evaluate.localvariables">
   <admst:choose>
     <admst:when test="[datatypename='assignment']">
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
index cab5b25ee..96302434c 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.9  2011-01-13 17:05:46  dwarning
+  Revision 1.10  2011-08-12 15:18:41  rlar
+  pull two -adms3 fixes into -adms
+
+  Revision 1.9  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.8  2007/07/05 09:44:11  r29173
@@ -219,9 +222,7 @@ if(ChargeComputationNeeded)\\
 }\\
 (here->JDVAL_ ## Sp ## _ ## Pp)+=v;
 
-int $(module)load(inModel,ckt)
-     GENmodel *inModel;
-     register CKTcircuit *ckt;
+int $(module)load(GENmodel *inModel, CKTcircuit *ckt)
      /* actually load the current value into the 
       * sparse matrix previously provided 
       */
@@ -265,7 +266,7 @@ int $(module)load(inModel,ckt)
 <admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
-  <admst:text format="void $(module)debug (CKTcircuit *ckt, $(module)model *model, $(module)instance *here)\n"/>
+  <admst:text format="static void $(module)debug (CKTcircuit *ckt, $(module)model *model, $(module)instance *here)\n"/>
   <admst:text format="{\n"/>
   <admst:for-each select="node[grounded='no']">
     <admst:value-of select="name"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
index 71204b7b3..c2120f8b1 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.6  2011-01-13 17:05:46  dwarning
+  Revision 1.7  2011-08-12 15:18:41  rlar
+  pull two -adms3 fixes into -adms
+
+  Revision 1.6  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.5  2008/01/06 17:45:33  dwarning
@@ -66,6 +69,7 @@
 int $(module)mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 {
   $(module)model *model = ($(module)model *)inst;
+  NG_IGNOREABLE(ckt);
   switch (which) {
   <admst:for-each select="variable[parametertype='model' and input='yes']">
     <admst:value-of select="name"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
index 00abe9bea..9f7a4a099 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.6  2011-01-13 17:05:46  dwarning
+  Revision 1.7  2011-08-12 15:18:41  rlar
+  pull two -adms3 fixes into -adms
+
+  Revision 1.6  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.5  2007/04/24 08:59:09  r29173
@@ -64,6 +67,9 @@
 int $(module)par(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 {
   $(module)instance *myinstance = ($(module)instance*)inst;
+  NG_IGNOREABLE(value);
+  NG_IGNOREABLE(select);
+  NG_IGNOREABLE(myinstance);
   switch (param) {
   <admst:for-each select="variable[parametertype='instance' and input='yes']">
     <admst:value-of select="name"/>
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml
index 0e9141831..208a82ebb 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEpzld.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.3  2011-01-13 17:05:46  dwarning
+  Revision 1.4  2011-08-12 15:18:41  rlar
+  pull two -adms3 fixes into -adms
+
+  Revision 1.3  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.2  2006/03/05 09:38:41  pnenzi
@@ -69,6 +72,7 @@ int $(module)pzLoad(GENmodel *inModel, CKTcircuit *ckt, SPcomplex *s)
 {
   register $(module)model *model = ($(module)model*)inModel;
   register $(module)instance *here;
+  NG_IGNOREABLE(ckt);
   for ( ; model != NULL; model = model->$(module)nextModel )
   {
     /* loop through all the instances of the model */
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
index 77830c80e..6cb59541c 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.6  2011-01-13 17:05:46  dwarning
+  Revision 1.7  2011-08-12 15:18:41  rlar
+  pull two -adms3 fixes into -adms
+
+  Revision 1.6  2011/01/13 17:05:46  dwarning
   set version parameter to 2.3.0
 
   Revision 1.5  2007/04/24 08:59:09  r29173
@@ -84,6 +87,7 @@ int $(module)temp(GENmodel *inModel, CKTcircuit *ckt)
 {
   register $(module)model *model = ($(module)model*)inModel;
   register $(module)instance *here;
+  NG_IGNOREABLE(ckt);
   for ( ; model != NULL; model = model->$(module)nextModel )
   {
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
index 379274b48..d4ad3db53 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.21  2011-07-23 07:57:07  dwarning
+  Revision 1.22  2011-08-12 15:18:41  rlar
+  pull two -adms3 fixes into -adms
+
+  Revision 1.21  2011/07/23 07:57:07  dwarning
   lower case substitution in xml module
 
   Revision 1.20  2011/05/20 16:15:04  rlar
@@ -101,6 +104,31 @@
 ## Process this file with automake to produce Makefile.in
 
 ADMSXMLINTERFACE=\$(srcdir)/../admst
+$(module).c: \\
+	\$(ADMSXMLINTERFACE)/ngspiceVersion.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEitf.h.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEinit.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEinit.h.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEext.h.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEdefs.h.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEask.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEmask.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEpar.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEmpar.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEload.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEacld.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEpzld.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEtemp.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEtrunc.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEsetup.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEdel.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEmdel.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEdest.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEnoise.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULEguesstopology.c.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULE.hxx.xml \\
+	\$(ADMSXMLINTERFACE)/ngspiceMODULE.c.xml
+
 $(module).c: admsva/$(module).va
 	admsXml -I\$(srcdir) -I\$(srcdir)/admsva \$(srcdir)/admsva/$(module).va \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceVersion.xml \\