From e3110964296345d2ed4dfbe12d7b69158c20108b Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Mon, 8 Jan 2018 21:41:11 +0100
Subject: [PATCH] gendef.h, get rid of awkward counted GENnode macros

---
 src/include/ngspice/gendefs.h       | 9 ---------
 src/spicelib/analysis/tfanal.c      | 8 ++++----
 src/spicelib/devices/urc/urcsetup.c | 2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/include/ngspice/gendefs.h b/src/include/ngspice/gendefs.h
index dae4e1fe6..a8f1cd5fb 100644
--- a/src/include/ngspice/gendefs.h
+++ b/src/include/ngspice/gendefs.h
@@ -25,15 +25,6 @@ struct GENinstance {
                     /* carefull, thats overlayed into the actual device structs */
 };
 
-/* argh, terminals are counted from 1 */
-#define GENnode1 GENnode[0]
-#define GENnode2 GENnode[1]
-#define GENnode3 GENnode[2]
-#define GENnode4 GENnode[3]
-#define GENnode5 GENnode[4]
-#define GENnode6 GENnode[5]
-#define GENnode7 GENnode[6]
-
 
 /* per model data */
 
diff --git a/src/spicelib/analysis/tfanal.c b/src/spicelib/analysis/tfanal.c
index 548972827..f9c33c715 100644
--- a/src/spicelib/analysis/tfanal.c
+++ b/src/spicelib/analysis/tfanal.c
@@ -76,8 +76,8 @@ TFanal(CKTcircuit *ckt, int restart)
     }
 
     if (job->TFinIsI) {
-        ckt->CKTrhs[ptr->GENnode1] -= 1;
-        ckt->CKTrhs[ptr->GENnode2] += 1;
+        ckt->CKTrhs[ptr->GENnode[0]] -= 1;
+        ckt->CKTrhs[ptr->GENnode[1]] += 1;
     } else {
         insrc = CKTfndBranch(ckt, job->TFinSrc);
         ckt->CKTrhs[insrc] += 1;
@@ -119,8 +119,8 @@ TFanal(CKTcircuit *ckt, int restart)
 
     /* now for input resistance */
     if (job->TFinIsI) {
-        outputs[1] = ckt->CKTrhs[ptr->GENnode2] -
-                ckt->CKTrhs[ptr->GENnode1];
+        outputs[1] = ckt->CKTrhs[ptr->GENnode[1]] -
+                ckt->CKTrhs[ptr->GENnode[0]];
     } else {
         if(fabs(ckt->CKTrhs[insrc])<1e-20) {
             outputs[1]=1e20;
diff --git a/src/spicelib/devices/urc/urcsetup.c b/src/spicelib/devices/urc/urcsetup.c
index 2df4ef01f..1db4a012e 100644
--- a/src/spicelib/devices/urc/urcsetup.c
+++ b/src/spicelib/devices/urc/urcsetup.c
@@ -302,7 +302,7 @@ URCunsetup(GENmodel *inModel, CKTcircuit *ckt)
 		return E_NOMOD;
 
 	    for (in = modfast->GENinstances; in; in = in->GENnextInstance)
-		CKTdltNNum(ckt, in->GENnode1);
+		CKTdltNNum(ckt, in->GENnode[0]);
 
 	    CKTdltMod(ckt, modfast);	/* Does the elements too */