From 015741260f244871a3cacf01e13bdca17e45388f Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 27 Feb 2011 20:05:32 +0000
Subject: [PATCH] bug fix, three of them (vsrc, isrc)

---
 ChangeLog                            | 8 +++++++-
 src/spicelib/devices/isrc/isrcask.c  | 1 +
 src/spicelib/devices/vsrc/vsrcload.c | 6 ++++--
 src/spicelib/devices/vsrc/vsrcpar.c  | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5125821b9..8481d3026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-27  Robert Larice
+ * src/spicelib/devices/isrc/isrcask.c ,
+ * src/spicelib/devices/vsrc/vsrcload.c ,
+ * src/spicelib/devices/vsrc/vsrcpar.c :
+    bug fix, three of them (vsrc, isrc)
+
 2011-02-22 Dietmar Warning
  * diode & bjt temperature model update, now it is possible to select the
    temperature equations with tlev and tlevc in similar manner as in other well
@@ -5,7 +11,7 @@
 
 2011-02-21 Dietmar Warning
  * inpcom.c: exclude appending m= to .model cards
- * adms/admst/ngspiceMakefile.am.xml: rm some obsolete files 
+ * adms/admst/ngspiceMakefile.am.xml: rm some obsolete files
    on maintainer-clean action
 
 2011-02-19  Holger Vogt
diff --git a/src/spicelib/devices/isrc/isrcask.c b/src/spicelib/devices/isrc/isrcask.c
index 858a0f326..13e3f870f 100644
--- a/src/spicelib/devices/isrc/isrcask.c
+++ b/src/spicelib/devices/isrc/isrcask.c
@@ -63,6 +63,7 @@ ISRCask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *
             return (OK);
         case ISRC_FCN_TYPE:
             value->iValue = here->ISRCfunctionType;
+            return (OK);
         case ISRC_AC_REAL:
             value->rValue = here->ISRCacReal;
             return (OK);
diff --git a/src/spicelib/devices/vsrc/vsrcload.c b/src/spicelib/devices/vsrc/vsrcload.c
index 0f2d44ac8..7971b58d2 100644
--- a/src/spicelib/devices/vsrc/vsrcload.c
+++ b/src/spicelib/devices/vsrc/vsrcload.c
@@ -388,10 +388,12 @@ loadDone:
             value *= cm_analog_ramp_factor();
 #else
             if (ckt->CKTmode & MODETRANOP) value *= ckt->CKTsrcFact;
-            /* load the new voltage value into the matrix */
-            *(ckt->CKTrhs + (here->VSRCbranch)) += value;
 #endif
 /* gtri - end - wbk - modify to process srcFact, etc. for all sources */
+
+            /* load the new voltage value into the matrix */
+            *(ckt->CKTrhs + (here->VSRCbranch)) += value;
+
         } // for loop instances
     } // for loop models
     return(OK);
diff --git a/src/spicelib/devices/vsrc/vsrcpar.c b/src/spicelib/devices/vsrc/vsrcpar.c
index 4ca4963a9..525269861 100644
--- a/src/spicelib/devices/vsrc/vsrcpar.c
+++ b/src/spicelib/devices/vsrc/vsrcpar.c
@@ -149,8 +149,8 @@ VSRCparam(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
                 break;
             default:
                 return(E_BADPARM);
-                break;
             }
+            break;
         case VSRC_D_F2:
             here->VSRCdF2given = TRUE;
             here->VSRCdGiven = TRUE;