From 8d3acddc7b03652a5e7e0bc80226e991ff1822d8 Mon Sep 17 00:00:00 2001 From: rlar Date: Sat, 1 Apr 2017 19:26:07 +0200 Subject: [PATCH] ifparm, #12/16, res.c, missing IF_PRINCIPAL in an alias entry, introduce IOPPR --- src/include/ngspice/devdefs.h | 1 + src/spicelib/devices/res/res.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/include/ngspice/devdefs.h b/src/include/ngspice/devdefs.h index 717acb734..be06f961d 100644 --- a/src/include/ngspice/devdefs.h +++ b/src/include/ngspice/devdefs.h @@ -144,6 +144,7 @@ extern int DEVmaxnum; /* size of DEVices array */ # define IOPU(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_UNINTERESTING, d } # define IOPUR(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_UNINTERESTING|IF_REDUNDANT, d } # define IOPP(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_PRINCIPAL, d } +# define IOPPR(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_PRINCIPAL|IF_REDUNDANT, d } # define IOPA(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_AC, d } # define IOPAR(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_AC|IF_REDUNDANT, d } # define IOPAU(a,b,c,d) { a, b, c|IF_SET|IF_ASK|IF_AC|IF_UNINTERESTING,d } diff --git a/src/spicelib/devices/res/res.c b/src/spicelib/devices/res/res.c index e083e7a83..608eebe28 100644 --- a/src/spicelib/devices/res/res.c +++ b/src/spicelib/devices/res/res.c @@ -12,7 +12,7 @@ Modified: 2000 AlansFixes IFparm RESpTable[] = { /* parameters */ IOPP( "resistance", RES_RESIST, IF_REAL, "Resistance"), - IOPR( "r", RES_RESIST, IF_REAL, "Resistance"), + IOPPR( "r", RES_RESIST, IF_REAL, "Resistance"), IOPAA( "ac", RES_ACRESIST, IF_REAL, "AC resistance value"), IOPZU( "temp", RES_TEMP, IF_REAL, "Instance operating temperature"), IOPZ( "dtemp", RES_DTEMP, IF_REAL,