From fc6f41ae9b88de93b9d3bed7b6a1ac95250b2034 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Mon, 7 Dec 2020 13:14:55 +0100
Subject: [PATCH] Remove the XSPICE limitation of flag "current"
 (here->ISRCcurrent)

---
 src/spicelib/devices/isrc/isrc.c     | 4 ----
 src/spicelib/devices/isrc/isrcask.c  | 4 ----
 src/spicelib/devices/isrc/isrcdefs.h | 4 ----
 src/spicelib/devices/isrc/isrcload.c | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/src/spicelib/devices/isrc/isrc.c b/src/spicelib/devices/isrc/isrc.c
index 95d92b65a..d6801e8ef 100644
--- a/src/spicelib/devices/isrc/isrc.c
+++ b/src/spicelib/devices/isrc/isrc.c
@@ -38,11 +38,7 @@ IFparm ISRCpTable[] = { /* parameters */
  IP  ("ac",      ISRC_AC,        IF_REALVEC,"AC magnitude, phase vector"),
  OP  ("v",       ISRC_VOLTS,     IF_REAL,   "Voltage across the supply"),
  OP  ("p",       ISRC_POWER,     IF_REAL,   "Power supplied by the source"),
-/* gtri - begin - add parameter for current source value */
-#ifdef XSPICE
  OP  ("current", ISRC_CURRENT,   IF_REAL,   "Current in DC or Transient mode"),
-#endif
-/* gtri - end - add parameter for current source value */
  IP  ("distof1", ISRC_D_F1,      IF_REALVEC,"f1 input for distortion"),
  IP  ("distof2", ISRC_D_F2,      IF_REALVEC,"f2 input for distortion")
 };
diff --git a/src/spicelib/devices/isrc/isrcask.c b/src/spicelib/devices/isrc/isrcask.c
index 27e8b4ef2..934bcb093 100644
--- a/src/spicelib/devices/isrc/isrcask.c
+++ b/src/spicelib/devices/isrc/isrcask.c
@@ -92,13 +92,9 @@ ISRCask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value, IFvalue *
                         *(ckt->CKTrhsOld + here->ISRCnegNode));
             }
             return(OK);
-/* gtri - begin - add current value information */
-#ifdef XSPICE
         case ISRC_CURRENT:
             value->rValue = here->ISRCcurrent;
             return (OK);
-#endif
-/* gtri - end - add current value information */
 #ifdef SHARED_MODULE
         case ISRC_EXTERNAL:
             /* Don't do anything */
diff --git a/src/spicelib/devices/isrc/isrcdefs.h b/src/spicelib/devices/isrc/isrcdefs.h
index 7564dfeda..adaf86876 100644
--- a/src/spicelib/devices/isrc/isrcdefs.h
+++ b/src/spicelib/devices/isrc/isrcdefs.h
@@ -51,12 +51,8 @@ typedef struct sISRCinstance {
     struct trnoise_state *ISRCtrnoise_state; /* transient noise */
     struct trrandom_state *ISRCtrrandom_state; /* transient random source */
 
-/* gtri - begin - add member to hold current source value */
-#ifdef XSPICE
     /* needed for outputting results */
     double ISRCcurrent; /* current value */
-#endif
-/* gtri - end - add member to hold current source value */
 
     unsigned ISRCdcGiven     :1 ;  /* flag to indicate dc value given */
     unsigned ISRCmGiven      :1 ;  /* flag to indicate multiplier given */
diff --git a/src/spicelib/devices/isrc/isrcload.c b/src/spicelib/devices/isrc/isrcload.c
index 00f111553..c70ede732 100644
--- a/src/spicelib/devices/isrc/isrcload.c
+++ b/src/spicelib/devices/isrc/isrcload.c
@@ -409,11 +409,7 @@ loadDone:
 
 /* gtri - end - wbk - modify to process srcFact, etc. for all sources */
 
-#ifdef XSPICE
-/* gtri - begin - wbk - record value so it can be output if requested */
             here->ISRCcurrent = m * value;
-/* gtri - end   - wbk - record value so it can be output if requested */
-#endif
         } // for loop instances
     } // for loop models