From e47ab87385432dbef422ca8fc75d47732ff15ae1 Mon Sep 17 00:00:00 2001 From: h_vogt Date: Sun, 12 Mar 2017 14:04:46 +0100 Subject: [PATCH] inpcom.c, multiplier 'm' in subcircuits: exclude all devices not supporting multiplier 'm' --- src/frontend/inpcom.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index 57b2275e0..added9186 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -2684,9 +2684,6 @@ found_mult_param(int num_params, char *param_names[]) /* If a subcircuit invocation (X-line) is found, which contains the multiplier parameter 'm', m is added to all lines inside the corresponding subcircuit except of some excluded in the code below - (FIXME: It may be necessary to exclude more of them, at least - for all devices that are not supporting the 'm' parameter). - Function is called from inp_fix_inst_calls_for_numparam() */ static int @@ -2714,8 +2711,8 @@ inp_fix_subckt_multiplier(struct names *subckt_w_params, struct card *subckt_car card && !ciprefix(".ends", card->line); card = card->nextcard) { char *curr_line = card->line; - /* no 'm' for B, V, E, H or comment line */ - if (strchr("*bveh", curr_line[0])) + /* no 'm' for comment line, B, V, E, H and some others that are not using 'm' in their model description */ + if (strchr("*bvehaknopstuwy", curr_line[0])) continue; /* no 'm' for model cards */ if (ciprefix(".model", curr_line))