diff --git a/.gitignore b/.gitignore index 20f48be767f7b23efded40098be2689da4cb8963..694d46f1465d3920f1f9d353c9bb95e9378c0104 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ *.a *.src bin/* -log/srs/tooldir.c +log/src/log +log/src/loged +log/src/munch.temp +log/src/tooldir.c log/src/ana/logdef.h log/src/ana/log_action.h diff --git a/log/src/ana/capfloat.c b/log/src/ana/capfloat.c index 65f8e9c0d1be95d4ec1d6d771e2a0bfa722ed7f5..74c831326edaf30c0c6f5edb9184aa3de8598698 100644 --- a/log/src/ana/capfloat.c +++ b/log/src/ana/capfloat.c @@ -48,7 +48,7 @@ typedef struct ICCapfloat { /****************************************************************************/ -void Ex_Capfloat(Analog_32_action *act) +static void Ex_Capfloat(Analog_32_action *act) { double MinI1, MinI2, dI1dV1, dI1dV2, dI2dV1, dI2dV2; AnaExt_rec *Pin1Ptr; @@ -105,7 +105,7 @@ void Ex_Capfloat(Analog_32_action *act) /****************************************************************************/ -void Iin_Capfloat(Analog_32_action *act) +static void Iin_Capfloat(Analog_32_action *act) { AnaExt_rec *Pin1Ptr; double VPin1, VMem1; @@ -146,7 +146,7 @@ void Iin_Capfloat(Analog_32_action *act) } /*Iin_Capfloat*/ -void GetCnf_Capfloat(ICCapfloat *NewIC) +static void GetCnf_Capfloat(ICCapfloat *NewIC) { int Found; char Arg[256], Keyword[256]; @@ -176,7 +176,7 @@ void GetCnf_Capfloat(ICCapfloat *NewIC) /* Installation Procedure */ /****************************************************************************/ -void initlib_Capfloat(Analog_32_action *act) +static void initlib_Capfloat(Analog_32_action *act) { AnaCell_rec *NewCell; ICCapfloat *NewIC; @@ -200,7 +200,7 @@ void initlib_Capfloat(Analog_32_action *act) -int Capfloatcheck(log_grec *Inst, long Attrnum) +static int Capfloatcheck(log_grec *Inst, long Attrnum) { int Result; CapfloatConst *CapfloatVar; @@ -223,7 +223,7 @@ int Capfloatcheck(log_grec *Inst, long Attrnum) } -void Attr_Capfloat(Analog_32_action *act) +static void Attr_Capfloat(Analog_32_action *act) { long Attrnum; @@ -235,7 +235,7 @@ void Attr_Capfloat(Analog_32_action *act) } -void Newgate_Capfloat(Analog_32_action *act) +static void Newgate_Capfloat(Analog_32_action *act) { CapfloatConst *CapfloatVar; Anainstlist *A_Gate; @@ -256,7 +256,7 @@ void Newgate_Capfloat(Analog_32_action *act) WITH->attr[N_Cap - 1].changed = true; } -void Copygate_Capfloat(Analog_32_action *act) +static void Copygate_Capfloat(Analog_32_action *act) { CapfloatConst *CapfloatVar, *Old_Capfloatvar; Anainstlist *A_Gate, *A_Oldgate; @@ -272,7 +272,7 @@ void Copygate_Capfloat(Analog_32_action *act) AnaCapCopy(act->inst); } -void Dispose_Capfloat(Analog_32_action *act) +static void Dispose_Capfloat(Analog_32_action *act) { CapfloatConst *CapfloatVar; Anainstlist *A_Gate; @@ -283,7 +283,7 @@ void Dispose_Capfloat(Analog_32_action *act) AnaCapDispose(act->inst); /*7*/ } -void Readgate_Capfloat(Analog_32_action *act) +static void Readgate_Capfloat(Analog_32_action *act) { CapfloatConst *CapfloatVar; Anainstlist *A_Gate; @@ -296,7 +296,7 @@ void Readgate_Capfloat(Analog_32_action *act) WITH1 = act->inst; } -void Probe_Capfloat(Analog_32_action *act) +static void Probe_Capfloat(Analog_32_action *act) { Anainstlist *A_Gate; AnaExt_rec *Node1Ptr, *Node2Ptr; diff --git a/log/src/ana/devtechn.c b/log/src/ana/devtechn.c index f4b525427ec2e123248ab18ea7f38b7d74d95476..d6ce2003e00b69067fa0483496333a18e9ed8d33 100644 --- a/log/src/ana/devtechn.c +++ b/log/src/ana/devtechn.c @@ -62,7 +62,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /****************************************************************************/ -void initlib_Devtechn(act) +static void initlib_Devtechn(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -77,7 +77,7 @@ Analog_32_action *act; } /*NFET4_Initlib*/ -void Reload_Devtechn(act) +static void Reload_Devtechn(act) Analog_32_action *act; { log_grec *WITH; @@ -156,7 +156,7 @@ Analog_32_action *act; } -void Attr_Devtechn(act) +static void Attr_Devtechn(act) Analog_32_action *act; { long Attrnum; @@ -386,7 +386,7 @@ Analog_32_action *act; } } -void Openconfig_Devtechn(act) +static void Openconfig_Devtechn(act) Analog_32_action *act; { long Index; @@ -398,7 +398,7 @@ Analog_32_action *act; Reload_Devtechn(act); } -void Readgate_Devtechn(act) +static void Readgate_Devtechn(act) Analog_32_action *act; { log_grec *WITH; @@ -429,7 +429,7 @@ Analog_32_action *act; } -void Newgate_Devtechn(act) +static void Newgate_Devtechn(act) Analog_32_action *act; { Analog_32_action Newact; diff --git a/log/src/ana/devtechp.c b/log/src/ana/devtechp.c index 396a113881e91b1235e7938ca6d54787662de3a4..9c5b8ac800922cfcb16de119f0b8ba04968d851b 100644 --- a/log/src/ana/devtechp.c +++ b/log/src/ana/devtechp.c @@ -61,7 +61,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /****************************************************************************/ -void initlib_Devtechp(act) +static void initlib_Devtechp(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -76,7 +76,7 @@ Analog_32_action *act; } /*NFET4_Initlib*/ -void Reload_Devtechp(act) +static void Reload_Devtechp(act) Analog_32_action *act; { log_grec *WITH; @@ -155,7 +155,7 @@ Analog_32_action *act; } -void Attr_Devtechp(act) +static void Attr_Devtechp(act) Analog_32_action *act; { long Attrnum; @@ -385,7 +385,7 @@ Analog_32_action *act; } } -void Openconfig_Devtechp(act) +static void Openconfig_Devtechp(act) Analog_32_action *act; { long Index; @@ -397,7 +397,7 @@ Analog_32_action *act; Reload_Devtechp(act); } -void Readgate_Devtechp(act) +static void Readgate_Devtechp(act) Analog_32_action *act; { log_grec *WITH; @@ -428,7 +428,7 @@ Analog_32_action *act; } -void Newgate_Devtechp(act) +static void Newgate_Devtechp(act) Analog_32_action *act; { Analog_32_action Newact; diff --git a/log/src/ana/diode1.c b/log/src/ana/diode1.c index 6761db20a982f51e3b65c7f0cee4e092eff5d145..85f1ae0fb6dc2abe383a1a2d10a9ad63e2f0619c 100644 --- a/log/src/ana/diode1.c +++ b/log/src/ana/diode1.c @@ -52,7 +52,7 @@ typedef struct ICDiode1 { /****************************************************************************/ -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -83,7 +83,7 @@ int Limitflag, Erase; /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -void Ex_Diode1(act) +static void Ex_Diode1(act) Analog_32_action *act; { double MinI1, MinI2, dI1dV1, dI1dV2, dI2dV1, dI2dV2; @@ -160,7 +160,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_Diode1(act) +static void Iin_Diode1(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -210,7 +210,7 @@ Analog_32_action *act; } } /*Iin_Diode1*/ -void GetCnf_Diode1(NewIC) +static void GetCnf_Diode1(NewIC) ICDiode1 *NewIC; { int Found; @@ -273,7 +273,7 @@ ICDiode1 *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_Diode1(act) +static void initlib_Diode1(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -302,7 +302,7 @@ Analog_32_action *act; -int Diode1check(Inst, Attrnum) +static int Diode1check(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -356,7 +356,7 @@ long Attrnum; } -void Attr_Diode1(act) +static void Attr_Diode1(act) Analog_32_action *act; { long Attrnum; @@ -369,7 +369,7 @@ Analog_32_action *act; } -void Newgate_Diode1(act) +static void Newgate_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var; @@ -406,7 +406,7 @@ Analog_32_action *act; WITH->attr[N_Vcrow - 1].changed = true; } -void Copygate_Diode1(act) +static void Copygate_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var, *Old_Diode1var; @@ -423,7 +423,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); } -void Dispose_Diode1(act) +static void Dispose_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var; @@ -435,7 +435,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Diode1(act) +static void Readgate_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var; @@ -472,7 +472,7 @@ Analog_32_action *act; Diode1Var->K2 = AnaExpo(-Diode1Var->lam * WITH->attr[N_Vcrow - 1].UU.r); } -void Probe_Diode1(act) +static void Probe_Diode1(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -527,7 +527,7 @@ Analog_32_action *act; AnaScoreboard("$", (long)AnaMessGate3); } -void Reset_Diode1(act) +static void Reset_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var; @@ -543,7 +543,7 @@ Analog_32_action *act; Limitfill(act->inst, Diode1Var->Limit, false); } -void PreUpdate_Diode1(act) +static void PreUpdate_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var; @@ -562,7 +562,7 @@ Analog_32_action *act; Diode1Var->NewLimit = (VPin1 - Vpin2 >= WITH1->attr[N_Vcrow - 1].UU.r); } -void Update_Diode1(act) +static void Update_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var; @@ -575,7 +575,7 @@ Analog_32_action *act; Diode1Var->Limit = Diode1Var->NewLimit; } -void Display_Diode1(act) +static void Display_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var; @@ -592,7 +592,7 @@ Analog_32_action *act; } -void Refresh_Diode1(act) +static void Refresh_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var; @@ -603,7 +603,7 @@ Analog_32_action *act; Limitfill(act->inst, Diode1Var->Limit, false); } -void Erase_Diode1(act) +static void Erase_Diode1(act) Analog_32_action *act; { Diode1Const *Diode1Var; diff --git a/log/src/ana/ganglion.c b/log/src/ana/ganglion.c index 0351c3805e69e243541bdd6314526eae0a12487c..9a1bdd0cd740c4f78e42a9ed898da02abc77f94f 100644 --- a/log/src/ana/ganglion.c +++ b/log/src/ana/ganglion.c @@ -102,7 +102,7 @@ typedef enum { /****************************************************************************/ -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -132,7 +132,7 @@ int Limitflag, Erase; /* Cell Installation Procedures */ /****************************************************************************/ -void GetCnf_Ganglion(NewIC) +static void GetCnf_Ganglion(NewIC) ICGanglion *NewIC; { int Found; @@ -255,7 +255,7 @@ ICGanglion *NewIC; } -void INITLIB_GANGLION(act) +static void INITLIB_GANGLION(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -310,7 +310,7 @@ Analog_32_action *act; -int Ganglioncheck(Inst, Attrnum) +static int Ganglioncheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -409,7 +409,7 @@ long Attrnum; } -void Attr_Ganglion(act) +static void Attr_Ganglion(act) Analog_32_action *act; { long Attrnum; @@ -428,7 +428,7 @@ Analog_32_action *act; } -void Newgate_Ganglion(act) +static void Newgate_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar; @@ -500,7 +500,7 @@ Analog_32_action *act; WITH->attr[N_Ktqn - 1].changed = true; } -void Copygate_Ganglion(act) +static void Copygate_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar, *Old_Ganglionvar; @@ -516,7 +516,7 @@ Analog_32_action *act; } -void Dispose_Ganglion(act) +static void Dispose_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar; @@ -529,7 +529,7 @@ Analog_32_action *act; } -void Readgate_Ganglion(act) +static void Readgate_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar; @@ -602,7 +602,7 @@ Analog_32_action *act; } -void Reset_Ganglion(act) +static void Reset_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar; @@ -618,7 +618,7 @@ Analog_32_action *act; Limitfill(act->inst, GanglionVar->Limit, false); } -void PreUpdate_Ganglion(act) +static void PreUpdate_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar; @@ -644,7 +644,7 @@ Analog_32_action *act; } -void Update_Ganglion(act) +static void Update_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar; @@ -658,7 +658,7 @@ Analog_32_action *act; } -void Display_Ganglion(act) +static void Display_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar; @@ -675,7 +675,7 @@ Analog_32_action *act; } -void Refresh_Ganglion(act) +static void Refresh_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar; @@ -687,8 +687,7 @@ Analog_32_action *act; } - -void Erase_Ganglion(act) +static void Erase_Ganglion(act) Analog_32_action *act; { GanglionConst *GanglionVar; diff --git a/log/src/ana/hres.c b/log/src/ana/hres.c index ab1f049a6697c8661189a45a7025a7d2bc8c43b8..96e097483eaaadb70e6d6c9c63891e8bde21e71d 100644 --- a/log/src/ana/hres.c +++ b/log/src/ana/hres.c @@ -111,7 +111,7 @@ typedef enum { /****************************************************************************/ -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -140,7 +140,7 @@ int Limitflag, Erase; /* Cell Installation Procedures */ /****************************************************************************/ -void GetCnf_Hres(NewIC) +static void GetCnf_Hres(NewIC) ICHres *NewIC; { int Found; @@ -279,7 +279,7 @@ ICHres *NewIC; } -void INITLIB_Hres(act) +static void INITLIB_Hres(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -336,7 +336,7 @@ Analog_32_action *act; TimeTooSmall=1e-60;*/ -int Hrescheck(Inst, Attrnum) +static int Hrescheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -443,7 +443,7 @@ long Attrnum; } -void Attr_Hres(act) +static void Attr_Hres(act) Analog_32_action *act; { long Attrnum; @@ -461,7 +461,7 @@ Analog_32_action *act; } -void Newgate_Hres(act) +static void Newgate_Hres(act) Analog_32_action *act; { HresConst *HresVar; @@ -539,7 +539,7 @@ Analog_32_action *act; WITH->attr[N_CapVdiff - 1].changed = true; } -void Copygate_Hres(act) +static void Copygate_Hres(act) Analog_32_action *act; { HresConst *HresVar, *Old_Hresvar; @@ -555,7 +555,7 @@ Analog_32_action *act; } -void Dispose_Hres(act) +static void Dispose_Hres(act) Analog_32_action *act; { HresConst *HresVar; @@ -568,7 +568,7 @@ Analog_32_action *act; } -void Readgate_Hres(act) +static void Readgate_Hres(act) Analog_32_action *act; { HresConst *HresVar; @@ -647,7 +647,7 @@ Analog_32_action *act; } -void Reset_Hres(act) +static void Reset_Hres(act) Analog_32_action *act; { HresConst *HresVar; @@ -663,7 +663,7 @@ Analog_32_action *act; Limitfill(act->inst, HresVar->Limit, false); } -void PreUpdate_Hres(act) +static void PreUpdate_Hres(act) Analog_32_action *act; { HresConst *HresVar; @@ -694,7 +694,7 @@ Analog_32_action *act; } -void Update_Hres(act) +static void Update_Hres(act) Analog_32_action *act; { HresConst *HresVar; @@ -708,7 +708,7 @@ Analog_32_action *act; } -void Display_Hres(act) +static void Display_Hres(act) Analog_32_action *act; { HresConst *HresVar; @@ -725,7 +725,7 @@ Analog_32_action *act; } -void Refresh_Hres(act) +static void Refresh_Hres(act) Analog_32_action *act; { HresConst *HresVar; @@ -737,8 +737,7 @@ Analog_32_action *act; } - -void Erase_Hres(act) +static void Erase_Hres(act) Analog_32_action *act; { HresConst *HresVar; @@ -755,7 +754,7 @@ Analog_32_action *act; /****************************************************************************/ -void Ex_Hres(act) +static void Ex_Hres(act) Analog_32_action *act; { double MinIin, dIindVin, dIindVout, dIindVlow, dIindVhigh, MinIout, @@ -870,10 +869,6 @@ Analog_32_action *act; } - - - - ExpoVlow = AnaExpo(HresVar->Kn2 * VPinLow); Kn5_ExpoVlow = HresVar->Kn5 * ExpoVlow; BlendVlow = 1 / (1 + Kn5_ExpoVlow); @@ -889,7 +884,6 @@ Analog_32_action *act; InvBlendVlow * HresVar->TwoKn4 * VPinLow; - ExpoVhigh = AnaExpo(HresVar->Kn2 * (AnaVdd - VPinHigh)); Kn5_ExpoVhigh = HresVar->Kn5 * ExpoVhigh; BlendVhigh = 1 / (1 + Kn5_ExpoVhigh); @@ -906,7 +900,6 @@ Analog_32_action *act; InvBlendVhigh * HresVar->TwoKp4 * pVhigh; - ExpoBot = AnaExpo(HresVar->Kn2 * (VPinLow - MaxVinVout)); BlendBot = 1 / (1 + ExpoBot); dBlendBotdVlow = -HresVar->Kn2 * BlendBot * BlendBot * ExpoBot; @@ -1107,7 +1100,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_Hres(act) +static void Iin_Hres(act) Analog_32_action *act; { AnaExt_rec *PinInPtr; @@ -1278,7 +1271,7 @@ Analog_32_action *act; -void Probe_Hres(act) +static void Probe_Hres(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/idiff.c b/log/src/ana/idiff.c index 80dffed35a19bc980fff73304cadfc0f442f5d4f..8b462d91c93d53f95871b8c480389f41e925129d 100644 --- a/log/src/ana/idiff.c +++ b/log/src/ana/idiff.c @@ -89,7 +89,7 @@ typedef struct ICIDiff { -void Switchfill(Inst, Erase) +static void Switchfill(Inst, Erase) log_grec *Inst; int Erase; { @@ -114,7 +114,7 @@ int Erase; (*AnaLogglobals->hook.unhidecursor)(); } -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -139,7 +139,7 @@ int Limitflag, Erase; (*AnaLogglobals->hook.unhidecursor)(); } -double Pulsemaker(Inst, Ftime, First) +static double Pulsemaker(Inst, Ftime, First) log_grec *Inst; double Ftime; int First; @@ -198,7 +198,7 @@ int First; /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -void Ex_IDiff(act) +static void Ex_IDiff(act) Analog_32_action *act; { /*IDifferent*/ @@ -289,7 +289,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_IDiff(act) +static void Iin_IDiff(act) Analog_32_action *act; { /*IDifferent*/ @@ -395,7 +395,7 @@ Analog_32_action *act; } /*Iin_IDiff*/ -void GetCnf_IDiff(NewIC) +static void GetCnf_IDiff(NewIC) ICIDiff *NewIC; { int Found; @@ -562,7 +562,7 @@ ICIDiff *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_IDiff(act) +static void initlib_IDiff(act) Analog_32_action *act; { /*IDifferent*/ @@ -604,7 +604,7 @@ Analog_32_action *act; -int IDiffcheck(Inst, Attrnum) +static int IDiffcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -710,7 +710,7 @@ long Attrnum; } -void Attr_IDiff(act) +static void Attr_IDiff(act) Analog_32_action *act; { long Attrnum; @@ -723,7 +723,7 @@ Analog_32_action *act; } -void Newgate_IDiff(act) +static void Newgate_IDiff(act) Analog_32_action *act; { IDiffConst *IDiffVar; @@ -771,7 +771,7 @@ Analog_32_action *act; } } -void Copygate_IDiff(act) +static void Copygate_IDiff(act) Analog_32_action *act; { IDiffConst *IDiffVar, *Old_IDiffvar; @@ -787,7 +787,7 @@ Analog_32_action *act; } -void Dispose_IDiff(act) +static void Dispose_IDiff(act) Analog_32_action *act; { IDiffConst *IDiffVar; @@ -799,7 +799,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_IDiff(act) +static void Readgate_IDiff(act) Analog_32_action *act; { IDiffConst *IDiffVar; @@ -829,7 +829,7 @@ Analog_32_action *act; IDiffVar->Reset_Freeze = (*STR1 == 'T' || *STR1 == 't'); } -void Writegate_IDiff(act) +static void Writegate_IDiff(act) Analog_32_action *act; { IDiffConst *IDiffVar; @@ -851,8 +851,7 @@ Analog_32_action *act; } - -void Reset_IDiff(act) +static void Reset_IDiff(act) Analog_32_action *act; { IDiffConst *IDiffVar; @@ -873,7 +872,7 @@ Analog_32_action *act; } } -void Set_Idiff(act) +static void Set_Idiff(act) Analog_32_action *act; { IDiffConst *IdiffVar; @@ -886,7 +885,7 @@ Analog_32_action *act; IdiffVar->Reset_Freeze = act->inst->attr[N_Freeze - 1].UU.b; } -void Clear_Idiff(act) +static void Clear_Idiff(act) Analog_32_action *act; { IDiffConst *IdiffVar; @@ -903,7 +902,7 @@ Analog_32_action *act; IdiffVar->Reset_Freeze = ICptr->ICFreeze; } -void PreUpdate_IDiff(act) +static void PreUpdate_IDiff(act) Analog_32_action *act; { IDiffConst *IDiffVar; @@ -922,7 +921,7 @@ Analog_32_action *act; IDiffVar->NewLimit = (VPin2 - VPin1 + WITH->attr[N_Crowbar - 1].UU.r > -0.0004); } -void Update_IDiff(act) +static void Update_IDiff(act) Analog_32_action *act; { IDiffConst *IDiffVar; @@ -939,7 +938,7 @@ Analog_32_action *act; IDiffVar->Time += AnaDtlast; } -void Display_IDiff(act) +static void Display_IDiff(act) Analog_32_action *act; { IDiffConst *IDiffVar; @@ -969,7 +968,7 @@ Analog_32_action *act; } -void Touch_IDiff(act) +static void Touch_IDiff(act) Analog_32_action *act; { log_action_t *WITH; @@ -986,7 +985,7 @@ Analog_32_action *act; } -void Erase_Idiff(Inst) +static void Erase_Idiff(Inst) log_grec *Inst; { IDiffConst *IDiffVar; @@ -998,7 +997,7 @@ log_grec *Inst; Limitfill(Inst, IDiffVar->Limit, true); } -void Refresh_Idiff(Inst) +static void Refresh_Idiff(Inst) log_grec *Inst; { IDiffConst *IDiffVar; @@ -1011,8 +1010,7 @@ log_grec *Inst; } - -void Probe_Idiff(act) +static void Probe_Idiff(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/iscope.c b/log/src/ana/iscope.c index e22febbef32ff590fd2c90abbaa0ad2c6241a79e..1ead6e46421f969debc013d8236f3d7f3e6a142c 100644 --- a/log/src/ana/iscope.c +++ b/log/src/ana/iscope.c @@ -62,7 +62,7 @@ typedef struct Imeterrec { /* Procedure to correctly position labels */ -void Iscope_Locate(rot, Tx, Ty, Left) +static void Iscope_Locate(rot, Tx, Ty, Left) long rot; short *Tx, *Ty; int *Left; @@ -102,7 +102,7 @@ int *Left; } -double Itot(act) +static double Itot(act) Analog_32_action *act; { Imeterrec *Intptr; @@ -137,7 +137,7 @@ Analog_32_action *act; /* Procedure to update cell in algorithm */ /*******************************************************************************/ -void PreUpdate_Iscope(act) +static void PreUpdate_Iscope(act) Analog_32_action *act; { AnaExt_rec *A_Node; @@ -188,7 +188,7 @@ Analog_32_action *act; /* Procedure to update cell in algorithm */ /*******************************************************************************/ -void Update_Iscope(act) +static void Update_Iscope(act) Analog_32_action *act; { Imeterrec *Intptr; @@ -219,7 +219,7 @@ Analog_32_action *act; /* Procedure to update cell in algorithm */ /*******************************************************************************/ -void Display_Iscope(act) +static void Display_Iscope(act) Analog_32_action *act; { short tx, ty; @@ -254,8 +254,7 @@ Analog_32_action *act; } /*Update_Iscope*/ - -void Pass1_Iscope(act) +static void Pass1_Iscope(act) Analog_32_action *act; { long Mx, My; @@ -305,7 +304,7 @@ Analog_32_action *act; /* Procedure to update cell in algorithm */ /*******************************************************************************/ -void Refresh_Iscope(act) +static void Refresh_Iscope(act) Analog_32_action *act; { short tx, ty; @@ -344,7 +343,7 @@ Analog_32_action *act; /* Procedure to give current into cell */ /*******************************************************************************/ -void Iin_Iscope(act) +static void Iin_Iscope(act) Analog_32_action *act; { log_grec *WITH; @@ -356,7 +355,7 @@ Analog_32_action *act; /* Procedure to update meter display */ /*******************************************************************************/ -void Erase_Iscope(act) +static void Erase_Iscope(act) Analog_32_action *act; { short tx, ty; @@ -390,7 +389,7 @@ Analog_32_action *act; } /*Erase_Iscope*/ -void GetCnf_Iscope(NewIC) +static void GetCnf_Iscope(NewIC) ICIscope *NewIC; { int Found; @@ -444,7 +443,7 @@ ICIscope *NewIC; /*******************************************************************************/ -void INITLIB_ISCOPE(act) +static void INITLIB_ISCOPE(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -468,7 +467,7 @@ Analog_32_action *act; } /*Iscope_initlib*/ -void Attr_Iscope(act) +static void Attr_Iscope(act) Analog_32_action *act; { long Attrnum; @@ -538,7 +537,7 @@ Analog_32_action *act; /* Procedure to reset cell in algorithm */ /*******************************************************************************/ -void Reset_Iscope(act) +static void Reset_Iscope(act) Analog_32_action *act; { short tx, ty; @@ -594,7 +593,7 @@ Analog_32_action *act; /* Procedure to disconnect a Iscope */ /*******************************************************************************/ -void Disconnect_Iscope(act) +static void Disconnect_Iscope(act) Analog_32_action *act; { short tx, ty; @@ -638,7 +637,7 @@ Analog_32_action *act; -void Newgate_Iscope(act) +static void Newgate_Iscope(act) Analog_32_action *act; { AnaCell_rec *Cellptr; @@ -668,7 +667,7 @@ Analog_32_action *act; A_Gate->InstVar = (void *)NewIV; } -void Copygate_Iscope(act) +static void Copygate_Iscope(act) Analog_32_action *act; { AnaCell_rec *Cellptr; @@ -691,7 +690,7 @@ Analog_32_action *act; } -void Probe_Iscope(act) +static void Probe_Iscope(act) Analog_32_action *act; { AnaScoreboard(Gatename, (long)AnaMessGate1); diff --git a/log/src/ana/iswitch1.c b/log/src/ana/iswitch1.c index 566e2e37e9eb29802634fbafae2984b9e0a5b793..ffa67ccef843708848ec8856a802a1463ec03947 100644 --- a/log/src/ana/iswitch1.c +++ b/log/src/ana/iswitch1.c @@ -80,7 +80,7 @@ typedef struct ICIswitch1 { -void Iswitch1fill(Inst, State, Erase) +static void Iswitch1fill(Inst, State, Erase) log_grec *Inst; int State, Erase; { @@ -105,7 +105,7 @@ int State, Erase; (*AnaLogglobals->hook.unhidecursor)(); } -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -131,7 +131,7 @@ int Limitflag, Erase; } -double Bistablemaker(Inst, time, State, Ex, OldIideal) +static double Bistablemaker(Inst, time, State, Ex, OldIideal) log_grec *Inst; double time; int State, Ex; @@ -161,7 +161,7 @@ double OldIideal; } -double Monostablemaker(Inst, time, State, Ex, OldIideal) +static double Monostablemaker(Inst, time, State, Ex, OldIideal) log_grec *Inst; double time; int State, Ex; @@ -201,7 +201,7 @@ double OldIideal; /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -void Ex_Iswitch1(act) +static void Ex_Iswitch1(act) Analog_32_action *act; { double MinI1, dI1dV1; @@ -262,7 +262,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_Iswitch1(act) +static void Iin_Iswitch1(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -311,7 +311,7 @@ Analog_32_action *act; } /*Iin_Iswitch1*/ -void GetCnf_Iswitch1(NewIC) +static void GetCnf_Iswitch1(NewIC) ICIswitch1 *NewIC; { int Found; @@ -434,7 +434,7 @@ ICIswitch1 *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_Iswitch1(act) +static void initlib_Iswitch1(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -467,7 +467,7 @@ Analog_32_action *act; } /*Iswitch1_Initlib*/ -void ResetInit_Iswitch1(act) +static void ResetInit_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -493,7 +493,7 @@ Analog_32_action *act; } -int Iswitch1check(Inst, Attrnum, act) +static int Iswitch1check(Inst, Attrnum, act) log_grec *Inst; long Attrnum; Analog_32_action *act; @@ -562,7 +562,7 @@ Analog_32_action *act; } -void Attr_Iswitch1(act) +static void Attr_Iswitch1(act) Analog_32_action *act; { long Attrnum; @@ -575,7 +575,7 @@ Analog_32_action *act; } -void Newgate_Iswitch1(act) +static void Newgate_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -618,7 +618,7 @@ Analog_32_action *act; } } -void Copygate_Iswitch1(act) +static void Copygate_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var, *Old_Iswitch1var; @@ -634,7 +634,7 @@ Analog_32_action *act; } -void Dispose_Iswitch1(act) +static void Dispose_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -646,7 +646,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Iswitch1(act) +static void Readgate_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -680,7 +680,7 @@ Analog_32_action *act; Iswitch1Var->Iideal = Iswitch1Var->OldIideal; } -void Writegate_Iswitch1(act) +static void Writegate_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -702,8 +702,7 @@ Analog_32_action *act; } - -void Reset_Iswitch1(act) +static void Reset_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -725,7 +724,7 @@ Analog_32_action *act; } } -void Set_Iswitch1(act) +static void Set_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -741,7 +740,7 @@ Analog_32_action *act; } -void PreUpdate_Iswitch1(act) +static void PreUpdate_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -768,7 +767,7 @@ Analog_32_action *act; } -void Update_Iswitch1(act) +static void Update_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -787,7 +786,7 @@ Analog_32_action *act; } -void Display_Iswitch1(act) +static void Display_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -808,7 +807,7 @@ Analog_32_action *act; } -void Touch_Iswitch1(act) +static void Touch_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -839,7 +838,7 @@ Analog_32_action *act; } -void Refresh_Iswitch1(act) +static void Refresh_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -851,7 +850,7 @@ Analog_32_action *act; Limitfill(act->inst, Iswitch1Var->Limit, false); } -void Erase_Iswitch1(act) +static void Erase_Iswitch1(act) Analog_32_action *act; { Iswitch1Const *Iswitch1Var; @@ -863,7 +862,7 @@ Analog_32_action *act; Limitfill(act->inst, Iswitch1Var->Limit, true); } -void Probe_Iswitch1(act) +static void Probe_Iswitch1(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/iswitch2.c b/log/src/ana/iswitch2.c index 5c54f59b192a7a75e3a126d1d4ec20879246f9c4..fe631c7bf505fec70bc44fdbdf1814357406e91e 100644 --- a/log/src/ana/iswitch2.c +++ b/log/src/ana/iswitch2.c @@ -27,10 +27,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <p2c/p2c.h> - - - - #define ISWITCH2_G #include "iswitch2.h" @@ -84,9 +80,7 @@ typedef struct ICIswitch2 { } ICIswitch2; - - -void Iswitch2fill(Inst, State, Erase) +static void Iswitch2fill(Inst, State, Erase) log_grec *Inst; int State, Erase; { @@ -111,7 +105,7 @@ int State, Erase; (*AnaLogglobals->hook.unhidecursor)(); } -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -137,7 +131,7 @@ int Limitflag, Erase; } -double Bistablemaker(Inst, time, State, Ex, OldIideal) +static double Bistablemaker(Inst, time, State, Ex, OldIideal) log_grec *Inst; double time; int State, Ex; @@ -168,7 +162,7 @@ double OldIideal; -double Monostablemaker(Inst, time, State, Ex, OldIideal) +static double Monostablemaker(Inst, time, State, Ex, OldIideal) log_grec *Inst; double time; int State, Ex; @@ -208,7 +202,7 @@ double OldIideal; /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -void Ex_Iswitch2(act) +static void Ex_Iswitch2(act) Analog_32_action *act; { double MinI1, dI1dV1; @@ -269,7 +263,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_Iswitch2(act) +static void Iin_Iswitch2(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -317,7 +311,7 @@ Analog_32_action *act; } } /*Iin_Iswitch2*/ -void GetCnf_Iswitch2(NewIC) +static void GetCnf_Iswitch2(NewIC) ICIswitch2 *NewIC; { int Found; @@ -440,7 +434,7 @@ ICIswitch2 *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_Iswitch2(act) +static void initlib_Iswitch2(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -474,7 +468,7 @@ Analog_32_action *act; -void ResetInit_Iswitch2(act) +static void ResetInit_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -500,7 +494,7 @@ Analog_32_action *act; } -int Iswitch2check(Inst, Attrnum, act) +static int Iswitch2check(Inst, Attrnum, act) log_grec *Inst; long Attrnum; Analog_32_action *act; @@ -569,7 +563,7 @@ Analog_32_action *act; } -void Attr_Iswitch2(act) +static void Attr_Iswitch2(act) Analog_32_action *act; { long Attrnum; @@ -582,7 +576,7 @@ Analog_32_action *act; } -void Newgate_Iswitch2(act) +static void Newgate_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -625,7 +619,7 @@ Analog_32_action *act; } } -void Copygate_Iswitch2(act) +static void Copygate_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var, *Old_Iswitch2var; @@ -641,7 +635,7 @@ Analog_32_action *act; } -void Dispose_Iswitch2(act) +static void Dispose_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -653,7 +647,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Iswitch2(act) +static void Readgate_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -687,7 +681,7 @@ Analog_32_action *act; Iswitch2Var->Iideal = Iswitch2Var->OldIideal; } -void Writegate_Iswitch2(act) +static void Writegate_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -709,8 +703,7 @@ Analog_32_action *act; } - -void Reset_Iswitch2(act) +static void Reset_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -732,7 +725,7 @@ Analog_32_action *act; } } -void Set_Iswitch2(act) +static void Set_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -747,7 +740,7 @@ Analog_32_action *act; Iswitch2Var->Reset_Time = Iswitch2Var->Time - AnaAccum; } -void PreUpdate_Iswitch2(act) +static void PreUpdate_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -773,7 +766,7 @@ Analog_32_action *act; } -void Update_Iswitch2(act) +static void Update_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -792,7 +785,7 @@ Analog_32_action *act; } -void Display_Iswitch2(act) +static void Display_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -813,7 +806,7 @@ Analog_32_action *act; } -void Touch_Iswitch2(act) +static void Touch_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -843,7 +836,7 @@ Analog_32_action *act; AnaChanged = true; } -void Refresh_Iswitch2(act) +static void Refresh_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -855,7 +848,7 @@ Analog_32_action *act; Limitfill(act->inst, Iswitch2Var->Limit, false); } -void Erase_Iswitch2(act) +static void Erase_Iswitch2(act) Analog_32_action *act; { Iswitch2Const *Iswitch2Var; @@ -868,7 +861,7 @@ Analog_32_action *act; } -void Probe_Iswitch2(act) +static void Probe_Iswitch2(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/mmeter.c b/log/src/ana/mmeter.c index 997fd6479c7ee229b79460d88bc853664f7e0b36..c9d51b0bb37ca3f2064110975f3aecfe8a31d902 100644 --- a/log/src/ana/mmeter.c +++ b/log/src/ana/mmeter.c @@ -44,8 +44,6 @@ typedef struct ICMmeter { } ICMmeter; - - typedef struct Inoderec { log_grec *Igate; /*Gate connected to meter*/ long Ipin; /*Pin connected to meter*/ @@ -61,12 +59,11 @@ typedef struct Imeterrec { } Imeterrec; - /******************************************************************************/ /* Procedure to correctly position labels */ -void Mmeter_Locate(rot, Tx, Ty, Left) +static void Mmeter_Locate(rot, Tx, Ty, Left) long rot; short *Tx, *Ty; int *Left; @@ -106,7 +103,7 @@ int *Left; } -double Itot(act) +static double Itot(act) Analog_32_action *act; { Imeterrec *Intptr; @@ -141,7 +138,7 @@ Analog_32_action *act; /* Procedure to update cell in algorithm */ /*******************************************************************************/ -void PreUpdate_Mmeter(act) +static void PreUpdate_Mmeter(act) Analog_32_action *act; { AnaExt_rec *A_Node; @@ -206,7 +203,7 @@ Analog_32_action *act; /* Procedure to update cell in algorithm */ /*******************************************************************************/ -void Update_Mmeter(act) +static void Update_Mmeter(act) Analog_32_action *act; { Imeterrec *Intptr; @@ -237,7 +234,7 @@ Analog_32_action *act; /* Procedure to update cell in algorithm */ /*******************************************************************************/ -void Display_Mmeter(act) +static void Display_Mmeter(act) Analog_32_action *act; { short tx, ty; @@ -276,7 +273,7 @@ Analog_32_action *act; -void Pass1_Mmeter(act) +static void Pass1_Mmeter(act) Analog_32_action *act; { long Mx, My; @@ -325,7 +322,7 @@ Analog_32_action *act; /* Procedure to update cell in algorithm */ /*******************************************************************************/ -void Refresh_Mmeter(act) +static void Refresh_Mmeter(act) Analog_32_action *act; { short tx, ty; @@ -367,7 +364,7 @@ Analog_32_action *act; /* Procedure to give current into cell */ /*******************************************************************************/ -void Iin_Mmeter(act) +static void Iin_Mmeter(act) Analog_32_action *act; { log_grec *WITH; @@ -379,7 +376,7 @@ Analog_32_action *act; /* Procedure to update meter display */ /*******************************************************************************/ -void Erase_Mmeter(act) +static void Erase_Mmeter(act) Analog_32_action *act; { short tx, ty; @@ -413,7 +410,7 @@ Analog_32_action *act; } /*Erase_Mmeter*/ -void GetCnf_Mmeter(NewIC) +static void GetCnf_Mmeter(NewIC) ICMmeter *NewIC; { int Found; @@ -467,7 +464,7 @@ ICMmeter *NewIC; /*******************************************************************************/ -void INITLIB_Mmeter(act) +static void INITLIB_Mmeter(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -491,7 +488,7 @@ Analog_32_action *act; } /*Mmeter_initlib*/ -void Attr_Mmeter(act) +static void Attr_Mmeter(act) Analog_32_action *act; { long Attrnum; @@ -604,7 +601,7 @@ Analog_32_action *act; /* Procedure to reset cell in algorithm */ /*******************************************************************************/ -void Reset_Mmeter(act) +static void Reset_Mmeter(act) Analog_32_action *act; { short tx, ty; @@ -663,7 +660,7 @@ Analog_32_action *act; /* Procedure to disconnect a Mmeter */ /*******************************************************************************/ -void Disconnect_Mmeter(act) +static void Disconnect_Mmeter(act) Analog_32_action *act; { short tx, ty; @@ -707,7 +704,7 @@ Analog_32_action *act; -void Newgate_Mmeter(act) +static void Newgate_Mmeter(act) Analog_32_action *act; { AnaCell_rec *Cellptr; @@ -740,7 +737,7 @@ Analog_32_action *act; A_Gate->InstVar = (void *)NewIV; } -void Copygate_Mmeter(act) +static void Copygate_Mmeter(act) Analog_32_action *act; { AnaCell_rec *Cellptr; @@ -763,7 +760,7 @@ Analog_32_action *act; } -void Probe_Mmeter(act) +static void Probe_Mmeter(act) Analog_32_action *act; { AnaScoreboard(Gatename, (long)AnaMessGate1); diff --git a/log/src/ana/moscap.c b/log/src/ana/moscap.c index 651dfb9180ce763167cb9b2ada8423bd8baf3e5c..d8458e45e17f15192af54b576b2f2f0542afe320 100644 --- a/log/src/ana/moscap.c +++ b/log/src/ana/moscap.c @@ -57,14 +57,12 @@ typedef struct ICMoscap { } ICMoscap; - - /****************************************************************************/ /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -void Ex_Moscap(act) +static void Ex_Moscap(act) Analog_32_action *act; { double MinI1, dI1dV1; @@ -127,7 +125,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_Moscap(act) +static void Iin_Moscap(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -168,7 +166,7 @@ Analog_32_action *act; } /*Iin_Moscap*/ -void GetCnf_Moscap(NewIC) +static void GetCnf_Moscap(NewIC) ICMoscap *NewIC; { int Found; @@ -235,7 +233,7 @@ ICMoscap *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_Moscap(act) +static void initlib_Moscap(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -278,7 +276,7 @@ Analog_32_action *act; -int Moscapcheck(Inst, Attrnum) +static int Moscapcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -337,7 +335,7 @@ long Attrnum; } -void Attr_Moscap(act) +static void Attr_Moscap(act) Analog_32_action *act; { long Attrnum; @@ -350,7 +348,7 @@ Analog_32_action *act; } -void Newgate_Moscap(act) +static void Newgate_Moscap(act) Analog_32_action *act; { MoscapConst *MoscapVar; @@ -388,7 +386,7 @@ Analog_32_action *act; WITH->attr[N_Ktqn - 1].changed = true; } -void Copygate_Moscap(act) +static void Copygate_Moscap(act) Analog_32_action *act; { MoscapConst *MoscapVar, *Old_Moscapvar; @@ -403,7 +401,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*Initialize attributes 1 to 3*#*/ } -void Dispose_Moscap(act) +static void Dispose_Moscap(act) Analog_32_action *act; { MoscapConst *MoscapVar; @@ -415,7 +413,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Moscap(act) +static void Readgate_Moscap(act) Analog_32_action *act; { MoscapConst *MoscapVar; @@ -455,9 +453,7 @@ Analog_32_action *act; MoscapVar->Kn2 = 1 / WITH->attr[N_Ktqn - 1].UU.r; } - - -void Probe_MosCap(act) +static void Probe_MosCap(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/nfet4.c b/log/src/ana/nfet4.c index 5c211735f655560d5beb7addd27dbe7643092fcf..f86e1b44aabd17441a2d58dc4a0e8b59ab12543c 100644 --- a/log/src/ana/nfet4.c +++ b/log/src/ana/nfet4.c @@ -69,7 +69,7 @@ typedef struct ICNfet { /****************************************************************************/ -void Ex_NFET4(act) +static void Ex_NFET4(act) Analog_32_action *act; { double MinI2, dI2dV1, dI2dV2, dI2dV3, MinI3, dI3dV1, dI3dV2, dI3dV3, MinI1, @@ -331,7 +331,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_NFET4(act) +static void Iin_NFET4(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr; @@ -456,7 +456,7 @@ Analog_32_action *act; } /*Iin_NFET4*/ -void GetCnf_Nfet4(NewIC) +static void GetCnf_Nfet4(NewIC) ICNfet *NewIC; { int Found; @@ -566,7 +566,7 @@ ICNfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_NFET4(act) +static void initlib_NFET4(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -603,7 +603,7 @@ Analog_32_action *act; -int Nfetcheck(Inst, Attrnum) +static int Nfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -694,7 +694,7 @@ long Attrnum; } -void Attr_Nfet4(act) +static void Attr_Nfet4(act) Analog_32_action *act; { long Attrnum; @@ -712,7 +712,7 @@ Analog_32_action *act; } -void Newgate_Nfet4(act) +static void Newgate_Nfet4(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -773,7 +773,7 @@ Analog_32_action *act; WITH->attr[N_Early - 1].changed = true; } -void Copygate_Nfet4(act) +static void Copygate_Nfet4(act) Analog_32_action *act; { NfetConst *NfetVar, *Old_Nfetvar; @@ -788,7 +788,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Nfet4(act) +static void Dispose_Nfet4(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -800,7 +800,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Nfet4(act) +static void Readgate_Nfet4(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -862,7 +862,7 @@ Analog_32_action *act; NfetVar->TauCgs = 0.0; } -void Probe_Nfet4(act) +static void Probe_Nfet4(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -933,8 +933,6 @@ Analog_32_action *act; } - - /*==========================================================================*/ /* Library Listing For Cell NFET4 */ /*==========================================================================*/ diff --git a/log/src/ana/nfet5.c b/log/src/ana/nfet5.c index 713a99cbd3056e7aaf50e442e55672da586eda16..bf1a787b0a8ca2f4f7aacf31e5c8d0dc64df2b66 100644 --- a/log/src/ana/nfet5.c +++ b/log/src/ana/nfet5.c @@ -67,7 +67,7 @@ typedef struct ICNfet { /****************************************************************************/ -void Ex_NFET5(act) +static void Ex_NFET5(act) Analog_32_action *act; { double MinI2, dI2dV1, dI2dV2, dI2dV3, MinI3, dI3dV1, dI3dV2, dI3dV3, MinI1, @@ -243,7 +243,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_NFET5(act) +static void Iin_NFET5(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr; @@ -359,7 +359,7 @@ Analog_32_action *act; } /*Iin_NFET5*/ -void GetCnf_Nfet5(NewIC) +static void GetCnf_Nfet5(NewIC) ICNfet *NewIC; { int Found; @@ -469,7 +469,7 @@ ICNfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_NFET5(act) +static void initlib_NFET5(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -505,7 +505,7 @@ Analog_32_action *act; } /*NFET5_Initlib*/ -int Nfetcheck(Inst, Attrnum) +static int Nfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -602,7 +602,7 @@ long Attrnum; } -void Attr_Nfet5(act) +static void Attr_Nfet5(act) Analog_32_action *act; { long Attrnum; @@ -620,7 +620,7 @@ Analog_32_action *act; } -void Newgate_Nfet5(act) +static void Newgate_Nfet5(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -678,7 +678,7 @@ Analog_32_action *act; WITH->attr[N_Early - 1].changed = true; } -void Copygate_Nfet5(act) +static void Copygate_Nfet5(act) Analog_32_action *act; { NfetConst *NfetVar, *Old_Nfetvar; @@ -693,7 +693,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Nfet5(act) +static void Dispose_Nfet5(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -705,7 +705,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Nfet5(act) +static void Readgate_Nfet5(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -765,7 +765,7 @@ Analog_32_action *act; NfetVar->TauCgs = 0.0; } -void Probe_Nfet5(act) +static void Probe_Nfet5(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -836,8 +836,6 @@ Analog_32_action *act; } - - /*==========================================================================*/ /* Library Listing For Cell NFET5 */ /*==========================================================================*/ diff --git a/log/src/ana/nfet7f.c b/log/src/ana/nfet7f.c index 6cdddd7c4a34cced0f8f66ef85c47517e5649082..16090ee42b072b29baef084b0c397c7db4b14d82 100644 --- a/log/src/ana/nfet7f.c +++ b/log/src/ana/nfet7f.c @@ -87,9 +87,8 @@ typedef struct ICNfet { /****************************************************************************/ -int Nfetconsts(Inst) +static int Nfetconsts(Inst) log_grec *Inst; - { NfetConst *NfetVar; Anainstlist *A_Gate; @@ -169,7 +168,7 @@ log_grec *Inst; /****************************************************************************/ -void Ex_NFET7F(act) +static void Ex_NFET7F(act) Analog_32_action *act; { log_grec *WITH; @@ -449,7 +448,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_NFET7F(act) +static void Iin_NFET7F(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr, *Pin4Ptr; @@ -626,7 +625,7 @@ Analog_32_action *act; } /*Iin_NFET7F*/ -void GetCnf_Nfet7F(NewIC) +static void GetCnf_Nfet7F(NewIC) ICNfet *NewIC; { int Found; @@ -713,7 +712,7 @@ ICNfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_NFET7F(act) +static void initlib_NFET7F(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -750,7 +749,7 @@ Analog_32_action *act; -int Nfetcheck(Inst, Attrnum) +static int Nfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -850,7 +849,7 @@ long Attrnum; } -void Attr_Nfet7F(act) +static void Attr_Nfet7F(act) Analog_32_action *act; { long Attrnum; @@ -873,7 +872,7 @@ Analog_32_action *act; } -void Newgate_Nfet7F(act) +static void Newgate_Nfet7F(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -924,7 +923,7 @@ Analog_32_action *act; Nfetconsts(WITH); } -void Copygate_Nfet7F(act) +static void Copygate_Nfet7F(act) Analog_32_action *act; { NfetConst *NfetVar, *Old_Nfetvar; @@ -939,7 +938,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Nfet7F(act) +static void Dispose_Nfet7F(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -951,7 +950,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Nfet7F(act) +static void Readgate_Nfet7F(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -1004,7 +1003,7 @@ Analog_32_action *act; NfetVar->TauCgs = 0.0; } -void Probe_Nfet7F(act) +static void Probe_Nfet7F(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -1085,7 +1084,7 @@ Analog_32_action *act; } -void Update_Nfet7F(act) +static void Update_Nfet7F(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/nfet7t.c b/log/src/ana/nfet7t.c index 2540951856e25e2e664c481cac0cbd73ec386134..29414efd82e72e970c0af2611de73b211d5ab38b 100644 --- a/log/src/ana/nfet7t.c +++ b/log/src/ana/nfet7t.c @@ -87,7 +87,7 @@ typedef struct ICNfet { /****************************************************************************/ -int Nfetconsts(Inst) +static int Nfetconsts(Inst) log_grec *Inst; { @@ -169,7 +169,7 @@ log_grec *Inst; /****************************************************************************/ -void Ex_NFET7T(act) +static void Ex_NFET7T(act) Analog_32_action *act; { log_grec *WITH; @@ -407,7 +407,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_NFET7T(act) +static void Iin_NFET7T(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr; @@ -559,7 +559,7 @@ Analog_32_action *act; } /*Iin_NFET7T*/ -void GetCnf_Nfet7T(NewIC) +static void GetCnf_Nfet7T(NewIC) ICNfet *NewIC; { int Found; @@ -637,7 +637,7 @@ ICNfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_NFET7T(act) +static void initlib_NFET7T(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -670,7 +670,7 @@ Analog_32_action *act; } /*NFET7T_Initlib*/ -int Nfetcheck(Inst, Attrnum) +static int Nfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -764,7 +764,7 @@ long Attrnum; } -void Attr_Nfet7T(act) +static void Attr_Nfet7T(act) Analog_32_action *act; { long Attrnum; @@ -787,7 +787,7 @@ Analog_32_action *act; } -void Newgate_Nfet7T(act) +static void Newgate_Nfet7T(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -838,7 +838,7 @@ Analog_32_action *act; Nfetconsts(WITH); } -void Copygate_Nfet7T(act) +static void Copygate_Nfet7T(act) Analog_32_action *act; { NfetConst *NfetVar, *Old_Nfetvar; @@ -853,7 +853,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Nfet7T(act) +static void Dispose_Nfet7T(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -865,7 +865,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Nfet7T(act) +static void Readgate_Nfet7T(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -918,7 +918,7 @@ Analog_32_action *act; NfetVar->TauCgs = 0.0; } -void Probe_Nfet7T(act) +static void Probe_Nfet7T(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -989,7 +989,7 @@ Analog_32_action *act; } -void Update_Nfet7T(act) +static void Update_Nfet7T(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -1011,7 +1011,6 @@ Analog_32_action *act; } - /*==========================================================================*/ /* Library Listing For Cell NFET7T */ /*==========================================================================*/ diff --git a/log/src/ana/npn1.c b/log/src/ana/npn1.c index 5800d8c8f695aea2bc4f5b88194051ff4f521b6b..17b02ac73a3a1d335cf988057ae5fcfe418ca4a3 100644 --- a/log/src/ana/npn1.c +++ b/log/src/ana/npn1.c @@ -23,9 +23,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Output from p2c, the Pascal-to-C translator */ /* From input file "scott.text" */ - - - #include <p2c/p2c.h> #include "npn1.h" @@ -63,7 +60,7 @@ typedef struct ICNPN1 { /****************************************************************************/ -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -107,7 +104,7 @@ int Limitflag, Erase; -void Ex_NPN1(act) +static void Ex_NPN1(act) Analog_32_action *act; { double MinI1, MinI2, MinI3, dI1dV1, dI1dV2, dI1dV3, dI2dV1, dI2dV2, dI2dV3, @@ -279,7 +276,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_NPN1(act) +static void Iin_NPN1(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -391,7 +388,7 @@ Analog_32_action *act; } } /*Iin_NPN1*/ -void GetCnf_NPN1(NewIC) +static void GetCnf_NPN1(NewIC) ICNPN1 *NewIC; { int Found; @@ -494,7 +491,7 @@ ICNPN1 *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_NPN1(act) +static void initlib_NPN1(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -535,7 +532,7 @@ Analog_32_action *act; #define MAKE_IECO(n) ((n)->IECO=(n)->Is*(n)->betaR/((n)->betaR+(n)->betaF)) */ -int NPN1check(Inst, Attrnum) +static int NPN1check(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -636,7 +633,7 @@ long Attrnum; } -void Attr_NPN1(act) +static void Attr_NPN1(act) Analog_32_action *act; { long Attrnum; @@ -654,7 +651,7 @@ Analog_32_action *act; } -void Newgate_NPN1(act) +static void Newgate_NPN1(act) Analog_32_action *act; { NPN1Const *NPN1Var; @@ -713,7 +710,7 @@ Analog_32_action *act; WITH->attr[N_Vcrow - 1].changed = true; } -void Copygate_NPN1(act) +static void Copygate_NPN1(act) Analog_32_action *act; { NPN1Const *NPN1Var, *Old_NPN1var; @@ -730,7 +727,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); } -void Dispose_NPN1(act) +static void Dispose_NPN1(act) Analog_32_action *act; { NPN1Const *NPN1Var; @@ -742,7 +739,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Npn1(act) +static void Readgate_Npn1(act) Analog_32_action *act; { NPN1Const *Npn1Var; @@ -802,7 +799,7 @@ Analog_32_action *act; Npn1Var->TauCbe = 0.0; } -void Probe_Npn1(act) +static void Probe_Npn1(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -868,7 +865,7 @@ Analog_32_action *act; } } -void Reset_NPN1(act) +static void Reset_NPN1(act) Analog_32_action *act; { NPN1Const *NPN1Var; @@ -884,7 +881,7 @@ Analog_32_action *act; Limitfill(act->inst, NPN1Var->Limit, false); } -void PreUpdate_NPN1(act) +static void PreUpdate_NPN1(act) Analog_32_action *act; { NPN1Const *NPN1Var; @@ -906,7 +903,7 @@ Analog_32_action *act; VPin1 - Vpin2 >= WITH1->attr[N_Vcrow - 1].UU.r); } -void Update_NPN1(act) +static void Update_NPN1(act) Analog_32_action *act; { NPN1Const *NPN1Var; @@ -919,7 +916,7 @@ Analog_32_action *act; NPN1Var->Limit = NPN1Var->NewLimit; } -void Display_NPN1(act) +static void Display_NPN1(act) Analog_32_action *act; { NPN1Const *NPN1Var; @@ -936,7 +933,7 @@ Analog_32_action *act; } -void Refresh_NPN1(act) +static void Refresh_NPN1(act) Analog_32_action *act; { NPN1Const *NPN1Var; @@ -947,7 +944,7 @@ Analog_32_action *act; Limitfill(act->inst, NPN1Var->Limit, false); } -void Erase_NPN1(act) +static void Erase_NPN1(act) Analog_32_action *act; { NPN1Const *NPN1Var; diff --git a/log/src/ana/npn2.c b/log/src/ana/npn2.c index 8e7da252c52bad1cedce7ecbac47a1d56776592a..2dcf476cb332a684c2d9fe3d2d23feafa410143b 100644 --- a/log/src/ana/npn2.c +++ b/log/src/ana/npn2.c @@ -35,7 +35,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define N_Is 14 #define N_Ktq 15 #define N_Vcrow 16 -#define N_Va 17 +#define N_Va 17 #define Gatename "NPN2" @@ -62,7 +62,7 @@ typedef struct ICNPN2 { /****************************************************************************/ -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -95,27 +95,26 @@ int Limitflag, Erase; /* Model used: */ /* */ /* Base = VPin1, Emitter = VPin3 Collector = VPin2 */ -/* */ -/* ICEO = Is / betaF */ -/* IECO = Is / betaR */ +/* */ +/* ICEO = Is / betaF */ +/* IECO = Is / betaR */ /* */ -/* Ifor = ICEO * (Exp((Vbase - Vemit)/Vo) - 1) */ -/* Irev = IECO * (Exp((Vbase - Vcoll)/Vo) - 1) */ +/* Ifor = ICEO * (Exp((Vbase - Vemit)/Vo) - 1) */ +/* Irev = IECO * (Exp((Vbase - Vcoll)/Vo) - 1) */ /* */ -/* IBase = Ifor - Irev */ -/* IColl = betaF * Ifor - (1 + betaR) * Irev */ -/* IEmit = -(IBase + IColl) */ -/* */ -/* 2nd-order Model (Early effect): */ +/* IBase = Ifor - Irev */ +/* IColl = betaF * Ifor - (1 + betaR) * Irev */ +/* IEmit = -(IBase + IColl) */ /* */ -/* IColl = (betaF * Ifor - betaR * Irev) * */ -/* (1 - (((Vbase - Vemit) + (Vbase - Vcoll)) / |Va|)) - Irev */ +/* 2nd-order Model (Early effect): */ +/* */ +/* IColl = (betaF * Ifor - betaR * Irev) * */ +/* (1 - (((Vbase - Vemit) + (Vbase - Vcoll)) / |Va|)) - Irev */ /* */ /****************************************************************************/ - -void Ex_NPN2(act) +static void Ex_NPN2(act) Analog_32_action *act; { double MinI1, MinI2, MinI3, dI1dV1, dI1dV2, dI1dV3, dI2dV1, dI2dV2, dI2dV3, @@ -290,7 +289,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_NPN2(act) +static void Iin_NPN2(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -405,7 +404,7 @@ Analog_32_action *act; } } /*Iin_NPN2*/ -void GetCnf_NPN2(NewIC) +static void GetCnf_NPN2(NewIC) ICNPN2 *NewIC; { int Found; @@ -516,7 +515,7 @@ ICNPN2 *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_NPN2(act) +static void initlib_NPN2(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -556,7 +555,7 @@ Analog_32_action *act; #define MAKE_IECO(n) ((n)->IECO=(n)->Is/(n)->betaR) -int NPN2check(Inst, Attrnum) +static int NPN2check(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -664,7 +663,7 @@ long Attrnum; } -void Attr_NPN2(act) +static void Attr_NPN2(act) Analog_32_action *act; { long Attrnum; @@ -682,7 +681,7 @@ Analog_32_action *act; } -void Newgate_NPN2(act) +static void Newgate_NPN2(act) Analog_32_action *act; { NPN2Const *NPN2Var; @@ -745,7 +744,7 @@ Analog_32_action *act; WITH->attr[N_Vcrow - 1].changed = true; } -void Copygate_NPN2(act) +static void Copygate_NPN2(act) Analog_32_action *act; { NPN2Const *NPN2Var, *Old_NPN2var; @@ -762,7 +761,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); } -void Dispose_NPN2(act) +static void Dispose_NPN2(act) Analog_32_action *act; { NPN2Const *NPN2Var; @@ -774,7 +773,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Npn2(act) +static void Readgate_Npn2(act) Analog_32_action *act; { NPN2Const *Npn2Var; @@ -838,7 +837,7 @@ Analog_32_action *act; Npn2Var->TauCbe = 0.0; } -void Probe_Npn2(act) +static void Probe_Npn2(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -904,7 +903,7 @@ Analog_32_action *act; } } -void Reset_NPN2(act) +static void Reset_NPN2(act) Analog_32_action *act; { NPN2Const *NPN2Var; @@ -920,7 +919,7 @@ Analog_32_action *act; Limitfill(act->inst, NPN2Var->Limit, false); } -void PreUpdate_NPN2(act) +static void PreUpdate_NPN2(act) Analog_32_action *act; { NPN2Const *NPN2Var; @@ -942,7 +941,7 @@ Analog_32_action *act; VPin1 - Vpin2 >= WITH1->attr[N_Vcrow - 1].UU.r); } -void Update_NPN2(act) +static void Update_NPN2(act) Analog_32_action *act; { NPN2Const *NPN2Var; @@ -955,7 +954,7 @@ Analog_32_action *act; NPN2Var->Limit = NPN2Var->NewLimit; } -void Display_NPN2(act) +static void Display_NPN2(act) Analog_32_action *act; { NPN2Const *NPN2Var; @@ -972,7 +971,7 @@ Analog_32_action *act; } -void Refresh_NPN2(act) +static void Refresh_NPN2(act) Analog_32_action *act; { NPN2Const *NPN2Var; @@ -983,7 +982,7 @@ Analog_32_action *act; Limitfill(act->inst, NPN2Var->Limit, false); } -void Erase_NPN2(act) +static void Erase_NPN2(act) Analog_32_action *act; { NPN2Const *NPN2Var; diff --git a/log/src/ana/nspc1.c b/log/src/ana/nspc1.c index ebfe4d96e26100883340d56c4682329dece784cb..2cba6eef59a6aca1044ef3dec379bd262c00b277 100644 --- a/log/src/ana/nspc1.c +++ b/log/src/ana/nspc1.c @@ -84,7 +84,7 @@ typedef struct ICNfet { } ICNfet; -void Show_W_L(Inst,erase) +static void Show_W_L(Inst,erase) log_grec *Inst; int erase; { @@ -216,7 +216,7 @@ short x, y, n; /****************************************************************************/ -void Ex_NSPC1(act) +static void Ex_NSPC1(act) Analog_32_action *act; { double MinI2, dI2dV1, dI2dV2, dI2dV3, dI2dV4, @@ -432,7 +432,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_NSPC1(act) +static void Iin_NSPC1(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr, *Pin4Ptr; @@ -560,7 +560,7 @@ Analog_32_action *act; } /*Iin_NSPC1*/ -void GetCnf_Nspc1(NewIC) +static void GetCnf_Nspc1(NewIC) ICNfet *NewIC; { int Found; @@ -704,7 +704,7 @@ ICNfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_NSPC1(act) +static void initlib_NSPC1(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -745,7 +745,7 @@ Analog_32_action *act; } /*NSPC1_Initlib*/ -int Nfetcheck(Inst, Attrnum) +static int Nfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -885,7 +885,7 @@ long Attrnum; } -void Attr_Nspc1(act) +static void Attr_Nspc1(act) Analog_32_action *act; { long Attrnum; @@ -908,7 +908,7 @@ Analog_32_action *act; } -void Newgate_Nspc1(act) +static void Newgate_Nspc1(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -982,7 +982,7 @@ Analog_32_action *act; WITH->attr[N_Number - 1].changed = true; } -void Copygate_Nspc1(act) +static void Copygate_Nspc1(act) Analog_32_action *act; { NfetConst *NfetVar, *Old_Nfetvar; @@ -997,7 +997,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Nspc1(act) +static void Dispose_Nspc1(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -1009,7 +1009,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Nspc1(act) +static void Readgate_Nspc1(act) Analog_32_action *act; { NfetConst *NfetVar; @@ -1091,7 +1091,7 @@ Analog_32_action *act; NfetVar->TauCgs = 0.0; } -void Probe_Nspc1(act) +static void Probe_Nspc1(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -1171,11 +1171,6 @@ Analog_32_action *act; AnaScoreboard(STR3, (long)AnaMessGate3); } - - - - - /*==========================================================================*/ /* Library Listing For Cell NSPC1 */ /*==========================================================================*/ diff --git a/log/src/ana/numbers.c b/log/src/ana/numbers.c index 9842655c6bcf803d2f20eced7c666daa460f448d..e51810a92b91bcc648afea60dea95c97bf127852 100644 --- a/log/src/ana/numbers.c +++ b/log/src/ana/numbers.c @@ -61,7 +61,7 @@ typedef struct ICNumbers { /****************************************************************************/ -void GetCnf_Numbers(ICNumbers *NewIC) +static void GetCnf_Numbers(ICNumbers *NewIC) { int Found; char Arg[256], Keyword[256]; @@ -84,7 +84,7 @@ void GetCnf_Numbers(ICNumbers *NewIC) } while (Found); } -void initlib_NUMBERS(Analog_32_action *act) +static void initlib_NUMBERS(Analog_32_action *act) { AnaCell_rec *NewCell; ICNumbers *NewIC; @@ -112,7 +112,7 @@ void initlib_NUMBERS(Analog_32_action *act) act->kind->y2 = 35; } /*NFET4_Initlib*/ -void Attr_Numbers(Analog_32_action *act) +static void Attr_Numbers(Analog_32_action *act) { long Attrnum; log_grec *WITH; @@ -266,7 +266,7 @@ void Attr_Numbers(Analog_32_action *act) } } -void Openconfig_Numbers(Analog_32_action *act) +static void Openconfig_Numbers(Analog_32_action *act) { long Index; log_grec *WITH; @@ -296,7 +296,7 @@ void Openconfig_Numbers(Analog_32_action *act) } } -void Readgate_Numbers(Analog_32_action *act) +static void Readgate_Numbers(Analog_32_action *act) { log_grec *WITH; char STR1[256]; @@ -331,15 +331,14 @@ void Readgate_Numbers(Analog_32_action *act) } -void Writegate_Numbers(Analog_32_action *act) +static void Writegate_Numbers(Analog_32_action *act) { fprintf(*AnaLogglobals->actfile, "%s\n", AnaErase ? " TRUE" : "FALSE"); fprintf(*AnaLogglobals->actfile, "%s\n", AnaExact ? " TRUE" : "FALSE"); } - -void Message_Numbers(Analog_32_action *act) +static void Message_Numbers(Analog_32_action *act) { short Tx, Ty; NumbersConst *NumbersVar; @@ -693,7 +692,7 @@ void Message_Numbers(Analog_32_action *act) } -void Refresh_Numbers(Analog_32_action *act) +static void Refresh_Numbers(Analog_32_action *act) { short Tx, Ty; Anainstlist *A_Gate; @@ -796,7 +795,7 @@ void Refresh_Numbers(Analog_32_action *act) } -void Erase_Numbers(Analog_32_action *act) +static void Erase_Numbers(Analog_32_action *act) { short Tx, Ty; Anainstlist *A_Gate; @@ -876,8 +875,7 @@ void Erase_Numbers(Analog_32_action *act) } - -void Newgate_Numbers(Analog_32_action *act) +static void Newgate_Numbers(Analog_32_action *act) { Anainstlist *A_Gate; AnaCell_rec *Cellptr; @@ -905,7 +903,7 @@ void Newgate_Numbers(Analog_32_action *act) Openconfig_Numbers(&Newact); } -void Copygate_Numbers(Analog_32_action *act) +static void Copygate_Numbers(Analog_32_action *act) { NumbersConst *NumbersVar, *Old_NumbersVar; Anainstlist *A_Gate, *A_Oldgate; @@ -919,7 +917,7 @@ void Copygate_Numbers(Analog_32_action *act) A_Gate->InstVar = (void *)NumbersVar; } -void Dispose_Numbers(Analog_32_action *act) +static void Dispose_Numbers(Analog_32_action *act) { Anainstlist *A_Gate; NumbersConst *NumbersVar; @@ -930,7 +928,7 @@ void Dispose_Numbers(Analog_32_action *act) } -void Touch_Numbers(Analog_32_action *act) +static void Touch_Numbers(Analog_32_action *act) { log_action_t *WITH; @@ -966,8 +964,7 @@ void Touch_Numbers(Analog_32_action *act) } - -void Probe_Numbers(Analog_32_action *act) +static void Probe_Numbers(Analog_32_action *act) { char dtstr[256]; char STR2[256]; diff --git a/log/src/ana/pfet4.c b/log/src/ana/pfet4.c index 0d524a9dd6a95dde05a323c5f074b37aaeb44ac6..d2fe584926095482818dd8335d4f800b1b66f671 100644 --- a/log/src/ana/pfet4.c +++ b/log/src/ana/pfet4.c @@ -65,7 +65,7 @@ typedef struct ICPfet { /****************************************************************************/ -void Ex_PFET4(act) +static void Ex_PFET4(act) Analog_32_action *act; { double MinI2, dI2dV1, dI2dV2, dI2dV3, MinI3, dI3dV1, dI3dV2, dI3dV3, MinI1, @@ -325,7 +325,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_PFET4(act) +static void Iin_PFET4(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr; @@ -449,7 +449,7 @@ Analog_32_action *act; } } /*Iin_PFET4*/ -void GetCnf_Pfet4(NewIC) +static void GetCnf_Pfet4(NewIC) ICPfet *NewIC; { int Found; @@ -559,7 +559,7 @@ ICPfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_PFET4(act) +static void initlib_PFET4(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -596,7 +596,7 @@ Analog_32_action *act; -int Pfetcheck(Inst, Attrnum) +static int Pfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -687,7 +687,7 @@ long Attrnum; } -void Attr_Pfet4(act) +static void Attr_Pfet4(act) Analog_32_action *act; { long Attrnum; @@ -705,7 +705,7 @@ Analog_32_action *act; } -void Newgate_Pfet4(act) +static void Newgate_Pfet4(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -766,7 +766,7 @@ Analog_32_action *act; WITH->attr[N_Early - 1].changed = true; } -void Copygate_Pfet4(act) +static void Copygate_Pfet4(act) Analog_32_action *act; { PfetConst *PfetVar, *Old_Pfetvar; @@ -781,7 +781,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Pfet4(act) +static void Dispose_Pfet4(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -793,7 +793,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Pfet4(act) +static void Readgate_Pfet4(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -855,7 +855,7 @@ Analog_32_action *act; PfetVar->TauCgd = 0.0; } -void Probe_Pfet4(act) +static void Probe_Pfet4(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/pfet5.c b/log/src/ana/pfet5.c index 5b2b20fbdded342f7e1e28387a1a1d393dd01be7..3e1de29c87c9ecb54e89856f2f67a3689f7d9730 100644 --- a/log/src/ana/pfet5.c +++ b/log/src/ana/pfet5.c @@ -67,7 +67,7 @@ typedef struct ICPfet { /****************************************************************************/ -void Ex_PFET5(act) +static void Ex_PFET5(act) Analog_32_action *act; { double MinI2, dI2dV1, dI2dV2, dI2dV3, MinI3, dI3dV1, dI3dV2, dI3dV3, MinI1, @@ -241,7 +241,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_PFET5(act) +static void Iin_PFET5(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr; @@ -357,7 +357,7 @@ Analog_32_action *act; } /*Iin_PFET5*/ -void GetCnf_Pfet5(NewIC) +static void GetCnf_Pfet5(NewIC) ICPfet *NewIC; { int Found; @@ -467,7 +467,7 @@ ICPfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_PFET5(act) +static void initlib_PFET5(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -503,7 +503,7 @@ Analog_32_action *act; } /*PFET5_Initlib*/ -int Pfetcheck(Inst, Attrnum) +static int Pfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -602,7 +602,7 @@ long Attrnum; } -void Attr_Pfet5(act) +static void Attr_Pfet5(act) Analog_32_action *act; { long Attrnum; @@ -620,7 +620,7 @@ Analog_32_action *act; } -void Newgate_Pfet5(act) +static void Newgate_Pfet5(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -679,7 +679,7 @@ Analog_32_action *act; WITH->attr[N_Early - 1].changed = true; } -void Copygate_Pfet5(act) +static void Copygate_Pfet5(act) Analog_32_action *act; { PfetConst *PfetVar, *Old_Pfetvar; @@ -694,7 +694,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Pfet5(act) +static void Dispose_Pfet5(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -706,7 +706,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Pfet5(act) +static void Readgate_Pfet5(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -767,7 +767,7 @@ Analog_32_action *act; PfetVar->TauCgs = 0.0; } -void Probe_Pfet5(act) +static void Probe_Pfet5(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -837,9 +837,6 @@ Analog_32_action *act; AnaScoreboard(STR3, (long)AnaMessGate3); } - - - /*==========================================================================*/ /* Library Listing For Cell PFET5 */ /*==========================================================================*/ diff --git a/log/src/ana/pfet6.c b/log/src/ana/pfet6.c index 94baac8e1467a52e77119e3fb38a04a5934e3d64..6048a51ec00f3e1fa2174051da21183c9a75b8b9 100644 --- a/log/src/ana/pfet6.c +++ b/log/src/ana/pfet6.c @@ -69,7 +69,7 @@ typedef struct ICPfet { /****************************************************************************/ -void Ex_PFET6(act) +static void Ex_PFET6(act) Analog_32_action *act; { double MinI2, dI2dV1, dI2dV2, dI2dV3, dI2dV4, @@ -286,7 +286,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_PFET6(act) +static void Iin_PFET6(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr, *Pin4Ptr; @@ -411,7 +411,7 @@ Analog_32_action *act; } /*Iin_PFET6*/ -void GetCnf_Pfet6(NewIC) +static void GetCnf_Pfet6(NewIC) ICPfet *NewIC; { int Found; @@ -529,7 +529,7 @@ ICPfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_PFET6(act) +static void initlib_PFET6(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -568,7 +568,7 @@ Analog_32_action *act; } /*PFET6_Initlib*/ -int Pfetcheck(Inst, Attrnum) +static int Pfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -680,7 +680,7 @@ long Attrnum; } -void Attr_Pfet6(act) +static void Attr_Pfet6(act) Analog_32_action *act; { long Attrnum; @@ -698,7 +698,7 @@ Analog_32_action *act; } -void Newgate_Pfet6(act) +static void Newgate_Pfet6(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -761,7 +761,7 @@ Analog_32_action *act; WITH->attr[N_Early - 1].changed = true; } -void Copygate_Pfet6(act) +static void Copygate_Pfet6(act) Analog_32_action *act; { PfetConst *PfetVar, *Old_Pfetvar; @@ -776,7 +776,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Pfet6(act) +static void Dispose_Pfet6(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -788,7 +788,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Pfet6(act) +static void Readgate_Pfet6(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -854,7 +854,7 @@ Analog_32_action *act; PfetVar->TauCgs = 0.0; } -void Probe_Pfet6(act) +static void Probe_Pfet6(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -935,8 +935,6 @@ Analog_32_action *act; } - - /*==========================================================================*/ /* Library Listing For Cell PFET6 */ /*==========================================================================*/ diff --git a/log/src/ana/pfet7f.c b/log/src/ana/pfet7f.c index 2ec8359630ab2687f16b9021eb256154b5d7bc5e..df69238cc363fac0ae6c88eea1ecd06f3d3db078 100644 --- a/log/src/ana/pfet7f.c +++ b/log/src/ana/pfet7f.c @@ -84,7 +84,7 @@ typedef struct ICPfet { /****************************************************************************/ -int Pfetconsts(Inst) +static int Pfetconsts(Inst) log_grec *Inst; { @@ -164,7 +164,7 @@ log_grec *Inst; /****************************************************************************/ -void Ex_PFET7F(act) +static void Ex_PFET7F(act) Analog_32_action *act; { log_grec *WITH; @@ -455,7 +455,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_PFET7F(act) +static void Iin_PFET7F(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr, *Pin4Ptr; @@ -634,7 +634,7 @@ Analog_32_action *act; } /*Iin_PFET7F*/ -void GetCnf_Pfet7F(NewIC) +static void GetCnf_Pfet7F(NewIC) ICPfet *NewIC; { int Found; @@ -721,7 +721,7 @@ ICPfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_PFET7F(act) +static void initlib_PFET7F(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -757,7 +757,7 @@ Analog_32_action *act; } /*PFET7F_Initlib*/ -int Pfetcheck(Inst, Attrnum) +static int Pfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -856,7 +856,7 @@ long Attrnum; } -void Attr_Pfet7F(act) +static void Attr_Pfet7F(act) Analog_32_action *act; { long Attrnum; @@ -879,7 +879,7 @@ Analog_32_action *act; } -void Newgate_Pfet7F(act) +static void Newgate_Pfet7F(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -930,7 +930,7 @@ Analog_32_action *act; Pfetconsts(WITH); } -void Copygate_Pfet7F(act) +static void Copygate_Pfet7F(act) Analog_32_action *act; { PfetConst *PfetVar, *Old_Pfetvar; @@ -945,7 +945,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Pfet7F(act) +static void Dispose_Pfet7F(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -957,7 +957,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Pfet7F(act) +static void Readgate_Pfet7F(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -1010,7 +1010,7 @@ Analog_32_action *act; PfetVar->TauCgs = 0.0; } -void Probe_Pfet7F(act) +static void Probe_Pfet7F(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -1091,7 +1091,7 @@ Analog_32_action *act; } -void Update_Pfet7F(act) +static void Update_Pfet7F(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/pfet7t.c b/log/src/ana/pfet7t.c index 82f6d5113c1da674a732ffb6d36a698e2f3f230e..09d809260827e75bd6e7a8284c69a2506c6f193f 100644 --- a/log/src/ana/pfet7t.c +++ b/log/src/ana/pfet7t.c @@ -87,7 +87,7 @@ typedef struct ICPfet { /****************************************************************************/ -int Pfetconsts(Inst) +static int Pfetconsts(Inst) log_grec *Inst; { @@ -167,7 +167,7 @@ log_grec *Inst; /****************************************************************************/ -void Ex_PFET7T(act) +static void Ex_PFET7T(act) Analog_32_action *act; { log_grec *WITH; @@ -416,7 +416,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_PFET7T(act) +static void Iin_PFET7T(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr; @@ -570,7 +570,7 @@ Analog_32_action *act; } /*Iin_PFET7T*/ -void GetCnf_Pfet7T(NewIC) +static void GetCnf_Pfet7T(NewIC) ICPfet *NewIC; { int Found; @@ -649,7 +649,7 @@ ICPfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_PFET7T(act) +static void initlib_PFET7T(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -682,7 +682,7 @@ Analog_32_action *act; } /*PFET7T_Initlib*/ -int Pfetcheck(Inst, Attrnum) +static int Pfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -776,7 +776,7 @@ long Attrnum; } -void Attr_Pfet7T(act) +static void Attr_Pfet7T(act) Analog_32_action *act; { long Attrnum; @@ -799,7 +799,7 @@ Analog_32_action *act; } -void Newgate_Pfet7T(act) +static void Newgate_Pfet7T(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -850,7 +850,7 @@ Analog_32_action *act; Pfetconsts(WITH); } -void Copygate_Pfet7T(act) +static void Copygate_Pfet7T(act) Analog_32_action *act; { PfetConst *PfetVar, *Old_Pfetvar; @@ -865,7 +865,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Pfet7T(act) +static void Dispose_Pfet7T(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -877,7 +877,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Pfet7T(act) +static void Readgate_Pfet7T(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -930,7 +930,7 @@ Analog_32_action *act; PfetVar->TauCgs = 0.0; } -void Probe_Pfet7T(act) +static void Probe_Pfet7T(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -1001,7 +1001,7 @@ Analog_32_action *act; } -void Update_Pfet7T(act) +static void Update_Pfet7T(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/physical.c b/log/src/ana/physical.c index 0369019b78eec192370dad6942f499c8573c4aef..19fcc8d8a0e4398b3e83b356be227df348138775 100644 --- a/log/src/ana/physical.c +++ b/log/src/ana/physical.c @@ -48,7 +48,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /****************************************************************************/ -void initlib_Physical(act) +static void initlib_Physical(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -63,7 +63,7 @@ Analog_32_action *act; } /*NFET4_Initlib*/ -void Reload_Physical(act) +static void Reload_Physical(act) Analog_32_action *act; { log_grec *WITH; @@ -110,7 +110,7 @@ Analog_32_action *act; } -void Attr_Physical(act) +static void Attr_Physical(act) Analog_32_action *act; { long Attrnum; @@ -215,7 +215,7 @@ Analog_32_action *act; } } -void Openconfig_Physical(act) +static void Openconfig_Physical(act) Analog_32_action *act; { long Index; @@ -247,7 +247,7 @@ Analog_32_action *act; } -void Newgate_Physical(act) +static void Newgate_Physical(act) Analog_32_action *act; { Analog_32_action Newact; diff --git a/log/src/ana/pnp1.c b/log/src/ana/pnp1.c index a5adbb91ee6c0c2b8bccc6c5413e6da73627cca6..6b141c69487f9308b2cbd62198a4c32bc84021c3 100644 --- a/log/src/ana/pnp1.c +++ b/log/src/ana/pnp1.c @@ -60,7 +60,7 @@ typedef struct ICPNP1 { /****************************************************************************/ -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -104,7 +104,7 @@ int Limitflag, Erase; -void Ex_PNP1(act) +static void Ex_PNP1(act) Analog_32_action *act; { double MinI1, MinI2, MinI3, dI1dV1, dI1dV2, dI1dV3, dI2dV1, dI2dV2, dI2dV3, @@ -276,7 +276,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_PNP1(act) +static void Iin_PNP1(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -388,7 +388,7 @@ Analog_32_action *act; } } /*Iin_PNP1*/ -void GetCnf_PNP1(NewIC) +static void GetCnf_PNP1(NewIC) ICPNP1 *NewIC; { int Found; @@ -491,7 +491,7 @@ ICPNP1 *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_PNP1(act) +static void initlib_PNP1(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -534,7 +534,7 @@ Analog_32_action *act; #define MAKE_IECO(n) ((n)->IECO=(n)->Is*(n)->betaR/((n)->betaR+(n)->betaF)) */ -int PNP1check(Inst, Attrnum) +static int PNP1check(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -635,7 +635,7 @@ long Attrnum; } -void Attr_PNP1(act) +static void Attr_PNP1(act) Analog_32_action *act; { long Attrnum; @@ -653,7 +653,7 @@ Analog_32_action *act; } -void Newgate_PNP1(act) +static void Newgate_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var; @@ -712,7 +712,7 @@ Analog_32_action *act; WITH->attr[N_Vcrow - 1].changed = true; } -void Copygate_PNP1(act) +static void Copygate_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var, *Old_PNP1var; @@ -729,7 +729,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); } -void Dispose_PNP1(act) +static void Dispose_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var; @@ -741,7 +741,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_PNP1(act) +static void Readgate_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var; @@ -801,7 +801,7 @@ Analog_32_action *act; PNP1Var->TauCbe = 0.0; } -void Probe_PNP1(act) +static void Probe_PNP1(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -865,7 +865,7 @@ Analog_32_action *act; } } -void Reset_PNP1(act) +static void Reset_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var; @@ -881,7 +881,7 @@ Analog_32_action *act; Limitfill(act->inst, PNP1Var->Limit, false); } -void PreUpdate_PNP1(act) +static void PreUpdate_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var; @@ -903,7 +903,7 @@ Analog_32_action *act; Vpin2 - VPin1 >= WITH1->attr[N_Vcrow - 1].UU.r); } -void Update_PNP1(act) +static void Update_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var; @@ -916,7 +916,7 @@ Analog_32_action *act; PNP1Var->Limit = PNP1Var->NewLimit; } -void Display_PNP1(act) +static void Display_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var; @@ -933,7 +933,7 @@ Analog_32_action *act; } -void Refresh_PNP1(act) +static void Refresh_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var; @@ -944,7 +944,7 @@ Analog_32_action *act; Limitfill(act->inst, PNP1Var->Limit, false); } -void Erase_PNP1(act) +static void Erase_PNP1(act) Analog_32_action *act; { PNP1Const *PNP1Var; diff --git a/log/src/ana/pnp2.c b/log/src/ana/pnp2.c index fe6153da8de0a14e54da59bc5bd580634c5aa8a2..77279f8bf4029f7e819f20166c81aeb36d382b71 100644 --- a/log/src/ana/pnp2.c +++ b/log/src/ana/pnp2.c @@ -62,7 +62,7 @@ typedef struct ICPNP2 { /****************************************************************************/ -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -96,26 +96,26 @@ int Limitflag, Erase; /* */ /* Base = VPin1, Emitter = VPin3 Collector = VPin2 */ /* */ -/* ICEO = Is / betaF */ -/* IECO = Is / betaR */ +/* ICEO = Is / betaF */ +/* IECO = Is / betaR */ /* */ -/* Ifor = ICEO * (Exp((Vbase - Vemit)/Vo) - 1) */ -/* Irev = IECO * (Exp((Vbase - Vcoll)/Vo) - 1) */ +/* Ifor = ICEO * (Exp((Vbase - Vemit)/Vo) - 1) */ +/* Irev = IECO * (Exp((Vbase - Vcoll)/Vo) - 1) */ /* */ -/* IBase = Ifor - Irev */ -/* IColl = betaF * Ifor - (1 + betaR) * Irev */ -/* IEmit = -(IBase + IColl) */ -/* */ -/* 2nd-order Model (Early effect): */ +/* IBase = Ifor - Irev */ +/* IColl = betaF * Ifor - (1 + betaR) * Irev */ +/* IEmit = -(IBase + IColl) */ /* */ -/* IColl = (betaF * Ifor - betaR * Irev) * */ -/* (1 - (((Vbase - Vemit) + (Vbase - Vcoll)) / |Va|)) - Irev */ +/* 2nd-order Model (Early effect): */ +/* */ +/* IColl = (betaF * Ifor - betaR * Irev) * */ +/* (1 - (((Vbase - Vemit) + (Vbase - Vcoll)) / |Va|)) - Irev */ /* */ /****************************************************************************/ -void Ex_PNP2(act) +static void Ex_PNP2(act) Analog_32_action *act; { double MinI1, MinI2, MinI3, dI1dV1, dI1dV2, dI1dV3, dI2dV1, dI2dV2, dI2dV3, @@ -292,7 +292,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_PNP2(act) +static void Iin_PNP2(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -408,7 +408,7 @@ Analog_32_action *act; } } /*Iin_PNP2*/ -void GetCnf_PNP2(NewIC) +static void GetCnf_PNP2(NewIC) ICPNP2 *NewIC; { int Found; @@ -519,7 +519,7 @@ ICPNP2 *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_PNP2(act) +static void initlib_PNP2(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -559,7 +559,7 @@ Analog_32_action *act; #define MAKE_IECO(n) ((n)->IECO=(n)->Is/(n)->betaR) -int PNP2check(Inst, Attrnum) +static int PNP2check(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -667,7 +667,7 @@ long Attrnum; } -void Attr_PNP2(act) +static void Attr_PNP2(act) Analog_32_action *act; { long Attrnum; @@ -685,7 +685,7 @@ Analog_32_action *act; } -void Newgate_PNP2(act) +static void Newgate_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var; @@ -748,7 +748,7 @@ Analog_32_action *act; WITH->attr[N_Vcrow - 1].changed = true; } -void Copygate_PNP2(act) +static void Copygate_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var, *Old_PNP2var; @@ -765,7 +765,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); } -void Dispose_PNP2(act) +static void Dispose_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var; @@ -777,7 +777,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_PNP2(act) +static void Readgate_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var; @@ -841,7 +841,7 @@ Analog_32_action *act; PNP2Var->TauCbe = 0.0; } -void Probe_PNP2(act) +static void Probe_PNP2(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -905,7 +905,7 @@ Analog_32_action *act; } } -void Reset_PNP2(act) +static void Reset_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var; @@ -921,7 +921,7 @@ Analog_32_action *act; Limitfill(act->inst, PNP2Var->Limit, false); } -void PreUpdate_PNP2(act) +static void PreUpdate_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var; @@ -943,7 +943,7 @@ Analog_32_action *act; Vpin2 - VPin1 >= WITH1->attr[N_Vcrow - 1].UU.r); } -void Update_PNP2(act) +static void Update_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var; @@ -956,7 +956,7 @@ Analog_32_action *act; PNP2Var->Limit = PNP2Var->NewLimit; } -void Display_PNP2(act) +static void Display_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var; @@ -973,7 +973,7 @@ Analog_32_action *act; } -void Refresh_PNP2(act) +static void Refresh_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var; @@ -984,7 +984,7 @@ Analog_32_action *act; Limitfill(act->inst, PNP2Var->Limit, false); } -void Erase_PNP2(act) +static void Erase_PNP2(act) Analog_32_action *act; { PNP2Const *PNP2Var; diff --git a/log/src/ana/pspc1.c b/log/src/ana/pspc1.c index 36837a872cec1527a091b3073de1c88e4bf49caa..715e596a1b52b1162f35d892654d126671af8c8c 100644 --- a/log/src/ana/pspc1.c +++ b/log/src/ana/pspc1.c @@ -86,7 +86,7 @@ typedef struct ICPfet { } ICPfet; -void Show_W_L(Inst,erase) +static void Show_W_L(Inst,erase) log_grec *Inst; int erase; { @@ -175,7 +175,7 @@ int erase; /****************************************************************************/ -void Ex_PSPC1(act) +static void Ex_PSPC1(act) Analog_32_action *act; { double MinI2, dI2dV1, dI2dV2, dI2dV3, dI2dV4, @@ -394,7 +394,7 @@ Analog_32_action *act; /* Procedure To Supply Current Out of a Cell To Current Meters */ /****************************************************************************/ -void Iin_PSPC1(act) +static void Iin_PSPC1(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr, *Pin2Ptr, *Pin3Ptr, *Pin4Ptr; @@ -519,7 +519,7 @@ Analog_32_action *act; } /*Iin_Pspc1*/ -void GetCnf_Pspc1(NewIC) +static void GetCnf_Pspc1(NewIC) ICPfet *NewIC; { int Found; @@ -663,7 +663,7 @@ ICPfet *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_PSPC1(act) +static void initlib_PSPC1(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -704,7 +704,7 @@ Analog_32_action *act; } /*PSPC1_Initlib*/ -int Pfetcheck(Inst, Attrnum) +static int Pfetcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -839,7 +839,7 @@ long Attrnum; } -void Attr_Pspc1(act) +static void Attr_Pspc1(act) Analog_32_action *act; { long Attrnum; @@ -867,7 +867,7 @@ Analog_32_action *act; } -void Newgate_Pspc1(act) +static void Newgate_Pspc1(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -941,7 +941,7 @@ Analog_32_action *act; WITH->attr[N_Number - 1].changed = true; } -void Copygate_Pspc1(act) +static void Copygate_Pspc1(act) Analog_32_action *act; { PfetConst *PfetVar, *Old_Pfetvar; @@ -956,7 +956,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); /*6*/ } -void Dispose_Pspc1(act) +static void Dispose_Pspc1(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -968,7 +968,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Pspc1(act) +static void Readgate_Pspc1(act) Analog_32_action *act; { PfetConst *PfetVar; @@ -1050,7 +1050,7 @@ Analog_32_action *act; PfetVar->TauCgs = 0.0; } -void Probe_Pspc1(act) +static void Probe_Pspc1(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -1131,8 +1131,6 @@ Analog_32_action *act; } - - /*==========================================================================*/ /* Library Listing For Cell Pspc1 */ /*==========================================================================*/ diff --git a/log/src/ana/pwl.c b/log/src/ana/pwl.c index 14ce169775be2a43fc8822606467c6402fa7f585..db03711fc51c2f673172b877182a4b9b1e742a12 100644 --- a/log/src/ana/pwl.c +++ b/log/src/ana/pwl.c @@ -129,7 +129,7 @@ typedef struct ICPWL { /****************************************************************************/ -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; char Limitflag; int Erase; @@ -193,7 +193,7 @@ int Erase; /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -void locate (x, n, v, j) +static void locate (x, n, v, j) double x[], v; int n, *j; { @@ -214,7 +214,7 @@ int n, *j; } -void interp (v, j, PWLVar, i, didv) +static void interp (v, j, PWLVar, i, didv) double v, *i, *didv; int j; PWLConst *PWLVar; @@ -245,7 +245,7 @@ void interp (v, j, PWLVar, i, didv) } -void Ex_PWL(act) +static void Ex_PWL(act) Analog_32_action *act; { double MinI1, MinI2, dI1dV1, dI1dV2, dI2dV1, dI2dV2; @@ -320,7 +320,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_PWL(act) +static void Iin_PWL(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -387,7 +387,7 @@ Analog_32_action *act; } /*Iin_PWL*/ -void findcircle (x1, y1, x2, y2, x3, y3, rd, +static void findcircle (x1, y1, x2, y2, x3, y3, rd, xc, yc, xl, xr, sd, ml, mr, bl, br) double x1, y1, x2, y2, x3, y3, *rd; double *xc, *yc, *xl, *xr, *sd, *ml, *mr, *bl, *br; @@ -455,7 +455,7 @@ retry: } -void pwl2c (x, y, n, radius, PWLVar) +static void pwl2c (x, y, n, radius, PWLVar) double x[], y[], radius; int n; PWLConst *PWLVar; @@ -502,7 +502,7 @@ void pwl2c (x, y, n, radius, PWLVar) } -char CheckPWLFile (datafile) +static char CheckPWLFile (datafile) FILE *datafile; { int n; @@ -528,7 +528,7 @@ char CheckPWLFile (datafile) } -void LoadPWLVar (PWLVar, datafileName, radius) +static void LoadPWLVar (PWLVar, datafileName, radius) PWLConst *PWLVar; char *datafileName; double radius; @@ -559,7 +559,7 @@ void LoadPWLVar (PWLVar, datafileName, radius) } -void GetCnf_PWL(NewIC) +static void GetCnf_PWL(NewIC) ICPWL *NewIC; { int Found; @@ -617,7 +617,7 @@ ICPWL *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_PWL(act) +static void initlib_PWL(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -645,7 +645,7 @@ Analog_32_action *act; -int PWLcheck(Inst, Attrnum) +static int PWLcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -690,7 +690,7 @@ long Attrnum; } -void Attr_PWL(act) +static void Attr_PWL(act) Analog_32_action *act; { long Attrnum; @@ -703,7 +703,7 @@ Analog_32_action *act; } -void Newgate_PWL(act) +static void Newgate_PWL(act) Analog_32_action *act; { PWLConst *PWLVar; @@ -746,7 +746,7 @@ Analog_32_action *act; } } -void Copygate_PWL(act) +static void Copygate_PWL(act) Analog_32_action *act; { PWLConst *PWLVar, *Old_PWLvar; @@ -763,7 +763,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); } -void Dispose_PWL(act) +static void Dispose_PWL(act) Analog_32_action *act; { PWLConst *PWLVar; @@ -775,7 +775,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_PWL(act) +static void Readgate_PWL(act) Analog_32_action *act; { PWLConst *PWLVar; @@ -792,7 +792,7 @@ Analog_32_action *act; } -void Probe_PWL(act) +static void Probe_PWL(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -848,7 +848,7 @@ Analog_32_action *act; } -void Reset_PWL(act) +static void Reset_PWL(act) Analog_32_action *act; { PWLConst *PWLVar; @@ -865,7 +865,7 @@ Analog_32_action *act; } -void PreUpdate_PWL(act) +static void PreUpdate_PWL(act) Analog_32_action *act; { PWLConst *PWLVar; @@ -891,7 +891,7 @@ Analog_32_action *act; } -void Update_PWL(act) +static void Update_PWL(act) Analog_32_action *act; { PWLConst *PWLVar; @@ -905,7 +905,7 @@ Analog_32_action *act; } -void Display_PWL(act) +static void Display_PWL(act) Analog_32_action *act; { PWLConst *PWLVar; @@ -922,7 +922,7 @@ Analog_32_action *act; } -void Refresh_PWL(act) +static void Refresh_PWL(act) Analog_32_action *act; { PWLConst *PWLVar; @@ -933,7 +933,7 @@ Analog_32_action *act; Limitfill(act->inst, PWLVar->Limit, false); } -void Erase_PWL(act) +static void Erase_PWL(act) Analog_32_action *act; { PWLConst *PWLVar; diff --git a/log/src/ana/resfloat.c b/log/src/ana/resfloat.c index 7fdea34be786664d2b1045c223f133e07f2ec606..2c314918199133696483cb69d1cd58a6a3559e94 100644 --- a/log/src/ana/resfloat.c +++ b/log/src/ana/resfloat.c @@ -53,7 +53,7 @@ typedef struct ICResfloat { /****************************************************************************/ -void Ex_Resfloat(act) +static void Ex_Resfloat(act) Analog_32_action *act; { double MinI1, MinI2, dI1dV1, dI1dV2, dI2dV1, dI2dV2; @@ -106,7 +106,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_Resfloat(act) +static void Iin_Resfloat(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -148,7 +148,7 @@ Analog_32_action *act; } /*Iin_Resfloat*/ -void GetCnf_Resfloat(NewIC) +static void GetCnf_Resfloat(NewIC) ICResfloat *NewIC; { int Found; @@ -179,7 +179,7 @@ ICResfloat *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_Resfloat(act) +static void initlib_Resfloat(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -204,7 +204,7 @@ Analog_32_action *act; -int Resfloatcheck(Inst, Attrnum) +static int Resfloatcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -229,7 +229,7 @@ long Attrnum; } -void Attr_Resfloat(act) +static void Attr_Resfloat(act) Analog_32_action *act; { long Attrnum; @@ -242,7 +242,7 @@ Analog_32_action *act; } -void Newgate_Resfloat(act) +static void Newgate_Resfloat(act) Analog_32_action *act; { ResfloatConst *ResfloatVar; @@ -264,7 +264,7 @@ Analog_32_action *act; WITH->attr[N_Res - 1].changed = true; } -void Copygate_Resfloat(act) +static void Copygate_Resfloat(act) Analog_32_action *act; { ResfloatConst *ResfloatVar, *Old_Resfloatvar; @@ -281,7 +281,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); } -void Dispose_Resfloat(act) +static void Dispose_Resfloat(act) Analog_32_action *act; { ResfloatConst *ResfloatVar; @@ -293,7 +293,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Resfloat(act) +static void Readgate_Resfloat(act) Analog_32_action *act; { ResfloatConst *ResfloatVar; @@ -308,7 +308,7 @@ Analog_32_action *act; } -void Probe_Resfloat(act) +static void Probe_Resfloat(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/rtd.c b/log/src/ana/rtd.c index c9fc0eff7b814f0a3b7a365ea43fcd396d510600..0ed4397d17c5339c26e16068421b1f362d69a54c 100644 --- a/log/src/ana/rtd.c +++ b/log/src/ana/rtd.c @@ -119,7 +119,7 @@ typedef struct ICRTD { /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -double SafeExp (x) +static double SafeExp (x) double x; { if (x < -700.0) @@ -130,7 +130,7 @@ double x; return (exp (x)); } -void Ex_RTD(act) +static void Ex_RTD(act) Analog_32_action *act; { double MinI1, MinI2, dI1dV1, dI1dV2, dI2dV1, dI2dV2; @@ -277,7 +277,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_RTD(act) +static void Iin_RTD(act) Analog_32_action *act; { AnaExt_rec *Pin1Ptr; @@ -436,7 +436,7 @@ Analog_32_action *act; } /*Iin_RTD*/ -void GetCnf_RTD(NewIC) +static void GetCnf_RTD(NewIC) ICRTD *NewIC; { int Found; @@ -570,7 +570,7 @@ ICRTD *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_RTD(act) +static void initlib_RTD(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -607,7 +607,7 @@ Analog_32_action *act; -int RTDcheck(Inst, Attrnum) +static int RTDcheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -733,7 +733,7 @@ long Attrnum; } -void Attr_RTD(act) +static void Attr_RTD(act) Analog_32_action *act; { long Attrnum; @@ -746,7 +746,7 @@ Analog_32_action *act; } -void Newgate_RTD(act) +static void Newgate_RTD(act) Analog_32_action *act; { RTDConst *RTDVar; @@ -803,7 +803,7 @@ Analog_32_action *act; } } -void Copygate_RTD(act) +static void Copygate_RTD(act) Analog_32_action *act; { RTDConst *RTDVar, *Old_RTDvar; @@ -820,7 +820,7 @@ Analog_32_action *act; AnaCapCopy(act->inst); } -void Dispose_RTD(act) +static void Dispose_RTD(act) Analog_32_action *act; { RTDConst *RTDVar; @@ -832,7 +832,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_RTD(act) +static void Readgate_RTD(act) Analog_32_action *act; { RTDConst *RTDVar; @@ -870,7 +870,7 @@ Analog_32_action *act; } -void Probe_RTD(act) +static void Probe_RTD(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/runspec.c b/log/src/ana/runspec.c index a1531c0e6588e4855a5dabc831a180ab32da3b28..01c487f85e25cc5a1af198a5caae7a1f46ad60f8 100644 --- a/log/src/ana/runspec.c +++ b/log/src/ana/runspec.c @@ -49,7 +49,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /****************************************************************************/ -void initlib_Runspec(act) +static void initlib_Runspec(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -64,7 +64,7 @@ Analog_32_action *act; } /*NFET4_Initlib*/ -void Reload_Runspec(act) +static void Reload_Runspec(act) Analog_32_action *act; { log_grec *WITH; @@ -102,7 +102,7 @@ Analog_32_action *act; } -void Attr_Runspec(act) +static void Attr_Runspec(act) Analog_32_action *act; { long Attrnum; @@ -215,7 +215,7 @@ Analog_32_action *act; } } -void Openconfig_Runspec(act) +static void Openconfig_Runspec(act) Analog_32_action *act; { long Index; @@ -248,7 +248,7 @@ Analog_32_action *act; } -void Newgate_Runspec(act) +static void Newgate_Runspec(act) Analog_32_action *act; { Analog_32_action Newact; diff --git a/log/src/ana/stairs.c b/log/src/ana/stairs.c index 896776eb0ae3273b1fac446912ebfea12849f9bb..2e27c40cb39399ab4c512da5829130359b757b16 100644 --- a/log/src/ana/stairs.c +++ b/log/src/ana/stairs.c @@ -68,7 +68,7 @@ typedef struct ICStairs { -void Switchfill(Inst, Erase) +static void Switchfill(Inst, Erase) log_grec *Inst; int Erase; { @@ -93,7 +93,7 @@ int Erase; (*AnaLogglobals->hook.unhidecursor)(); } -void Limitfill(Inst, Limitflag, Erase) +static void Limitfill(Inst, Limitflag, Erase) log_grec *Inst; int Limitflag, Erase; { @@ -120,7 +120,7 @@ int Limitflag, Erase; -double Stairmaker(Inst, Ftime, First) +static double Stairmaker(Inst, Ftime, First) log_grec *Inst; double Ftime; int First; @@ -177,7 +177,7 @@ int First; /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -void Ex_Stairs(act) +static void Ex_Stairs(act) Analog_32_action *act; { /*Stairserent*/ @@ -240,7 +240,7 @@ Analog_32_action *act; /****************************************************************************/ -void Iin_Stairs(act) +static void Iin_Stairs(act) Analog_32_action *act; { /*Stairserent*/ @@ -299,7 +299,7 @@ Analog_32_action *act; } } /*Iin_Stairs*/ -void GetCnf_Stairs(NewIC) +static void GetCnf_Stairs(NewIC) ICStairs *NewIC; { int Found; @@ -394,7 +394,7 @@ ICStairs *NewIC; /* Installation Procedure */ /****************************************************************************/ -void initlib_Stairs(act) +static void initlib_Stairs(act) Analog_32_action *act; { /*Stairserent*/ @@ -427,7 +427,7 @@ Analog_32_action *act; } /*Stairs_Initlib*/ -int Stairscheck(Inst, Attrnum) +static int Stairscheck(Inst, Attrnum) log_grec *Inst; long Attrnum; { @@ -488,7 +488,7 @@ long Attrnum; -void Attr_Stairs(act) +static void Attr_Stairs(act) Analog_32_action *act; { long Attrnum; @@ -501,7 +501,7 @@ Analog_32_action *act; } -void Newgate_Stairs(act) +static void Newgate_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -542,7 +542,7 @@ Analog_32_action *act; } } -void Copygate_Stairs(act) +static void Copygate_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar, *Old_Stairsvar; @@ -558,7 +558,7 @@ Analog_32_action *act; } -void Dispose_Stairs(act) +static void Dispose_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -570,7 +570,7 @@ Analog_32_action *act; AnaCapDispose(act->inst); /*7*/ } -void Readgate_Stairs(act) +static void Readgate_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -603,7 +603,7 @@ Analog_32_action *act; StairsVar->Reset_Freeze = (*STR1 == 'T' || *STR1 == 't'); } -void Writegate_Stairs(act) +static void Writegate_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -627,7 +627,7 @@ Analog_32_action *act; -void Reset_Stairs(act) +static void Reset_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -648,7 +648,7 @@ Analog_32_action *act; } } -void Set_Stairs(act) +static void Set_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -661,7 +661,7 @@ Analog_32_action *act; StairsVar->Reset_Freeze = act->inst->attr[N_Freeze - 1].UU.b; } -void Clear_Stairs(act) +static void Clear_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -678,7 +678,7 @@ Analog_32_action *act; StairsVar->Reset_Freeze = ICptr->ICFreeze; } -void PreUpdate_Stairs(act) +static void PreUpdate_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -697,7 +697,7 @@ Analog_32_action *act; StairsVar->NewLimit = (fabs(VPin1 - VPin2 - StairsVar->Videal) > 0.1); } -void Update_Stairs(act) +static void Update_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -714,7 +714,7 @@ Analog_32_action *act; StairsVar->Timez += AnaDtlast; } -void Display_Stairs(act) +static void Display_Stairs(act) Analog_32_action *act; { StairsConst *StairsVar; @@ -747,7 +747,7 @@ Analog_32_action *act; } -void Touch_Stairs(act) +static void Touch_Stairs(act) Analog_32_action *act; { log_action_t *WITH; @@ -764,7 +764,7 @@ Analog_32_action *act; } -void Erase_Stairs(Inst) +static void Erase_Stairs(Inst) log_grec *Inst; { StairsConst *StairsVar; @@ -776,7 +776,7 @@ log_grec *Inst; Limitfill(Inst, StairsVar->Limit, true); } -void Refresh_Stairs(Inst) +static void Refresh_Stairs(Inst) log_grec *Inst; { StairsConst *StairsVar; @@ -788,7 +788,7 @@ log_grec *Inst; Limitfill(Inst, StairsVar->Limit, false); } -void Probe_Stairs(act) +static void Probe_Stairs(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/thermal.c b/log/src/ana/thermal.c index 97ab73a6febe15bdb427c267b70cb872e3241325..da0c0c9a0cf72c4e0c54ad51851fa156dce21eb8 100644 --- a/log/src/ana/thermal.c +++ b/log/src/ana/thermal.c @@ -55,7 +55,7 @@ typedef struct ICThermal { -void GetCnf_Thermal(NewIC) +static void GetCnf_Thermal(NewIC) ICThermal *NewIC; { int Found; @@ -101,7 +101,7 @@ ICThermal *NewIC; /****************************************************************************/ -void initlib_Thermal(act) +static void initlib_Thermal(act) Analog_32_action *act; { AnaCell_rec *NewCell; @@ -120,7 +120,7 @@ Analog_32_action *act; act->kind->info = (void *)NewCell; } /*NFET4_Initlib*/ -void Refresh_Thermal(act) +static void Refresh_Thermal(act) Analog_32_action *act; { short Tx, Ty; @@ -170,7 +170,7 @@ Analog_32_action *act; } -void Erase_Thermal(act) +static void Erase_Thermal(act) Analog_32_action *act; { short Tx, Ty; @@ -194,7 +194,7 @@ Analog_32_action *act; -void Attr_Thermal(act) +static void Attr_Thermal(act) Analog_32_action *act; { long Attrnum; @@ -290,7 +290,7 @@ Analog_32_action *act; } } -void Openconfig_Thermal(act) +static void Openconfig_Thermal(act) Analog_32_action *act; { long Index; @@ -310,7 +310,7 @@ Analog_32_action *act; WITH->attr[N_Celsius - 1].changed = true; } -void Readgate_Thermal(act) +static void Readgate_Thermal(act) Analog_32_action *act; { log_grec *WITH; @@ -325,7 +325,7 @@ Analog_32_action *act; } -void Newgate_Thermal(act) +static void Newgate_Thermal(act) Analog_32_action *act; { Anainstlist *A_Gate; @@ -376,7 +376,7 @@ Analog_32_action *act; } } -void Copygate_Thermal(act) +static void Copygate_Thermal(act) Analog_32_action *act; { ThermalConst *ThermalVar, *Old_ThermalVar; @@ -390,7 +390,7 @@ Analog_32_action *act; A_Gate->InstVar = (void *)ThermalVar; } -void Dispose_Thermal(act) +static void Dispose_Thermal(act) Analog_32_action *act; { Anainstlist *A_Gate; diff --git a/log/src/ana/vdiff.c b/log/src/ana/vdiff.c index 76a51167bc217e971cdcd3a6e97435d776748295..2b8190c4ac4d56278faa0125288e05ef4b6feda9 100644 --- a/log/src/ana/vdiff.c +++ b/log/src/ana/vdiff.c @@ -83,7 +83,7 @@ typedef struct ICVdiff { -void Switchfill(log_grec *Inst, int Erase) +static void Switchfill(log_grec *Inst, int Erase) { short LLx, LLy, URx, URy; @@ -106,7 +106,7 @@ void Switchfill(log_grec *Inst, int Erase) (*AnaLogglobals->hook.unhidecursor)(); } -void Limitfill(log_grec *Inst, int Limitflag, int Erase) +static void Limitfill(log_grec *Inst, int Limitflag, int Erase) { short LLx, LLy, URx, URy; @@ -130,7 +130,7 @@ void Limitfill(log_grec *Inst, int Limitflag, int Erase) } -double Pulsemaker(log_grec *Inst, double Ftime, int First) +static double Pulsemaker(log_grec *Inst, double Ftime, int First) { double Result; int Found; @@ -186,7 +186,7 @@ double Pulsemaker(log_grec *Inst, double Ftime, int First) /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -void Ex_Vdiff(Analog_32_action *act) +static void Ex_Vdiff(Analog_32_action *act) { /*Vdifferent*/ double MinI1, MinI2, dI1dV1, dI1dV2, dI2dV1, dI2dV2; @@ -263,7 +263,7 @@ void Ex_Vdiff(Analog_32_action *act) /****************************************************************************/ -void Iin_Vdiff(Analog_32_action *act) +static void Iin_Vdiff(Analog_32_action *act) { /*Vdifferent*/ AnaExt_rec *Pin1Ptr, *Pin2Ptr; @@ -356,7 +356,7 @@ void Iin_Vdiff(Analog_32_action *act) } /*Iin_Vdiff*/ -void GetCnf_Vdiff(ICVdiff *NewIC) +static void GetCnf_Vdiff(ICVdiff *NewIC) { int Found; char Arg[256], Keyword[256]; @@ -522,7 +522,7 @@ void GetCnf_Vdiff(ICVdiff *NewIC) /* Installation Procedure */ /****************************************************************************/ -void initlib_Vdiff(Analog_32_action *act) +static void initlib_Vdiff(Analog_32_action *act) { /*Vdifferent*/ AnaCell_rec *NewCell; @@ -563,7 +563,7 @@ void initlib_Vdiff(Analog_32_action *act) -int Vdiffcheck(log_grec *Inst, long Attrnum) +static int Vdiffcheck(log_grec *Inst, long Attrnum) { int Result; VdiffConst *VdiffVar; @@ -667,7 +667,7 @@ int Vdiffcheck(log_grec *Inst, long Attrnum) } -void Attr_Vdiff(Analog_32_action *act) +static void Attr_Vdiff(Analog_32_action *act) { long Attrnum; @@ -679,7 +679,7 @@ void Attr_Vdiff(Analog_32_action *act) } -void Newgate_Vdiff(Analog_32_action *act) +static void Newgate_Vdiff(Analog_32_action *act) { VdiffConst *VdiffVar; Anainstlist *A_Gate; @@ -727,7 +727,7 @@ void Newgate_Vdiff(Analog_32_action *act) } } -void Copygate_Vdiff(Analog_32_action *act) +static void Copygate_Vdiff(Analog_32_action *act) { VdiffConst *VdiffVar, *Old_Vdiffvar; Anainstlist *A_Gate, *A_Oldgate; @@ -742,7 +742,7 @@ void Copygate_Vdiff(Analog_32_action *act) } -void Dispose_Vdiff(Analog_32_action *act) +static void Dispose_Vdiff(Analog_32_action *act) { VdiffConst *VdiffVar; Anainstlist *A_Gate; @@ -753,7 +753,7 @@ void Dispose_Vdiff(Analog_32_action *act) AnaCapDispose(act->inst); /*7*/ } -void Readgate_Vdiff(Analog_32_action *act) +static void Readgate_Vdiff(Analog_32_action *act) { VdiffConst *VdiffVar; Anainstlist *A_Gate; @@ -785,7 +785,7 @@ void Readgate_Vdiff(Analog_32_action *act) VdiffVar->Reset_Freeze = (*STR1 == 'T' || *STR1 == 't'); } -void Writegate_Vdiff(Analog_32_action *act) +static void Writegate_Vdiff(Analog_32_action *act) { VdiffConst *VdiffVar; Anainstlist *A_Gate; @@ -808,7 +808,7 @@ void Writegate_Vdiff(Analog_32_action *act) -void Reset_Vdiff(Analog_32_action *act) +static void Reset_Vdiff(Analog_32_action *act) { VdiffConst *VdiffVar; Anainstlist *A_Gate; @@ -828,7 +828,7 @@ void Reset_Vdiff(Analog_32_action *act) } } -void Set_Vdiff(Analog_32_action *act) +static void Set_Vdiff(Analog_32_action *act) { VdiffConst *VdiffVar; Anainstlist *A_Gate; @@ -840,7 +840,7 @@ void Set_Vdiff(Analog_32_action *act) VdiffVar->Reset_Freeze = act->inst->attr[N_Freeze - 1].UU.b; } -void Clear_Vdiff(Analog_32_action *act) +static void Clear_Vdiff(Analog_32_action *act) { VdiffConst *VdiffVar; Anainstlist *A_Gate; @@ -856,7 +856,7 @@ void Clear_Vdiff(Analog_32_action *act) VdiffVar->Reset_Freeze = ICptr->ICFreeze; } -void PreUpdate_VDiff(Analog_32_action *act) +static void PreUpdate_VDiff(Analog_32_action *act) { VdiffConst *VDiffVar; Anainstlist *A_Gate; @@ -875,7 +875,7 @@ void PreUpdate_VDiff(Analog_32_action *act) } -void Update_VDiff(Analog_32_action *act) +static void Update_VDiff(Analog_32_action *act) { VdiffConst *VDiffVar; Anainstlist *A_Gate; @@ -891,7 +891,7 @@ void Update_VDiff(Analog_32_action *act) VDiffVar->Timez += AnaDtlast; } -void Display_VDiff(Analog_32_action *act) +static void Display_VDiff(Analog_32_action *act) { VdiffConst *VDiffVar; Anainstlist *A_Gate; @@ -921,7 +921,7 @@ void Display_VDiff(Analog_32_action *act) -void Touch_Vdiff(Analog_32_action *act) +static void Touch_Vdiff(Analog_32_action *act) { log_action_t *WITH; log_grec *WITH1; @@ -937,7 +937,7 @@ void Touch_Vdiff(Analog_32_action *act) } -void Erase_Vdiff(log_grec *Inst) +static void Erase_Vdiff(log_grec *Inst) { VdiffConst *VDiffVar; Anainstlist *A_Gate; @@ -948,7 +948,7 @@ void Erase_Vdiff(log_grec *Inst) Limitfill(Inst, VDiffVar->Limit, true); } -void Refresh_Vdiff(log_grec *Inst) +static void Refresh_Vdiff(log_grec *Inst) { VdiffConst *VDiffVar; Anainstlist *A_Gate; @@ -959,7 +959,7 @@ void Refresh_Vdiff(log_grec *Inst) Limitfill(Inst, VDiffVar->Limit, false); } -void Probe_Vdiff(Analog_32_action *act) +static void Probe_Vdiff(Analog_32_action *act) { Anainstlist *A_Gate; VdiffConst *VdiffVar; diff --git a/log/src/ana/vswitch.c b/log/src/ana/vswitch.c index e0434bf4ee791a4282c985d5ce204d49401d1660..46eb4d1c75e6c21f7bebb1b88f4e6f09c3726a57 100644 --- a/log/src/ana/vswitch.c +++ b/log/src/ana/vswitch.c @@ -80,7 +80,7 @@ typedef struct ICVswitch { -void Vswitchfill(log_grec *Inst, int State, int Erase) +static void Vswitchfill(log_grec *Inst, int State, int Erase) { short LLx, LLy, URx, URy; @@ -103,7 +103,7 @@ void Vswitchfill(log_grec *Inst, int State, int Erase) (*AnaLogglobals->hook.unhidecursor)(); } -void Limitfill(log_grec *Inst, int Limitflag, int Erase) +static void Limitfill(log_grec *Inst, int Limitflag, int Erase) { short LLx, LLy, URx, URy; @@ -127,7 +127,7 @@ void Limitfill(log_grec *Inst, int Limitflag, int Erase) } -double Bistablemaker(log_grec *Inst, double time, int State, int Ex, double OldVideal) +static double Bistablemaker(log_grec *Inst, double time, int State, int Ex, double OldVideal) { double Newtime, Ratio; @@ -153,7 +153,7 @@ double Bistablemaker(log_grec *Inst, double time, int State, int Ex, double OldV } -double Monostablemaker(log_grec *Inst, double time, int State, int Ex, double OldVideal) +static double Monostablemaker(log_grec *Inst, double time, int State, int Ex, double OldVideal) { double Newtime, Ratio; @@ -189,7 +189,7 @@ double Monostablemaker(log_grec *Inst, double time, int State, int Ex, double Ol /* Procedure To Simulate Cell In Algorithm */ /****************************************************************************/ -void Ex_Vswitch(Analog_32_action *act) +static void Ex_Vswitch(Analog_32_action *act) { double MinI1, dI1dV1; AnaExt_rec *Pin1Ptr; @@ -236,7 +236,7 @@ void Ex_Vswitch(Analog_32_action *act) /****************************************************************************/ -void Iin_Vswitch(Analog_32_action *act) +static void Iin_Vswitch(Analog_32_action *act) { AnaExt_rec *Pin1Ptr; double VPin1; @@ -278,7 +278,7 @@ void Iin_Vswitch(Analog_32_action *act) } /*Iin_Vswitch*/ -void GetCnf_Vswitch(ICVswitch *NewIC) +static void GetCnf_Vswitch(ICVswitch *NewIC) { int Found; char Arg[256], Keyword[256]; @@ -400,7 +400,7 @@ void GetCnf_Vswitch(ICVswitch *NewIC) /* Installation Procedure */ /****************************************************************************/ -void initlib_Vswitch(Analog_32_action *act) +static void initlib_Vswitch(Analog_32_action *act) { AnaCell_rec *NewCell; ICVswitch *NewIC; @@ -432,7 +432,7 @@ void initlib_Vswitch(Analog_32_action *act) } /*Vswitch_Initlib*/ -void ResetInit_Vswitch(Analog_32_action *act) +static void ResetInit_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -457,7 +457,7 @@ void ResetInit_Vswitch(Analog_32_action *act) } -int Vswitchcheck(log_grec *Inst, long Attrnum, Analog_32_action *act) +static int Vswitchcheck(log_grec *Inst, long Attrnum, Analog_32_action *act) { int Result; VswitchConst *VswitchVar; @@ -525,7 +525,7 @@ int Vswitchcheck(log_grec *Inst, long Attrnum, Analog_32_action *act) } -void Attr_Vswitch(Analog_32_action *act) +static void Attr_Vswitch(Analog_32_action *act) { long Attrnum; @@ -538,7 +538,7 @@ void Attr_Vswitch(Analog_32_action *act) -void Newgate_Vswitch(Analog_32_action *act) +static void Newgate_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -581,7 +581,7 @@ void Newgate_Vswitch(Analog_32_action *act) } } -void Copygate_Vswitch(Analog_32_action *act) +static void Copygate_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar, *Old_Vswitchvar; Anainstlist *A_Gate, *A_Oldgate; @@ -596,7 +596,7 @@ void Copygate_Vswitch(Analog_32_action *act) } -void Dispose_Vswitch(Analog_32_action *act) +static void Dispose_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -607,7 +607,7 @@ void Dispose_Vswitch(Analog_32_action *act) AnaCapDispose(act->inst); /*7*/ } -void Readgate_Vswitch(Analog_32_action *act) +static void Readgate_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -641,7 +641,7 @@ void Readgate_Vswitch(Analog_32_action *act) VswitchVar->Videal = VswitchVar->OldVideal; } -void Writegate_Vswitch(Analog_32_action *act) +static void Writegate_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -663,7 +663,7 @@ void Writegate_Vswitch(Analog_32_action *act) -void Reset_Vswitch(Analog_32_action *act) +static void Reset_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -685,7 +685,7 @@ void Reset_Vswitch(Analog_32_action *act) } -void Set_Vswitch(Analog_32_action *act) +static void Set_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -700,7 +700,7 @@ void Set_Vswitch(Analog_32_action *act) } -void PreUpdate_Vswitch(Analog_32_action *act) +static void PreUpdate_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -724,7 +724,7 @@ void PreUpdate_Vswitch(Analog_32_action *act) VswitchVar->NewState = VswitchVar->State; } -void Update_Vswitch(Analog_32_action *act) +static void Update_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -741,7 +741,7 @@ void Update_Vswitch(Analog_32_action *act) VswitchVar->Limit = VswitchVar->NewLimit; } -void Display_Vswitch(Analog_32_action *act) +static void Display_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -761,7 +761,7 @@ void Display_Vswitch(Analog_32_action *act) } -void Touch_Vswitch(Analog_32_action *act) +static void Touch_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -790,7 +790,7 @@ void Touch_Vswitch(Analog_32_action *act) AnaChanged = true; } -void Refresh_Vswitch(Analog_32_action *act) +static void Refresh_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -801,7 +801,7 @@ void Refresh_Vswitch(Analog_32_action *act) Limitfill(act->inst, VswitchVar->Limit, false); } -void Erase_Vswitch(Analog_32_action *act) +static void Erase_Vswitch(Analog_32_action *act) { VswitchConst *VswitchVar; Anainstlist *A_Gate; @@ -813,7 +813,7 @@ void Erase_Vswitch(Analog_32_action *act) } -void Probe_Vswitch(Analog_32_action *act) +static void Probe_Vswitch(Analog_32_action *act) { Anainstlist *A_Gate; VswitchConst *VswitchVar; diff --git a/log/src/diggates.c b/log/src/diggates.c index 8b25f306991a5968ebb5a50cad1c49ac8d206692..ee0c1852b0b088b9639328f8dca699e672f17f23 100644 --- a/log/src/diggates.c +++ b/log/src/diggates.c @@ -49,13 +49,13 @@ static m_chpicrec **crtfont; typedef uchar ramarray[ramsize + 1]; -/* variables for Log_mygates_sram8k: */ +/* Local variables for Log_mygates_sram8k: */ struct LOC_Log_mygates_sram8k { log_16_action *act; uchar *ram; } ; -void peek(n, LINK) +static void peek(n, LINK) long n; struct LOC_Log_mygates_sram8k *LINK; { @@ -85,7 +85,7 @@ struct LOC_Log_mygates_sram8k *LINK; WITH2->attr[attr_valdec - 1].UU.U73.i1 = LINK->ram[n]; } -void poke(n, LINK) +static void poke(n, LINK) long n; struct LOC_Log_mygates_sram8k *LINK; { @@ -112,7 +112,7 @@ struct LOC_Log_mygates_sram8k *LINK; WITH2->attr[attr_valhex - 1].changed = true; } -void configchgate(LINK) +static void configchgate(LINK) struct LOC_Log_mygates_sram8k *LINK; { long index_; @@ -398,13 +398,13 @@ typedef struct dispinfo { } dispinfo; -/* variables for Log_mygates_ascdisp: */ +/* Local variables for Log_mygates_ascdisp: */ struct LOC_Log_mygates_ascdisp { log_16_action *act; dispinfo *dip; } ; -void findorg(xorg, yorg, LINK) +static void findorg(xorg, yorg, LINK) long *xorg, *yorg; struct LOC_Log_mygates_ascdisp *LINK; { @@ -421,7 +421,7 @@ struct LOC_Log_mygates_ascdisp *LINK; *yorg = ty - yspc * height_ + 22; } -void xorcursor(LINK) +static void xorcursor(LINK) struct LOC_Log_mygates_ascdisp *LINK; { long xorg, yorg; @@ -439,7 +439,7 @@ struct LOC_Log_mygates_ascdisp *LINK; m_colormode((long)m_normal); } -void erasedisp(LINK) +static void erasedisp(LINK) struct LOC_Log_mygates_ascdisp *LINK; { long xorg, yorg; @@ -456,7 +456,7 @@ struct LOC_Log_mygates_ascdisp *LINK; (*WITH1->hook.unhidecursor)(); } -void refrdisp(LINK) +static void refrdisp(LINK) struct LOC_Log_mygates_ascdisp *LINK; { long x, y, yy, xorg, yorg; @@ -487,7 +487,7 @@ struct LOC_Log_mygates_ascdisp *LINK; (*WITH1->hook.unhidecursor)(); } -void cleardisp(LINK) +static void cleardisp(LINK) struct LOC_Log_mygates_ascdisp *LINK; { log_action_t *WITH; @@ -501,7 +501,7 @@ struct LOC_Log_mygates_ascdisp *LINK; WITH1->chgflag = true; } -void scrollup(LINK) +static void scrollup(LINK) struct LOC_Log_mygates_ascdisp *LINK; { log_action_t *WITH; @@ -515,7 +515,7 @@ struct LOC_Log_mygates_ascdisp *LINK; WITH1->chgflag = true; } -void drawchar(ch, LINK) +static void drawchar(ch, LINK) char ch; struct LOC_Log_mygates_ascdisp *LINK; { diff --git a/log/src/log.c b/log/src/log.c index d9a82bb4cf7f6956eb27bed8fdd05c0dc05e4f41..2c9fef82296fb32ff461b56e652363bc2a99455e 100644 --- a/log/src/log.c +++ b/log/src/log.c @@ -8078,12 +8078,12 @@ log_nrec *oldnode, *n; #undef rtn -/* variables for wantsolder: */ +/* Local variables for wantsolder: */ struct LOC_wantsolder { int hasred, hasgreen, hasyellow, hasblue; } ; -void markcolor(hw, LINK) +static void markcolor(hw, LINK) log_hwrec **hw; struct LOC_wantsolder *LINK; { @@ -8622,7 +8622,7 @@ log_nrec **n, **n2; } -/* variables for checkcombine: */ +/* Local variables for checkcombine: */ struct LOC_checkcombine { cnrec **cnbase; short passcount; @@ -8630,9 +8630,9 @@ struct LOC_checkcombine { log_tool *cursimtype; } ; -void scancn (cnrec *cn, struct LOC_checkcombine *LINK); +static void scancn (cnrec *cn, struct LOC_checkcombine *LINK); -void checknode(n, LINK) +static void checknode(n, LINK) log_nrec *n; struct LOC_checkcombine *LINK; { @@ -8656,12 +8656,12 @@ struct LOC_checkcombine *LINK; LINK->good = false; } -/* variables for scancn: */ +/* Local variables for scancn: */ struct LOC_scancn { struct LOC_checkcombine *LINK; } ; -void scan(log_nrec **n, struct LOC_scancn *LINK) +static void scan(log_nrec **n, struct LOC_scancn *LINK) { cnrec *cn; @@ -8677,7 +8677,7 @@ void scan(log_nrec **n, struct LOC_scancn *LINK) } } -void scancn(cn, LINK) +static void scancn(cn, LINK) cnrec *cn; struct LOC_checkcombine *LINK; { @@ -9919,7 +9919,7 @@ log_gattrrec *attrs; } -void showstick(x1, y1, x2, y2, mode) +static void showstick(x1, y1, x2, y2, mode) long x1, y1, x2, y2, mode; { m_colormode(mode); @@ -9935,12 +9935,6 @@ long x1, y1, x2, y2, mode; } - - - - - - static void yardstick() { long x1, y1, x2, y2; @@ -10189,13 +10183,13 @@ short i; } -/* variables for xorcopybuf: */ +/* Local variables for xorcopybuf: */ struct LOC_xorcopybuf { long *count, max, time; int aborting; } ; -int abortit(LINK) +static int abortit(LINK) struct LOC_xorcopybuf *LINK; { if (LINK->max == LONG_MAX) { @@ -10214,11 +10208,6 @@ struct LOC_xorcopybuf *LINK; } - - - - - /*================= XORCOPYBUF =================*/ /*= =*/ /*= XOR a picture of gates to be pasted. =*/ @@ -10387,7 +10376,7 @@ short x, y; } -void xororiginal() +static void xororiginal() { remcursor(); clipon(); @@ -10717,7 +10706,7 @@ static void OLDmovecommand() } -int near_(x, y) +static int near_(x, y) short x, y; { return (abs(x - y) < 2); @@ -11200,7 +11189,7 @@ short dx, dy; } -void xorrect(x1, y1, x2, y2) +static void xorrect(x1, y1, x2, y2) short x1, y1, x2, y2; { short y3; @@ -11349,7 +11338,7 @@ static void openhoriz() } -void xorrect_(x1, y1, x2, y2) +static void xorrect_(x1, y1, x2, y2) short x1, y1, x2, y2; { short x3; @@ -11494,7 +11483,7 @@ static void openvert() } -void xorrect__(x1, y1, x2, y2) +static void xorrect__(x1, y1, x2, y2) short x1, y1, x2, y2; { short y3; @@ -11687,7 +11676,7 @@ static void closehoriz() } -void xorrect___(x1, y1, x2, y2) +static void xorrect___(x1, y1, x2, y2) short x1, y1, x2, y2; { short x3; @@ -12063,13 +12052,13 @@ char *t_; #define maxvars 16 -/* variables for readlibrary_at: */ +/* Local variables for readlibrary_at: */ struct LOC_readlibrary_at { short p, f; long dist; } ; -void readint(LINK) +static void readint(LINK) struct LOC_readlibrary_at *LINK; { if (LINK->p >= 64) { @@ -12078,7 +12067,7 @@ struct LOC_readlibrary_at *LINK; } } -long readnum(LINK) +static long readnum(LINK) struct LOC_readlibrary_at *LINK; { long Result; @@ -12093,7 +12082,7 @@ struct LOC_readlibrary_at *LINK; return Result; } -long readcoord(LINK) +static long readcoord(LINK) struct LOC_readlibrary_at *LINK; { long i; @@ -12107,7 +12096,7 @@ struct LOC_readlibrary_at *LINK; return (i - 256); } -void bound(k, x, y, LINK) +static void bound(k, x, y, LINK) log_krec *k; long x, y; struct LOC_readlibrary_at *LINK; @@ -12122,7 +12111,7 @@ struct LOC_readlibrary_at *LINK; k->bby2 = y; } -long uncompress(i, LINK) +static long uncompress(i, LINK) long i; struct LOC_readlibrary_at *LINK; { @@ -12135,7 +12124,7 @@ struct LOC_readlibrary_at *LINK; } -descrec *readdesc(rec) +static descrec *readdesc(rec) char *rec; { unsigned short i,j1,j2,s1,s2; @@ -12162,7 +12151,7 @@ char *rec; } -log_pnumrec readpnum(rec) +static log_pnumrec readpnum(rec) char *rec; { static log_pnumrec p; @@ -13003,13 +12992,13 @@ char *name_; #define huge_ 30000 -/* variables for listlibrary: */ +/* Local variables for listlibrary: */ struct LOC_listlibrary { short maxi, maxj; short karr[maxmaxi + 1][maxmaxj]; } ; -short kfunc(i, j, LINK) +static short kfunc(i, j, LINK) short *i, *j; struct LOC_listlibrary *LINK; { @@ -13588,7 +13577,7 @@ char *s; } -/* variables for editattrs: */ +/* Local variables for editattrs: */ struct LOC_editattrs { log_gattrrec *gattr; short numattrs; @@ -13602,7 +13591,7 @@ struct LOC_editattrs { short acty, p, ybase; } ; -void drawlabelline(i, LINK) +static void drawlabelline(i, LINK) long i; struct LOC_editattrs *LINK; { @@ -13622,7 +13611,7 @@ struct LOC_editattrs *LINK; nc_putStr(0, (int)i, l1->s); } -void eraselabelline(i, LINK) +static void eraselabelline(i, LINK) long i; struct LOC_editattrs *LINK; { @@ -13631,7 +13620,7 @@ struct LOC_editattrs *LINK; putchar('\t'); } -void drawlabel(LINK) +static void drawlabel(LINK) struct LOC_editattrs *LINK; { short i, FORLIM; @@ -13643,7 +13632,7 @@ struct LOC_editattrs *LINK; drawlabelline((long)i, LINK); } -void drawvalue(i, highlight, LINK) +static void drawvalue(i, highlight, LINK) short i; int highlight; struct LOC_editattrs *LINK; @@ -13734,7 +13723,7 @@ struct LOC_editattrs *LINK; LINK->gattr[i - 1].changed = false; } -void maskvalues(LINK) +static void maskvalues(LINK) struct LOC_editattrs *LINK; { short i, FORLIM; @@ -13756,7 +13745,7 @@ struct LOC_editattrs *LINK; } } -double cleanup(r, r1, LINK) +static double cleanup(r, r1, LINK) double r, r1; struct LOC_editattrs *LINK; { @@ -13779,7 +13768,7 @@ struct LOC_editattrs *LINK; return r; } -double scrnincr(p, LINK) +static double scrnincr(p, LINK) short p; struct LOC_editattrs *LINK; { @@ -13819,7 +13808,7 @@ struct LOC_editattrs *LINK; return r1; } -void callconfig(proc, LINK) +static void callconfig(proc, LINK) void (*proc) (); struct LOC_editattrs *LINK; { @@ -13833,7 +13822,7 @@ struct LOC_editattrs *LINK; (*proc)(); } -int tryconfig(LINK) +static int tryconfig(LINK) struct LOC_editattrs *LINK; { gg.actflag = true; @@ -13842,9 +13831,6 @@ struct LOC_editattrs *LINK; } - - - static void editattrs(gattr_, numattrs_, kattr_, lbl_, name_, proc, chproc_, relproc, attrstamp) log_gattrrec *gattr_; @@ -14477,14 +14463,14 @@ short i; } -/* variables for setattr: */ +/* Local variables for setattr: */ struct LOC_setattr { log_gattrrec *gattr; log_kattrrec *kattr; short p; } ; -int tryconfig_(LINK) +static int tryconfig_(LINK) struct LOC_setattr *LINK; { gg.actflag = true; @@ -14495,10 +14481,6 @@ struct LOC_setattr *LINK; return (gg.actflag); } - - - - static int setattr(gattr_, kattr_, p_, buf) log_gattrrec *gattr_; log_kattrrec *kattr_; @@ -15587,12 +15569,12 @@ static void addbox() static void initcolors (); -/* variables for doshellescape: */ +/* Local variables for doshellescape: */ struct LOC_doshellescape { long oldc; } ; -void recov(LINK) +static void recov(LINK) struct LOC_doshellescape *LINK; { nk_settransarray(nk_ktsupplied, &curkeytrans); @@ -15913,7 +15895,7 @@ static void haproc3() typedef short ararr[log_million]; -/* variables for historycommand: */ +/* Local variables for historycommand: */ struct LOC_historycommand { int rflag, oldtrigger, oldreset, oldonoff, oldfast; short oldgridmode, oldgridwhich, gridx1, gridy1, gridx2, gridy2, valuey, @@ -15925,7 +15907,7 @@ struct LOC_historycommand { long stamp; } ; -double valueattime(hn, time, LINK) +static double valueattime(hn, time, LINK) log_hnrec *hn; double time; struct LOC_historycommand *LINK; @@ -15949,7 +15931,7 @@ struct LOC_historycommand *LINK; } } -log_hnrec *findtrace(x, y, LINK) +static log_hnrec *findtrace(x, y, LINK) short x, y; struct LOC_historycommand *LINK; { @@ -15992,7 +15974,7 @@ struct LOC_historycommand *LINK; #undef tolerance -void refrtrigger(LINK) +static void refrtrigger(LINK) struct LOC_historycommand *LINK; { if (gg.histactive == LINK->oldtrigger || LINK->whichmenu != 0) @@ -16007,7 +15989,7 @@ struct LOC_historycommand *LINK; LINK->oldtrigger = gg.histactive; } -void refrreset(LINK) +static void refrreset(LINK) struct LOC_historycommand *LINK; { if (gg.resetflag == LINK->oldreset || LINK->whichmenu != 0) @@ -16022,7 +16004,7 @@ struct LOC_historycommand *LINK; LINK->oldreset = gg.resetflag; } -void refronoff(LINK) +static void refronoff(LINK) struct LOC_historycommand *LINK; { if (gg.pwrflag == LINK->oldonoff || LINK->whichmenu != 0) @@ -16039,7 +16021,7 @@ struct LOC_historycommand *LINK; LINK->oldonoff = gg.pwrflag; } -void refrgridmode(LINK) +static void refrgridmode(LINK) struct LOC_historycommand *LINK; { if (histgridmode != LINK->oldgridmode && LINK->whichmenu == 0) { @@ -16090,7 +16072,7 @@ struct LOC_historycommand *LINK; LINK->oldgridwhich = histgridwhich; } -void refrfast(LINK) +static void refrfast(LINK) struct LOC_historycommand *LINK; { int fast; @@ -16108,7 +16090,7 @@ struct LOC_historycommand *LINK; LINK->oldfast = fast; } -void drawsigname(hn, opt, LINK) +static void drawsigname(hn, opt, LINK) log_hnrec *hn; short opt; struct LOC_historycommand *LINK; @@ -16129,7 +16111,7 @@ struct LOC_historycommand *LINK; m_colormode((long)m_normal); } -/* variables for drawhistory: */ +/* Local variables for drawhistory: */ struct LOC_drawhistory { struct LOC_historycommand *LINK; short x, y, oldx; @@ -16137,7 +16119,7 @@ struct LOC_drawhistory { short *ar; } ; -void drawtrace(hn, i, LINK) +static void drawtrace(hn, i, LINK) log_hnrec *hn; short i; struct LOC_drawhistory *LINK; @@ -16155,7 +16137,7 @@ struct LOC_drawhistory *LINK; LINK->ar[i - 1] = LINK->y; } -void drawhistory(LINK) +static void drawhistory(LINK) struct LOC_historycommand *LINK; { struct LOC_drawhistory V; @@ -16207,7 +16189,7 @@ struct LOC_historycommand *LINK; Free(V.ar); } -void setgridwhich(hn, LINK) +static void setgridwhich(hn, LINK) log_hnrec *hn; struct LOC_historycommand *LINK; { @@ -16222,7 +16204,7 @@ struct LOC_historycommand *LINK; drawsigname(histgridhn, 0, LINK); } -void nextgridwhich(LINK) +static void nextgridwhich(LINK) struct LOC_historycommand *LINK; { log_hnrec *nexthn; @@ -16255,7 +16237,7 @@ struct LOC_historycommand *LINK; drawsigname(histgridhn, 0, LINK); } -void nextgridmode(LINK) +static void nextgridmode(LINK) struct LOC_historycommand *LINK; { if (histgridmode == 0) @@ -16264,7 +16246,7 @@ struct LOC_historycommand *LINK; histgridmode--; } -void confighistmode(LINK) +static void confighistmode(LINK) struct LOC_historycommand *LINK; { int flag; @@ -16288,7 +16270,7 @@ struct LOC_historycommand *LINK; } } -void passetc(LINK) +static void passetc(LINK) struct LOC_historycommand *LINK; { m_noclip(); @@ -16300,7 +16282,7 @@ struct LOC_historycommand *LINK; pen(); } -void fastmode(LINK) +static void fastmode(LINK) struct LOC_historycommand *LINK; { long t0; @@ -16313,7 +16295,7 @@ struct LOC_historycommand *LINK; gg.fastspeed = gg.fastmax; } -void dumpcmd(LINK) +static void dumpcmd(LINK) struct LOC_historycommand *LINK; { char fn[256]; @@ -16404,7 +16386,7 @@ struct LOC_historycommand *LINK; LINK->rflag = true; } -void refraxis(pos, name, expr, flag, LINK) +static void refraxis(pos, name, expr, flag, LINK) long pos; char *name, *expr; int flag; @@ -16423,14 +16405,14 @@ struct LOC_historycommand *LINK; m_noclip(); } -void refraxes(LINK) +static void refraxes(LINK) struct LOC_historycommand *LINK; { refraxis(xaxispos, "X-axis", LINK->xexpr, LINK->xactive, LINK); refraxis(yaxispos, "Y-axis", LINK->yexpr, LINK->yactive, LINK); } -void setaxis(expr, LINK) +static void setaxis(expr, LINK) char *expr; struct LOC_historycommand *LINK; { @@ -16451,7 +16433,7 @@ struct LOC_historycommand *LINK; refraxes(LINK); } -void getexpr(LINK) +static void getexpr(LINK) struct LOC_historycommand *LINK; { char expr[256]; @@ -16468,7 +16450,7 @@ struct LOC_historycommand *LINK; setaxis(expr, LINK); } -void plotcmd(LINK) +static void plotcmd(LINK) struct LOC_historycommand *LINK; { char STR1[256]; @@ -16482,7 +16464,7 @@ struct LOC_historycommand *LINK; LINK->rflag = true; } -void measurecmd(LINK) +static void measurecmd(LINK) struct LOC_historycommand *LINK; { char STR1[81]; @@ -17096,7 +17078,7 @@ static void historycommand() #undef nummenus -/* variables for savepage: */ +/* Local variables for savepage: */ struct LOC_savepage { log_hwrec *firsthwire; log_vwrec *firstvwire; @@ -17104,7 +17086,7 @@ struct LOC_savepage { short numhw, maxunat; } ; -short countnode(n, LINK) +static short countnode(n, LINK) log_nrec *n; struct LOC_savepage *LINK; { @@ -17120,7 +17102,7 @@ struct LOC_savepage *LINK; return i; } -short counthw(hw, LINK) +static short counthw(hw, LINK) log_hwrec *hw; struct LOC_savepage *LINK; { @@ -17138,7 +17120,7 @@ struct LOC_savepage *LINK; return i; } -short countvw(vw, LINK) +static short countvw(vw, LINK) log_vwrec *vw; struct LOC_savepage *LINK; { @@ -17156,7 +17138,7 @@ struct LOC_savepage *LINK; return (i + LINK->numhw); } -int eqattr(ka, ga, LINK) +static int eqattr(ka, ga, LINK) log_kattrrec *ka; log_gattrrec *ga; struct LOC_savepage *LINK; @@ -17195,7 +17177,7 @@ struct LOC_savepage *LINK; return Result; } -na_strlist_t *attrname(i, lbl, LINK) +static na_strlist_t *attrname(i, lbl, LINK) short i; na_strlist_t *lbl; struct LOC_savepage *LINK; @@ -17213,7 +17195,7 @@ struct LOC_savepage *LINK; return l1; } -short countattrs(gattr, numattrs, kattr, lbl, LINK) +static short countattrs(gattr, numattrs, kattr, lbl, LINK) log_gattrrec *gattr; short numattrs; log_kattrrec *kattr; @@ -17236,7 +17218,7 @@ struct LOC_savepage *LINK; return j; } -void writeattrs(f, gattr, numattrs, kattr, lbl, LINK) +static void writeattrs(f, gattr, numattrs, kattr, lbl, LINK) FILE **f; log_gattrrec *gattr; short numattrs; @@ -17294,13 +17276,6 @@ struct LOC_savepage *LINK; } - - - - - - - static void savepage(pgnum, filename_) short pgnum; char *filename_; @@ -18043,7 +18018,7 @@ typedef wirerec wirearray[log_million]; typedef long intarray[log_million]; -/* variables for loadpage: */ +/* Local variables for loadpage: */ struct LOC_loadpage { char *reason; FILE *f; @@ -18052,7 +18027,7 @@ struct LOC_loadpage { log_nrec **np; } ; -void loadfail(msg, LINK) +static void loadfail(msg, LINK) char *msg; struct LOC_loadpage *LINK; { @@ -18066,7 +18041,7 @@ struct LOC_loadpage *LINK; _Escape(1); } -log_nrec *countnode_(i, LINK) +static log_nrec *countnode_(i, LINK) short i; struct LOC_loadpage *LINK; { @@ -18082,7 +18057,7 @@ struct LOC_loadpage *LINK; -/* variables for initialize: */ +/* Local variables for initialize: */ struct LOC_initialize { short j; na_strlist_t *loadgates, *logmenu; @@ -18091,7 +18066,7 @@ struct LOC_initialize { } ; -int tryfindfile(name, path, LINK) +static int tryfindfile(name, path, LINK) char *name; char *path; struct LOC_initialize *LINK; @@ -18135,7 +18110,7 @@ struct LOC_initialize *LINK; return Result; } -int locatefile(name, LINK) +static int locatefile(name, LINK) char *name; struct LOC_initialize *LINK; { @@ -18736,14 +18711,14 @@ static void loadcommand() typedef long intarray_[log_million]; -/* variables for readlgf: */ +/* Local variables for readlgf: */ struct LOC_readlgf { char *reason; FILE **f; long *ip; } ; -void loadfail_(msg, LINK) +static void loadfail_(msg, LINK) char *msg; struct LOC_readlgf *LINK; { @@ -18758,9 +18733,6 @@ struct LOC_readlgf *LINK; } - - - static void readlgf(f, reason_) FILE **f; char *reason_; @@ -18968,12 +18940,12 @@ char *reason_; } -/* variables for readpage: */ +/* Local variables for readpage: */ struct LOC_readpage { char *reason; } ; -void loadfail__(msg, LINK) +static void loadfail__(msg, LINK) char *msg; struct LOC_readpage *LINK; { @@ -19122,13 +19094,13 @@ static void makegatecmd() #define maxtools 23 -/* variables for toolcommand: */ +/* Local variables for toolcommand: */ struct LOC_toolcommand { log_tool *ta[maxtools + 1]; int refrflag, wasselected; } ; -void describe(i, LINK) +static void describe(i, LINK) long i; struct LOC_toolcommand *LINK; { @@ -19143,7 +19115,7 @@ struct LOC_toolcommand *LINK; printf("%c\n", chrgreen); } -long which(LINK) +static long which(LINK) struct LOC_toolcommand *LINK; { if (gg.t.near_ && gg.t.ay >= 1 && gg.t.ay <= maxtools) @@ -19152,7 +19124,7 @@ struct LOC_toolcommand *LINK; return -1; } -void selecttool(name, LINK) +static void selecttool(name, LINK) char *name; struct LOC_toolcommand *LINK; { @@ -19170,10 +19142,6 @@ struct LOC_toolcommand *LINK; LINK->wasselected = true; } - - - - static void toolcommand() { struct LOC_toolcommand V; @@ -19267,7 +19235,7 @@ static void toolcommand() #define whichmin (-2) -log_tool *counttool(i) +static log_tool *counttool(i) long i; { log_tool *tp; @@ -19283,7 +19251,7 @@ long i; return tp; } -char *onoff(Result, b) +static char *onoff(Result, b) char *Result; int b; { @@ -19293,7 +19261,7 @@ int b; return strcpy(Result, "OFF"); } -void status_log() +static void status_log() { timerec time; daterec date; @@ -19376,7 +19344,7 @@ void status_log() } -void status_mem() +static void status_mem() { long i, j; log_grec *g; @@ -19492,7 +19460,7 @@ void status_mem() printf("Total signal names: %12ld\n", j); } -void status_macro(int v) +static void status_macro(int v) { macrorec *mp; char ch; @@ -19728,13 +19696,6 @@ char *name_; #define cols 4 - - - - - - - /*================== POPUPMENU =================*/ /*= =*/ /*= Process a pop-up menu selection. Menu =*/ @@ -19844,9 +19805,6 @@ short num; #undef cols - - - static short reducecolor8(c) short c; { @@ -20161,7 +20119,7 @@ const cnamearray cnames = { }; -long getcolorname(w_) +static long getcolorname(w_) char *w_; { long Result; @@ -20661,7 +20619,7 @@ static void initmacros() } -void newmenu(menu) +static void newmenu(menu) logmenurec **menu; { short i; @@ -20840,7 +20798,7 @@ static void inithooks() #define rtn "INITIALIZE" #if 0 -/* variables for initialize: */ +/* Local variables for initialize: */ struct LOC_initialize { short j; na_strlist_t *loadgates, *logmenu; @@ -20849,7 +20807,7 @@ struct LOC_initialize { } ; #endif -void beginfatal(LINK) +static void beginfatal(LINK) struct LOC_initialize *LINK; { if (P_escapecode == -20) @@ -20859,14 +20817,14 @@ struct LOC_initialize *LINK; printf("\n\n%c", chryellow); } -void endfatal(LINK) +static void endfatal(LINK) struct LOC_initialize *LINK; { printf("%c Program aborted.\n", chrgreen); _Escape(0); } -void addgatesfile(fn_, LINK) +static void addgatesfile(fn_, LINK) char *fn_; struct LOC_initialize *LINK; { @@ -20881,7 +20839,7 @@ struct LOC_initialize *LINK; l1 = strlist_append(&gatefilenames, fn); } -void sethomedirname(dir_, LINK) +static void sethomedirname(dir_, LINK) char *dir_; struct LOC_initialize *LINK; { @@ -20900,7 +20858,7 @@ struct LOC_initialize *LINK; strcat(gg.homedirname, "/"); } -void removepath(name) +static void removepath(name) char *name; { char *cp = (char *)strrchr(name, '/'); @@ -20908,7 +20866,7 @@ char *name; strcpy_overlap(name, cp + 1); } -void readcnf(fn_, LINK) +static void readcnf(fn_, LINK) char *fn_; struct LOC_initialize *LINK; { @@ -22130,12 +22088,4 @@ int main(int argc, char * argv[]) } - - - - - - - - /* End. */ diff --git a/log/src/loged.c b/log/src/loged.c index a2679d141c337e649b7a08afa8f9664f0d798c5b..9dbfcfc8d25011c435651939e735775261b1806c 100644 --- a/log/src/loged.c +++ b/log/src/loged.c @@ -98,7 +98,7 @@ char *my_strdup(char *); #undef strdup #define strdup my_strdup #define newci_findprocedure2 findprocedure -extern boolean findprocedure PP((Char *name, void (**start)())); +extern int findprocedure (char *name, void (**start)()); extern short getshortsw(char *); @@ -137,9 +137,9 @@ static short msg_name, msg_veckindmenu, msg_veckindname, /*0 .. 255*/ /*-128 .. 127*/ -typedef Char gatename[8]; +typedef char gatename[8]; -typedef Char pac4[4]; +typedef char pac4[4]; typedef struct descrec { long ptr; @@ -153,7 +153,7 @@ typedef struct ovectorrec { } ovectorrec; typedef struct vectorrec { - Char kind; + char kind; schar col, x1, y1; union { struct { @@ -164,7 +164,7 @@ typedef struct vectorrec { } U98; struct { uchar tsize, torg; - Char *sp; + char *sp; } U116; } UU; } vectorrec; @@ -212,7 +212,7 @@ typedef struct oldrec { } oldrec; -typedef Char lblarray[log_million]; +typedef char lblarray[log_million]; typedef struct _REC_pin_ { schar x, y; @@ -223,9 +223,9 @@ typedef struct _REC_pinoff { } _REC_pinoff; typedef struct krec { - Char name[9]; + char name[9]; uchar *proc; - Char *lbl; + char *lbl; long proclen, lbllen; schar xx1, yy1, xx2, yy2; uchar numpins, numpnums, group, simtype; @@ -238,7 +238,7 @@ typedef struct krec { uchar pinsim[maxpins]; uchar pincon[maxpins]; short pinnum[maxpnums]; - na_strlist *pinnames; + na_strlist_t *pinnames; vectorrec *vector; short numvects, allocvects; long address; /*only load/save*/ @@ -457,8 +457,8 @@ typedef struct krec { F Real with units appended, but no scaling applied. I Integer. "Precision" is ignored. H Hex integer. "Precision" is ignored. - B Boolean. Either True or False. Precision is ignored. - C Character string. Precision is the maximum length of + B int. Either True or False. Precision is ignored. + C character string. Precision is the maximum length of the string, default 255. A Dynamically-allocated string. Functionally the same as "C", but the precision is ignored. @@ -506,7 +506,7 @@ static short defgridspc = 6; static short defmargin = 20; static short numright = 30; static uchar torgkind = 4; /* default = center,center */ -static boolean show_preview = false; /* toggle: false=grid, true=small */ +static int show_preview = false; /* toggle: false=grid, true=small */ static m_chpicrec *chair; static m_tablet_info pen; @@ -524,14 +524,14 @@ static short gridxmin, gridxmax, gridymin, gridymax, gridmax, gridscale; static short gridtop, gridlimit; static long colortrans[7]; -static log_action gg; +static log_action_t gg; static krec kind, *kbase, *curkind, *shadowkind; static long newsimtype; -static Char veckind; +static char veckind; static long curcolor, regionstyle; -static Char command[256], argument[256], filename[256]; -static boolean onescreen, fullcolor; /*updated 7/12/88*/ -static boolean firsttime, menuflag, refrkind, needrefr, firsthelp, +static char command[256], argument[256], filename[256]; +static int onescreen, fullcolor; /*updated 7/12/88*/ +static int firsttime, menuflag, refrkind, needrefr, firsthelp, savedflag, errorflag, exitflag; static pnumrec pn; @@ -711,9 +711,9 @@ static void initscreen() m_init_graphics(); m_upside_down(); onescreen = nc_alphashared(); - m_makechar((Anyptr *)(&chair), 11L, 11L, -5L, -5L, 0L, 0L); - m_changechar((Anyptr)chair, 1L, 5L, 0L, 5L, 11L); - m_changechar((Anyptr)chair, 1L, 0L, 5L, 11L, 5L); + m_makechar((void * *)(&chair), 11L, 11L, -5L, -5L, 0L, 0L); + m_changechar((void *)chair, 1L, 5L, 0L, 5L, 11L); + m_changechar((void *)chair, 1L, 0L, 5L, 11L, 5L); m_choosecursor(1L); m_setlinestyle(1L, 0x8888L); m_setlinestyle(2L, 0xaaaaL); @@ -741,10 +741,10 @@ static void initscreen() } -static boolean comparestr(s_, t_) -Char *s_, *t_; +static int comparestr(s_, t_) +char *s_, *t_; { - Char s[256], t[256]; + char s[256], t[256]; strcpy(s, s_); strcpy(t, t_); @@ -755,9 +755,9 @@ Char *s_, *t_; } -static boolean comparegroup(gn, g) +static int comparegroup(gn, g) short gn; -Char *g; +char *g; { if (*g == '\0') return true; @@ -767,11 +767,11 @@ Char *g; static void wildcards(s, g, verify) -Char *s, *g; -boolean *verify; +char *s, *g; +int *verify; { long i, gi; - Char STR1[256]; + char STR1[256]; strupper(s, s); *verify = false; @@ -819,10 +819,10 @@ boolean *verify; -static Char readyn(s) -Char *s; +static char readyn(s) +char *s; { - Char ch; + char ch; do { ch = toupper(nk_getkey()); @@ -841,11 +841,11 @@ short x, y; m_colormode((long)m_xor); m_color((long)white); m_move(chx, chy); - m_drawchar((Anyptr)chair); + m_drawchar((void *)chair); chx = x; chy = y; m_move(chx, chy); - m_drawchar((Anyptr)chair); + m_drawchar((void *)chair); m_colormode((long)m_normal); } @@ -859,7 +859,7 @@ static void nocrosshair() static void drawnum(x, y, n) short x, y, n; { - Char STR1[256]; + char STR1[256]; sprintf(STR1, "%d", n); m_drawstr((long)x, (long)y, NULL, STR1); @@ -869,7 +869,7 @@ short x, y, n; static void drawnum2(x, y, n) short x, y, n; { - Char STR1[256]; + char STR1[256]; sprintf(STR1, "%2d", n); m_drawstr((long)x, (long)y, NULL, STR1); @@ -879,7 +879,7 @@ short x, y, n; static void drawnum3(x, y, n) short x, y, n; { - Char STR1[256]; + char STR1[256]; sprintf(STR1, "%3d", n); m_drawstr((long)x, (long)y, NULL, STR1); @@ -992,8 +992,8 @@ long sc; -static boolean before(n1, n2) -Char *n1, *n2; +static int before(n1, n2) +char *n1, *n2; { long i, j; @@ -1018,11 +1018,11 @@ Char *n1, *n2; -static boolean addkind(n_) -Char *n_; +static int addkind(n_) +char *n_; { - boolean Result; - Char n[9]; + int Result; + char n[9]; krec *k, *k1; strncpy(n, n_, 8); @@ -1077,7 +1077,7 @@ long len; while (newlen < len) newlen *= 2; newproc = (uchar *)Malloc(newlen); - memmove((Anyptr)newproc, (Anyptr)k->proc, k->proclen); + memmove((void *)newproc, (void *)k->proc, k->proclen); Free(k->proc); k->proclen = newlen; k->proc = newproc; @@ -1089,13 +1089,13 @@ krec *k; long len; { long newlen; - Char *newlbl; + char *newlbl; if (k->lbllen == 0) { k->lbllen = 32; while (k->lbllen < len) k->lbllen *= 2; - k->lbl = (Char *)Malloc(k->lbllen); + k->lbl = (char *)Malloc(k->lbllen); return; } if (k->lbllen >= len) @@ -1103,8 +1103,8 @@ long len; newlen = k->lbllen; while (newlen < len) newlen *= 2; - newlbl = (Char *)Malloc(newlen); - memmove((Anyptr)newlbl, (Anyptr)k->lbl, k->lbllen); + newlbl = (char *)Malloc(newlen); + memmove((void *)newlbl, (void *)k->lbl, k->lbllen); Free(k->lbl); k->lbllen = newlen; k->lbl = newlbl; @@ -1131,7 +1131,7 @@ long len; while (newlen < len) newlen *= 2; newvects = (vectorrec *)Malloc(newlen * sizeof(vectorrec)); - memmove((Anyptr)newvects, (Anyptr)k->vector, + memmove((void *)newvects, (void *)k->vector, k->allocvects * sizeof(vectorrec)); Free(k->vector); k->allocvects = newlen; @@ -1150,7 +1150,7 @@ static void flushcurkind() static void makekind(n) -Char *n; +char *n; { flushcurkind(); if (!addkind(n)) { @@ -1180,7 +1180,7 @@ Char *n; static void wrmsg(s) -Char *s; +char *s; { nc_gotoXY(0, (int)(scrheight - 5)); printf("%s\007", s); @@ -1223,7 +1223,7 @@ long i; } -/* Local variables for wshapes: */ +/* static variables for wshapes: */ struct LOC_wshapes { FILE *f; short p, r; @@ -1266,20 +1266,20 @@ struct LOC_wshapes *LINK; static void wshapes(s_) -Char *s_; +char *s_; { struct LOC_wshapes V; - Char s[256], s1[256]; + char s[256], s1[256]; krec *k; short ng, ii; int i, j; - na_strlist *l1; - boolean success; + na_strlist_t *l1; + int success; short FORLIM; vectorrec *WITH; short FORLIM1; - Char STR1[256]; - Char STR3[256]; + char STR1[256]; + char STR3[256]; descrec *WITH1; strcpy(s, s_); @@ -1702,17 +1702,17 @@ oldrec *o; static void roshapes(s_, gname_) -Char *s_, *gname_; +char *s_, *gname_; { - Char s[256], gname[256], ggroup[256]; + char s[256], gname[256], ggroup[256]; FILE *f; - Char name[9]; + char name[9]; krec *k1; - Char ch; - boolean verify, useit; - Char STR1[256]; - Char STR3[256]; - Char *TEMP; + char ch; + int verify, useit; + char STR1[256]; + char STR3[256]; + char *TEMP; FILEBUFNC(f,oldrec); strcpy(s, s_); @@ -1819,7 +1819,7 @@ Char *s_, *gname_; typedef krec *loadindex[10000]; -/* Local variables for rshapes: */ +/* static variables for rshapes: */ struct LOC_rshapes { FILE *f; long j, p; @@ -1852,10 +1852,10 @@ struct LOC_rshapes *LINK; long Result; if (LINK->vects[LINK->j] < 128) { -/* p2c: loged.text, line 1607: Note: Character >= 128 encountered [281] */ +/* p2c: loged.text, line 1607: Note: character >= 128 encountered [281] */ Result = LINK->vects[LINK->j]; } else if (LINK->vects[LINK->j] == 128) { -/* p2c: loged.text, line 1609: Note: Character >= 128 encountered [281] */ +/* p2c: loged.text, line 1609: Note: character >= 128 encountered [281] */ Result = 0; } else Result = LINK->vects[LINK->j] - 256; @@ -1868,8 +1868,8 @@ krec *kind; struct LOC_rshapes *LINK; { long i, j, num; - na_strlist *l1; - Char buf[256]; + na_strlist_t *l1; + char buf[256]; num = 0; i = 1; @@ -1892,34 +1892,34 @@ struct LOC_rshapes *LINK; j = i; while (kind->lbl[j - 1] != '\0') j++; - memmove((Anyptr)kind->lbl, (Anyptr)(&kind->lbl[i - 1]), j - i + 1); + memmove((void *)kind->lbl, (void *)(&kind->lbl[i - 1]), j - i + 1); } -static boolean rshapes(s_, gname_) -Char *s_, *gname_; +static int rshapes(s_, gname_) +char *s_, *gname_; { struct LOC_rshapes V; - boolean Result; - Char s[256], gname[256]; + int Result; + char s[256], gname[256]; krec **li; - Char s0[256], s1[256], ggroup[256], tbuf[256]; - Char name[9]; + char s0[256], s1[256], ggroup[256], tbuf[256]; + char name[9]; krec *k, *k0, *k1; long i, j0, j1, curcol, r, gr; short ng; - Char ch; - boolean verify, useit, loadany, flag; - Char STR1[256]; - Char STR2[256]; - Char STR3[32]; + char ch; + int verify, useit, loadany, flag; + char STR1[256]; + char STR2[256]; + char STR3[32]; long FORLIM; - Char STR4[40]; - Char *TEMP; + char STR4[40]; + char *TEMP; descrec *WITH; vectorrec *WITH2; - Char STR5[256]; + char STR5[256]; strcpy(s, s_); strcpy(gname, gname_); @@ -2025,9 +2025,9 @@ Char *s_, *gname_; gr = 0; for (V.j = 1; V.j <= 8; V.j++) { if ((name[V.j - 1] & (~127)) != 0) { -/* p2c: loged.text, line 1723: Note: Character >= 128 encountered [281] */ +/* p2c: loged.text, line 1723: Note: character >= 128 encountered [281] */ gr = V.j; - name[V.j - 1] = (Char)((uchar)name[V.j - 1] - 128); + name[V.j - 1] = (char)((uchar)name[V.j - 1] - 128); } } strcpy(name, strrtrim(strcpy(STR2, name))); @@ -2245,7 +2245,7 @@ Char *s_, *gname_; /* p2c: loged.text, line 1952: * Note: Modification of string length may translate incorrectly [146] */ for (j0 = 0; j0 < j1; j0++) - tbuf[j0] = (Char)readnum(&V); + tbuf[j0] = (char)readnum(&V); WITH2->UU.U116.sp = strdup(tbuf); break; @@ -2368,7 +2368,7 @@ short x, y; static void roundrect(x1, y1, x2, y2, r, col, shadow) long x1, y1, x2, y2, r, col; -boolean shadow; +int shadow; { if (labs(x2 - x1) < r * 2 || labs(y2 - y1) < r * 2) { m_color(col); @@ -2389,7 +2389,7 @@ vectorrec *v; { long xarr[4], yarr[4]; long xx, yy, len; - Char STR1[256]; + char STR1[256]; switch (v->kind) { @@ -2563,7 +2563,7 @@ vectorrec *v; { long xarr[4], yarr[4]; long xx, yy, len; - Char STR1[256]; + char STR1[256]; switch (v->kind) { @@ -2698,12 +2698,12 @@ short x, y, n; } -static Char *getpinname(Result, num) -Char *Result; +static char *getpinname(Result, num) +char *Result; long num; { - na_strlist *l1; - Char name[256]; + na_strlist_t *l1; + char name[256]; sprintf(name, "%ld", num); l1 = kind.pinnames; @@ -2720,11 +2720,11 @@ long num; /* it can place the pin number north or south in addition to east or west. */ static void drpin(x, y, n, visible) short x,y,n; -boolean visible; +int visible; { typedef enum {inside,north,east,south,west} placement; placement p = inside; - Char STR1[256]; + char STR1[256]; long hw = m_strwidth(NULL, getpinname(STR1, (long)n)) / 2; /* use the grab rectangle to determine which edge this pin is attached to. */ @@ -2764,7 +2764,7 @@ typedef enum {inside,north,east,south,west} placement; static void grpin(x, y, n) short x, y, n; { - Char STR1[256]; + char STR1[256]; x = gridx + x * gridspc; y = gridy + y * gridspc; @@ -2781,7 +2781,7 @@ short x, y, n; static void erpin(x, y, n) short x, y, n; { - Char STR1[256]; + char STR1[256]; x = gridx + x * gridspc; y = gridy + y * gridspc; @@ -2852,7 +2852,7 @@ static void refrpinnums() static void refrname() { -Char *sp; +char *sp; erase((long)msg_name, msgy+5, msg_veckindmenu, msgy+msgheight); m_color((long)green); @@ -2877,7 +2877,7 @@ static void refrtorgmenu() { long i, FORLIM; - Char STR1[256], STR2[256]; + char STR1[256], STR2[256]; long lx, ly; FORLIM = strlen(torgkindmenu); @@ -2895,7 +2895,7 @@ static void refrtorgmenu() static void refrveckindmenu() { long i, FORLIM; - Char STR1[256], STR2[256]; + char STR1[256], STR2[256]; FORLIM = strlen(veckindmenu); for (i = 1; i <= FORLIM; i++) { @@ -3153,12 +3153,12 @@ static void gatecmd() static void nextcmd(indraw) -boolean indraw; +int indraw; { - Char arg[256], ggroup[256]; + char arg[256], ggroup[256]; krec *k; short count; - boolean flag; + int flag; if (indraw || *argument == '\0') *arg = '\0'; @@ -3195,11 +3195,11 @@ boolean indraw; static void prevcmd(indraw) -boolean indraw; +int indraw; { - Char arg[256], ggroup[256]; + char arg[256], ggroup[256]; krec *k, *k1; - boolean flag; + int flag; if (indraw || *argument == '\0') *arg = '\0'; @@ -3244,7 +3244,7 @@ boolean indraw; -static void editcmd PP((Char *argument)); +static void editcmd (char *argument); @@ -3271,7 +3271,7 @@ static void deletepin(num) long num; { long i, j; - na_strlist *l1; + na_strlist_t *l1; if (num <= kind.numpins && kind.pinsim[num - 1] != nopin) { if (kind.pincon[num - 1] != 0) { @@ -3301,7 +3301,7 @@ long num; static krec *findkind(n) -Char *n; +char *n; { krec *k; @@ -3315,10 +3315,10 @@ Char *n; static void cpyfunc() { krec *k; - Char n[9]; + char n[9]; long i; - Char STR1[256]; - Char *TEMP; + char STR1[256]; + char *TEMP; long FORLIM; m_nocursor(); @@ -3351,7 +3351,7 @@ static void cpyfunc() kind.numvects = k->numvects; kind.allocvects = k->allocvects; kind.vector = (vectorrec *)Malloc(k->allocvects * sizeof(vectorrec)); - memmove((Anyptr)kind.vector, (Anyptr)k->vector, + memmove((void *)kind.vector, (void *)k->vector, k->allocvects * sizeof(vectorrec)); bright(); needrefr = true; @@ -3369,9 +3369,9 @@ static void cpyfunc() static void shadowfunc() { - Char n[9]; - Char STR1[256]; - Char *TEMP; + char n[9]; + char STR1[256]; + char *TEMP; m_nocursor(); clearalpha(); @@ -3438,12 +3438,12 @@ short *x, *y; typedef short shortarray[1000000L]; -/* Local variables for drawcmd: */ +/* static variables for drawcmd: */ struct LOC_drawcmd { long x, y; short *nearvec; - boolean anyvec; - boolean nearpins[maxpins]; + int anyvec; + int nearpins[maxpins]; long nearpin, nearregion; } ; @@ -3458,7 +3458,7 @@ struct LOC_drawcmd *LINK; grid(); } -Local boolean checktap(LINK) +static int checktap(LINK) struct LOC_drawcmd *LINK; { long t, x0, y0; @@ -3473,7 +3473,7 @@ struct LOC_drawcmd *LINK; return (!pen.depressed); } -Local void getgrid(px, py, x, y, LINK) +static void getgrid(px, py, x, y, LINK) long px, py, *x, *y; struct LOC_drawcmd *LINK; { @@ -3487,8 +3487,8 @@ struct LOC_drawcmd *LINK; } } -Local void addvector(knd, LINK) -Char knd; +static void addvector(knd, LINK) +char knd; struct LOC_drawcmd *LINK; { vectorrec *WITH; @@ -3501,7 +3501,7 @@ struct LOC_drawcmd *LINK; savedflag = false; } -Local void flipX(v, LINK) +static void flipX(v, LINK) vectorrec *v; struct LOC_drawcmd *LINK; { @@ -3512,7 +3512,7 @@ struct LOC_drawcmd *LINK; v->UU.U99.x2 = t; } -Local boolean checknear(px, py, LINK) +static int checknear(px, py, LINK) long px, py; struct LOC_drawcmd *LINK; { @@ -3618,7 +3618,7 @@ struct LOC_drawcmd *LINK; } } -Local void checkoverpin(num, LINK) +static void checkoverpin(num, LINK) long num; struct LOC_drawcmd *LINK; { @@ -3633,7 +3633,7 @@ struct LOC_drawcmd *LINK; } } -Local void purgeoutside(LINK) +static void purgeoutside(LINK) struct LOC_drawcmd *LINK; { long i, j, FORLIM; @@ -3682,7 +3682,7 @@ struct LOC_drawcmd *LINK; } } -Local void fixpin(i, LINK) +static void fixpin(i, LINK) long i; struct LOC_drawcmd *LINK; { @@ -3698,15 +3698,15 @@ struct LOC_drawcmd *LINK; deletepin(i); } -/* Local variables for movepoint: */ +/* static variables for movepoint: */ struct LOC_movepoint { struct LOC_drawcmd *LINK; - boolean waitdn; + int waitdn; long x1, y1, initx, inity; - boolean done; + int done; } ; -Local void drawthem(LINK) +static void drawthem(LINK) struct LOC_movepoint *LINK; { long i, FORLIM; @@ -3726,7 +3726,7 @@ struct LOC_movepoint *LINK; grregion(kind.xx1, kind.yy1, kind.xx2, kind.yy2); } -Local void checkdone(LINK) +static void checkdone(LINK) struct LOC_movepoint *LINK; { if (!LINK->waitdn) { @@ -3741,8 +3741,8 @@ struct LOC_movepoint *LINK; } -Local void movepoint(waitdn_, LINK) -boolean waitdn_; +static void movepoint(waitdn_, LINK) +int waitdn_; struct LOC_drawcmd *LINK; { struct LOC_movepoint V; @@ -3860,11 +3860,11 @@ struct LOC_drawcmd *LINK; } -Local void movesel(LINK) +static void movesel(LINK) struct LOC_drawcmd *LINK; { long x1, y1, x2, y2, i; - boolean any; + int any; long FORLIM; m_colormode((long)m_xor); @@ -3934,12 +3934,12 @@ struct LOC_drawcmd *LINK; } -Local void addobject(LINK) +static void addobject(LINK) struct LOC_drawcmd *LINK; { long x1, y1, x2, y2, x3, y3, x4, y4, num; - boolean good; - Char buf[256]; + int good; + char buf[256]; m_color(colortrans[curcolor - 1]); switch (veckind) { @@ -4129,8 +4129,8 @@ struct LOC_drawcmd *LINK; } -Local void setmodes(vk, col, LINK) -Char vk; +static void setmodes(vk, col, LINK) +char vk; long col; struct LOC_drawcmd *LINK; { @@ -4143,7 +4143,7 @@ struct LOC_drawcmd *LINK; } -Local void instructions(LINK) +static void instructions(LINK) struct LOC_drawcmd *LINK; { clearalpha(); @@ -4173,7 +4173,7 @@ struct LOC_drawcmd *LINK; static void drawcmd() { struct LOC_drawcmd V; - boolean exitflag; + int exitflag; uchar cmd; long x1, y1, x2, y2, px, py; @@ -4473,10 +4473,10 @@ static void drawcmd() static void libcmd() { krec *k; - Char ggroup[256]; + char ggroup[256]; short i, j, pg; - boolean flag; - Char ch; + int flag; + char ch; flushcurkind(); wildcards(argument, ggroup, &flag); @@ -4521,9 +4521,9 @@ static void libcmd() static void defcmd() { - void (*proc) PP((log_action *act)); - Char name[256]; - Char STR1[256]; + void (*proc) (log_action_t *act); + char name[256]; + char STR1[256]; if (*argument != '\0') { makekind(argument); @@ -4539,7 +4539,7 @@ static void defcmd() return; } sprintf(name, "LOG_%d_PROC", kind.simtype); - if (!newci_findprocedure2(name, (void(**) PV())(&proc))) { + if (!newci_findprocedure2(name, (void(**) ())(&proc))) { sprintf(STR1, "Simulator for type %d not loaded", kind.simtype); wrmsg(STR1); return; @@ -4566,8 +4566,8 @@ static void defcmd() static void simtypecmd() { long i, j, k; - boolean flag; - Char *STR1; + int flag; + char *STR1; long FORLIM; if (curkind != NULL) { @@ -4636,7 +4636,7 @@ static void connectcmd() { long i, j, k, n, n0; long st[log_maxpins / 32 + 2]; - Char *STR1; + char *STR1; long SET[257]; long FORLIM; @@ -4723,10 +4723,10 @@ static void connectcmd() static void labelcmd() { short i, i1, p, x, y, xx, yy, len; - Char snail[5]; - boolean refr; + char snail[5]; + int refr; nk_keytransinfo *keytrans, *keytrans2; - Char ch; + char ch; if (*argument != '\0') { makekind(argument); @@ -4774,7 +4774,6 @@ static void labelcmd() } if (kind.lbl[i - 1] == '\001') { if (x < scrwidth) { -/* p2c: loged.text, line 4500: Note: Character >= 128 encountered [281] */ nc_putChar(x, y, 170); nc_clearXY(x + 1, y, (int)(scrwidth - x - 1), 1); } @@ -4947,7 +4946,7 @@ static void labelcmd() static void groupcmd() { long i, j; - Char *STR1; + char *STR1; if (curkind == NULL) { wrmsg("No current gate!"); @@ -4973,7 +4972,7 @@ static void groupcmd() } -typedef Char narr[16][9]; +typedef char narr[16][9]; narr names = { "NOFLIP", "TOGGLE", "VISIBLE", "NAMED", "NRIGHT", "NOSOLDER", "Z", "Z", "Z", @@ -4983,7 +4982,7 @@ narr names = { static void flagcmd(kind, buf, mode) krec *kind; -Char *buf; +char *buf; long mode; { long i; @@ -5046,12 +5045,12 @@ long mode; static void copycmd() { - Char n[9]; + char n[9]; krec *k, *k1; uchar *newproc; - Char *newlbl; + char *newlbl; vectorrec *newvects; - Char ch; + char ch; if (*argument == '\0' || curkind == NULL) return; @@ -5072,13 +5071,13 @@ static void copycmd() strcpy(n, curkind->name); *curkind = *k1; newproc = (uchar *)Malloc(k1->proclen); - memmove((Anyptr)newproc, (Anyptr)k1->proc, k1->proclen); + memmove((void *)newproc, (void *)k1->proc, k1->proclen); curkind->proc = newproc; - newlbl = (Char *)Malloc(k1->lbllen); - memmove((Anyptr)newlbl, (Anyptr)k1->lbl, k1->lbllen); + newlbl = (char *)Malloc(k1->lbllen); + memmove((void *)newlbl, (void *)k1->lbl, k1->lbllen); curkind->lbl = newlbl; newvects = (vectorrec *)Malloc(k1->allocvects * sizeof(vectorrec)); - memmove((Anyptr)newvects, (Anyptr)k1->vector, + memmove((void *)newvects, (void *)k1->vector, k1->allocvects * sizeof(vectorrec)); curkind->vector = newvects; strlist_copy(&curkind->pinnames, k1->pinnames); @@ -5094,9 +5093,9 @@ static void copycmd() static void renamecmd() { - Char n[9]; + char n[9]; krec *k, *k1, *k2; - Char STR2[256]; + char STR2[256]; if (*argument == '\0' || curkind == NULL) return; @@ -5153,10 +5152,10 @@ static void dispcurkind() static void deletecmd() { - Char ch; + char ch; krec *k, *k1, *k2; - Char ggroup[256]; - boolean current, verf, found, anyfound; + char ggroup[256]; + int current, verf, found, anyfound; flushcurkind(); current = (*argument == '\0'); @@ -5249,18 +5248,18 @@ static void deletecmd() static void getdefn(kind, def, mode) krec *kind; -na_strlist **def; +na_strlist_t **def; long mode; { - Char name[256]; - void (*proc) PP((log_action *act)); + char name[256]; + void (*proc) (log_action_t *act); if (mode != 3) *def = NULL; if (kind->simtype == 0) return; sprintf(name, "LOG_%d_PROC", kind->simtype); - if (!newci_findprocedure2(name, (void(**) PV())(&proc))) + if (!newci_findprocedure2(name, (void(**) ())(&proc))) return; gg.action = act_edit; gg.acttool = NULL; @@ -5289,18 +5288,18 @@ long mode; #define headerspc 0.2 -/* Local variables for dumpcmd: */ +/* static variables for dumpcmd: */ struct LOC_dumpcmd { FILE *f; } ; -Local void writestr(s_, LINK) -Char *s_; +static void writestr(s_, LINK) +char *s_; struct LOC_dumpcmd *LINK; { - Char s[256]; + char s[256]; long i; - Char STR1[256]; + char STR1[256]; strcpy(s, s_); i = 1; @@ -5330,19 +5329,19 @@ static void dumpcmd() struct LOC_dumpcmd V; long i, n, curcol; long st[log_maxpins / 32 + 2]; - na_strlist *def, *fonts, *l1; - boolean markerfont; + na_strlist_t *def, *fonts, *l1; + int markerfont; double x, y, dx, dy, norm; - Char name[256], STR1[256], STR2[256]; - Char STR3[256]; + char name[256], STR1[256], STR2[256]; + char STR3[256]; long FORLIM; vectorrec *WITH; long SET[257]; FILE *preamble; int predata; - Char prefile[1024]; + char prefile[1024]; int spool = 0; - Char unixCommand[256]; + char unixCommand[256]; V.f = NULL; if (curkind == NULL) @@ -5728,9 +5727,9 @@ static void dumpcmd() static void addpinname(num, name) long num; -Char *name; +char *name; { - na_strlist *l1, **prev; + na_strlist_t *l1, **prev; prev = &kind.pinnames; while (*prev != NULL && (long)(*prev)->value <= num) @@ -5740,15 +5739,15 @@ Char *name; } -/* Local variables for readfile: */ +/* static variables for readfile: */ struct LOC_readfile { - na_strlist *def, *labels; + na_strlist_t *def, *labels; long curcol; - boolean defining, hasdef, haslabels; + int defining, hasdef, haslabels; } ; -Local void addvector_(knd, LINK) -Char knd; +static void addvector_(knd, LINK) +char knd; struct LOC_readfile *LINK; { vectorrec *WITH; @@ -5760,11 +5759,11 @@ struct LOC_readfile *LINK; WITH->col = LINK->curcol; } -Local void endkind(LINK) +static void endkind(LINK) struct LOC_readfile *LINK; { long i; - na_strlist *l1; + na_strlist_t *l1; if (LINK->hasdef) { reallocproc(&kind, 100L); @@ -5782,7 +5781,7 @@ struct LOC_readfile *LINK; l1 = LINK->labels; while (l1 != NULL) { if (*l1->s != '\0') - memmove((Anyptr)(&kind.lbl[i - 1]), (Anyptr)l1->s, + memmove((void *)(&kind.lbl[i - 1]), (void *)l1->s, (long)strlen(l1->s)); i += strlen(l1->s); kind.lbl[i - 1] = '\001'; @@ -5802,29 +5801,29 @@ struct LOC_readfile *LINK; static void readfile(filename_, gname_) -Char *filename_, *gname_; +char *filename_, *gname_; { struct LOC_readfile V; - Char filename[256], gname[256]; + char filename[256], gname[256]; FILE *f; - Char ggroup[256], *buf, wrd[256]; - boolean verify; - na_strlist *l1; + char ggroup[256], *buf, wrd[256]; + int verify; + na_strlist_t *l1; long i, num, x, y, sim, lnum, savenumv; - boolean okay, wasempty; - Char STR1[256]; - Char STR2[256]; - Char *STR3; - Char *TEMP; - Char *STR4; + int okay, wasempty; + char STR1[256]; + char STR2[256]; + char *STR3; + char *TEMP; + char *STR4; long FORLIM; int TEMP1, TEMP2, TEMP3, TEMP4; vectorrec *WITH; int TEMP5, TEMP6, TEMP7, TEMP8; long TEMP9; - Char *STR5, STR6[256]; - Char *holdbuf; - Char *copybuf; + char *STR5, STR6[256]; + char *holdbuf; + char *copybuf; strcpy(filename, filename_); strcpy(gname, gname_); @@ -5859,7 +5858,7 @@ Char *filename_, *gname_; V.hasdef = false; V.haslabels = false; V.curcol = 1; - buf = (Char *)Malloc(256); + buf = (char *)Malloc(256); while (okay && !P_eof(f)) { lnum++; fgets(buf, 256, f); @@ -5868,7 +5867,7 @@ Char *filename_, *gname_; holdbuf = strdup(buf); do { if (fgets(buf, 256, f)) { - copybuf = (Char*)Malloc( strlen(holdbuf) + strlen(buf) +1 ); + copybuf = (char*)Malloc( strlen(holdbuf) + strlen(buf) +1 ); strcpy(copybuf, holdbuf); strcat(copybuf, buf); Free(holdbuf); @@ -5884,7 +5883,7 @@ Char *filename_, *gname_; TEMP = (char *) strchr(buf, '\n'); if (TEMP != NULL) *TEMP = 0; - STR4 = (Char*)Malloc(strlen(buf) +1); + STR4 = (char*)Malloc(strlen(buf) +1); savenumv = kind.numvects; TRY(try14); strword(buf, wrd); @@ -6157,20 +6156,20 @@ Char *filename_, *gname_; } -/* Local variables for writefile: */ +/* static variables for writefile: */ struct LOC_writefile { FILE *f; } ; -Local void writeit(k, LINK) +static void writeit(k, LINK) krec *k; struct LOC_writefile *LINK; { short i, n, curcol; - na_strlist *def, *l1; - Char buf[256]; + na_strlist_t *def, *l1; + char buf[256]; long st[log_maxpins / 32 + 2]; - Char STR2[256]; + char STR2[256]; short FORLIM; vectorrec *WITH; long SET[257]; @@ -6345,13 +6344,13 @@ struct LOC_writefile *LINK; static void writefile(filename_, gname_) -Char *filename_, *gname_; +char *filename_, *gname_; { struct LOC_writefile V; - Char filename[256], gname[256], ggroup[256]; + char filename[256], gname[256], ggroup[256]; krec *k; - boolean verify; - Char STR2[256]; + int verify; + char STR2[256]; strcpy(filename, filename_); strcpy(gname, gname_); @@ -6390,11 +6389,11 @@ Char *filename_, *gname_; static void parse(s1, s2) -Char *s1, *s2; +char *s1, *s2; { short i; - Char *STR1; - Char *STR3; + char *STR1; + char *STR3; STR1 = strdup(s1); strcpy(s1, strltrim(strrtrim(STR1))); @@ -6402,7 +6401,7 @@ Char *s1, *s2; if (i == 0) *s2 = '\0'; else { - STR3 = (Char*)Malloc(strlen(s1) -i +2); + STR3 = (char*)Malloc(strlen(s1) -i +2); sprintf(STR3, "%.*s", (int)(strlen(s1) - i + 1L), s1 + i - 1); strcpy(s2, strltrim(STR3)); s1[i - 1] = '\0'; @@ -6416,7 +6415,7 @@ Char *s1, *s2; static void load20cmd() { - Char gname[256]; + char gname[256]; savedflag = (kbase == NULL); parse(argument, gname); @@ -6438,7 +6437,7 @@ static void load20cmd() static void loadcmd() { - Char gname[256]; + char gname[256]; savedflag = (kbase == NULL); parse(argument, gname); @@ -6460,7 +6459,7 @@ static void loadcmd() static void readcmd() { - Char fname[256], gname[256]; + char fname[256], gname[256]; savedflag = (kbase == NULL); parse(argument, gname); @@ -6483,8 +6482,8 @@ static void readcmd() static void savecmd() { - Char gname[256]; - Char ch; + char gname[256]; + char ch; flushcurkind(); ch = 'Y'; @@ -6504,7 +6503,7 @@ static void savecmd() static void writecmd() { - Char buf[256], gname[256]; + char buf[256], gname[256]; flushcurkind(); parse(argument, gname); @@ -6526,9 +6525,9 @@ static void writecmd() static void editcmd(argument_) -Char *argument_; +char *argument_; { - Char argument[256], fn[256]; + char argument[256], fn[256]; strcpy(argument, argument_); sprintf(fn, "/tmp/loged%03ld.text", ma_rand2(0L, 999L)); @@ -6572,7 +6571,7 @@ static void helpcmd() static void memorycmd() { - Char STR2[256]; + char STR2[256]; nc_gotoXY(0, (int)(scrheight - 5)); TRY(try17); @@ -6583,14 +6582,14 @@ static void memorycmd() } -static void docommand PP((Char *command)); +static void docommand (char *command); -Local void docmd() +static void docmd() { - Char savecmd[256], gname[256], ggroup[256]; + char savecmd[256], gname[256], ggroup[256]; krec *k, *k2; short i; - boolean flag; + int flag; errorflag = false; i = strpos2(argument, " ", 1); @@ -6620,9 +6619,9 @@ Local void docmd() static void docommand(command_) -Char *command_; +char *command_; { - Char command[256]; + char command[256]; strcpy(command, command_); parse(command, argument); @@ -6740,10 +6739,10 @@ Char *command_; static void commandline() { long i; - Char s[256]; + char s[256]; long FORLIM; - Char STR1[256]; - Char STR2[256]; + char STR1[256]; + char STR2[256]; if (P_argc < 2) return; @@ -6758,11 +6757,11 @@ static void commandline() } -int main(int argc, Char * argv[]) +int main(int argc, char * argv[]) { /*main*/ - Char STR2[256]; - Char STR3[256]; + char STR2[256]; + char STR3[256]; nc_text_in_window = 1; PASCAL_MAIN(argc, argv); @@ -6795,7 +6794,7 @@ int main(int argc, Char * argv[]) gg.time = 0.0; gg.simstate = simst_null; gg.homedirname = NULL; - gg.actstr = (Char *)Malloc(256); + gg.actstr = (char *)Malloc(256); clearalpha(); curkind = NULL; shadowkind = NULL; @@ -6818,7 +6817,7 @@ int main(int argc, Char * argv[]) printf("Welcome to New, Improved LOGED!\n\n"); printf("LOGED now works on Bobcats as well as Chipmunks.\n\n"); printf("The DRAW command has been totally redone and is now,\n"); -/* p2c: loged.text, line 6245: Note: Characters >= 128 encountered [281] */ +/* p2c: loged.text, line 6245: Note: characters >= 128 encountered [281] */ /* p2c: loged.text, line 6245: * Note: WRITE statement contains color/attribute characters [203] */ printf("incredibly enough, \213\202*reasonably nice to use*\200\210!\n"); diff --git a/log/src/logntk.c b/log/src/logntk.c index 78feab4bcfa8f72772f3719185ed045585f672a7..31610c7244631235568db97988e9e851a3737be6 100644 --- a/log/src/logntk.c +++ b/log/src/logntk.c @@ -158,14 +158,14 @@ char *fn; } -/* variables for Log_logntk_proc: */ +/* Local variables for Log_logntk_proc: */ struct LOC_Log_logntk_proc { log_action_t *act; int errflag; } ; -void message(s_, LINK) +static void message(s_, LINK) char *s_; struct LOC_Log_logntk_proc *LINK; { @@ -178,7 +178,7 @@ struct LOC_Log_logntk_proc *LINK; } -void emessage(s_, LINK) +static void emessage(s_, LINK) char *s_; struct LOC_Log_logntk_proc *LINK; { @@ -192,7 +192,7 @@ struct LOC_Log_logntk_proc *LINK; } -void vmessage(s_, LINK) +static void vmessage(s_, LINK) char *s_; struct LOC_Log_logntk_proc *LINK; { @@ -205,7 +205,7 @@ struct LOC_Log_logntk_proc *LINK; } -void addlabel(s_, LINK) +static void addlabel(s_, LINK) char *s_; struct LOC_Log_logntk_proc *LINK; { @@ -217,7 +217,7 @@ struct LOC_Log_logntk_proc *LINK; } -void getword(buf, w, LINK) +static void getword(buf, w, LINK) char *buf, *w; struct LOC_Log_logntk_proc *LINK; { @@ -225,7 +225,7 @@ struct LOC_Log_logntk_proc *LINK; } -void getint(buf, i, def, LINK) +static void getint(buf, i, def, LINK) char *buf; long *i, def; struct LOC_Log_logntk_proc *LINK; @@ -234,7 +234,7 @@ struct LOC_Log_logntk_proc *LINK; } -void readstrlist(buf, l1, LINK) +static void readstrlist(buf, l1, LINK) char *buf; na_strlist_t **l1; struct LOC_Log_logntk_proc *LINK; @@ -250,7 +250,7 @@ struct LOC_Log_logntk_proc *LINK; } -void readstrlista(buf, l1, LINK) +static void readstrlista(buf, l1, LINK) char *buf; na_strlist_t **l1; struct LOC_Log_logntk_proc *LINK; @@ -268,7 +268,7 @@ struct LOC_Log_logntk_proc *LINK; } -void readstrlistr(buf, l1, named, LINK) +static void readstrlistr(buf, l1, named, LINK) char *buf; na_strlist_t **l1; int named; @@ -291,7 +291,7 @@ struct LOC_Log_logntk_proc *LINK; } -void addcell(c1, name, cname, fname, LINK) +static void addcell(c1, name, cname, fname, LINK) cellrec **c1; char *name, *cname, *fname; struct LOC_Log_logntk_proc *LINK; @@ -308,7 +308,7 @@ struct LOC_Log_logntk_proc *LINK; cellbase = *c1; } -void docommand(buf1_, buf_, complain, LINK) +static void docommand(buf1_, buf_, complain, LINK) char *buf1_, *buf_; int complain; struct LOC_Log_logntk_proc *LINK; @@ -445,7 +445,7 @@ struct LOC_Log_logntk_proc *LINK; } -void namenode(n, LINK) +static void namenode(n, LINK) log_nrec *n; struct LOC_Log_logntk_proc *LINK; { @@ -489,7 +489,7 @@ struct LOC_Log_logntk_proc *LINK; } -int trynamegate(g, LINK) +static int trynamegate(g, LINK) log_grec *g; struct LOC_Log_logntk_proc *LINK; { @@ -508,7 +508,7 @@ struct LOC_Log_logntk_proc *LINK; } -void namecellgates(c, LINK) +static void namecellgates(c, LINK) cellrec *c; struct LOC_Log_logntk_proc *LINK; { @@ -542,7 +542,7 @@ struct LOC_Log_logntk_proc *LINK; } -void nameprimgates(p, LINK) +static void nameprimgates(p, LINK) primrec *p; struct LOC_Log_logntk_proc *LINK; { @@ -575,7 +575,7 @@ struct LOC_Log_logntk_proc *LINK; } -void prolog(args_, bp, LINK) +static void prolog(args_, bp, LINK) char *args_; log_brec *bp; struct LOC_Log_logntk_proc *LINK; @@ -764,7 +764,7 @@ struct LOC_Log_logntk_proc *LINK; } -void epilog(LINK) +static void epilog(LINK) struct LOC_Log_logntk_proc *LINK; { cellrec *c; @@ -827,7 +827,7 @@ struct LOC_Log_logntk_proc *LINK; -void addbogusname(newcmd, newthing, LINK) +static void addbogusname(newcmd, newthing, LINK) char *newcmd, *newthing; struct LOC_Log_logntk_proc *LINK; { @@ -846,7 +846,7 @@ struct LOC_Log_logntk_proc *LINK; } -na_strlist_t *mydefndirectory(pg, LINK) +static na_strlist_t *mydefndirectory(pg, LINK) short pg; struct LOC_Log_logntk_proc *LINK; { @@ -863,20 +863,20 @@ struct LOC_Log_logntk_proc *LINK; return l1; } -/* variables for dologntk: */ +/* Local variables for dologntk: */ struct LOC_dologntk { struct LOC_Log_logntk_proc *LINK; FILE *outf; } ; -/* variables for readcells: */ +/* Local variables for readcells: */ struct LOC_readcells { struct LOC_dologntk *LINK; FILE *f2; char s[256], s2[256], name[256]; } ; -void readcellfile(fn, LINK) +static void readcellfile(fn, LINK) char *fn; struct LOC_readcells *LINK; { @@ -932,7 +932,7 @@ struct LOC_readcells *LINK; } } -void readcells(LINK) +static void readcells(LINK) struct LOC_dologntk *LINK; { struct LOC_readcells V; @@ -1042,13 +1042,13 @@ struct LOC_dologntk *LINK; fclose(V.f2); } -/* variables for writefile: */ +/* Local variables for writefile: */ struct LOC_writefile { struct LOC_dologntk *LINK; long linelen; } ; -void writeword(w, LINK) +static void writeword(w, LINK) char *w; struct LOC_writefile *LINK; { @@ -1060,7 +1060,7 @@ struct LOC_writefile *LINK; LINK->linelen += strlen(w) + 1; } -void writefile(LINK) +static void writefile(LINK) struct LOC_dologntk *LINK; { struct LOC_writefile V; @@ -1317,7 +1317,7 @@ struct LOC_dologntk *LINK; fprintf(LINK->outf, " ;\n"); } -void showports(LINK) +static void showports(LINK) struct LOC_dologntk *LINK; { char buf[256]; @@ -1335,7 +1335,7 @@ struct LOC_dologntk *LINK; } -void dologntk(args_, LINK) +static void dologntk(args_, LINK) char *args_; struct LOC_Log_logntk_proc *LINK; { @@ -1439,7 +1439,7 @@ struct LOC_Log_logntk_proc *LINK; } -void probecommand(LINK) +static void probecommand(LINK) struct LOC_Log_logntk_proc *LINK; { na_strlist_t *defndir, *l1, *curdef; @@ -1588,7 +1588,7 @@ struct LOC_Log_logntk_proc *LINK; } -void identifycommand(args_, LINK) +static void identifycommand(args_, LINK) char *args_; struct LOC_Log_logntk_proc *LINK; { @@ -1656,10 +1656,6 @@ struct LOC_Log_logntk_proc *LINK; } - - - - void Log_logntk_proc(act_) log_action_t *act_; { @@ -1749,13 +1745,4 @@ log_action_t *act_; } - - - - - - - - - /* End. */ diff --git a/log/src/logsim.c b/log/src/logsim.c index 1dcc9c42bbe875bfa29ecf423583493b022832e4..9ea1057e8d4c80436083d3e22432dcb5543caf3c 100644 --- a/log/src/logsim.c +++ b/log/src/logsim.c @@ -758,13 +758,13 @@ log_16_action *act; } -/* variables for Log_16_7seg: */ +/* Local variables for Log_16_7seg: */ struct LOC_Log_16_7seg { log_16_action *act; na_strlist_t *l1; } ; -void plotline(x1, y1, x2, y2, LINK) +static void plotline(x1, y1, x2, y2, LINK) short x1, y1, x2, y2; struct LOC_Log_16_7seg *LINK; { @@ -1464,12 +1464,12 @@ static void digproc3() } -/* variables for Log_16_proc: */ +/* Local variables for Log_16_proc: */ struct LOC_Log_16_proc { kindinfo *ki; } ; -void setupkindproc(LINK) +static void setupkindproc(LINK) struct LOC_Log_16_proc *LINK; { short pc, i, len; diff --git a/log/src/logsima.h b/log/src/logsima.h index f45c9cf2b996831215e6dd0a16ffc959e5c6181f..c3536576031bdf774c52444d367d7b684151e222 100644 --- a/log/src/logsima.h +++ b/log/src/logsima.h @@ -1,12 +1,19 @@ #ifndef LOGSIMA_H #define LOGSIMA_H - #include "logsim.h" #include "logdef.h" #include "logdig.h" #include <p2c/newasm.h> + +#ifdef LOGSIMA_G +#define vextern +#else +#define vextern extern +#endif + + typedef struct nodeinfo { log_16_value v, v0, v00, defv, truev; } nodeinfo; @@ -25,8 +32,8 @@ typedef struct gateinfo { } gateinfo; -extern log_tool *logsima_tool_16; -extern log_16_action logsima_action; +vextern log_tool *logsima_tool_16; +vextern log_16_action logsima_action; extern void (*logsima_dig_inst) (log_16_action *act); diff --git a/log/src/logsimasm.c b/log/src/logsimasm.c index 665b4e491476c8adcdd85fb9d53f6d92144b896c..754a8043bef1611b343575beb946dde8c46f0653 100644 --- a/log/src/logsimasm.c +++ b/log/src/logsimasm.c @@ -26,6 +26,8 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <p2c/p2c.h> + +#define LOGSIMA_G #include "logsima.h" static int trace_16 = 0; diff --git a/log/src/logsimed.c b/log/src/logsimed.c index ea6f04f2331cabadbe049eed2574dff97a6ff2c8..a0828da08166500666887a26f32d37bee3e893d4 100644 --- a/log/src/logsimed.c +++ b/log/src/logsimed.c @@ -43,7 +43,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "logsimed.h" -/* variables for dasm_16: */ +/* Local variables for dasm_16: */ struct LOC_dasm_16 { char *buf; int bufsiz; @@ -51,18 +51,18 @@ struct LOC_dasm_16 { long *pc; } ; -void dasmop (struct LOC_dasm_16 *LINK); +static void dasmop (struct LOC_dasm_16 *LINK); -/* variables for dasmop: */ +/* Local variables for dasmop: */ struct LOC_dasmop { struct LOC_dasm_16 *LINK; } ; -void append (struct LOC_dasm_16 *LINK, char *s); +static void append (struct LOC_dasm_16 *LINK, char *s); /* append to the local buffer. */ /* the buf and bufsiz are initialized in dasm_16() */ -void append(LINK, s) +static void append(LINK, s) struct LOC_dasm_16 *LINK; char *s; { @@ -83,14 +83,14 @@ char *tmp; } -char vr(i, LINK) +static char vr(i, LINK) long i; struct LOC_dasmop *LINK; { return ((char)((i & 15) + 65)); } -long getpseudo(LINK) +static long getpseudo(LINK) struct LOC_dasmop *LINK; { long Result; @@ -107,7 +107,7 @@ struct LOC_dasmop *LINK; return Result; } -void dasmoppar(z, LINK) +static void dasmoppar(z, LINK) uchar z; struct LOC_dasmop *LINK; { @@ -125,7 +125,7 @@ struct LOC_dasmop *LINK; append(LINK->LINK, ")"); } -void dasmop(LINK) +static void dasmop(LINK) struct LOC_dasm_16 *LINK; { struct LOC_dasmop V; @@ -696,13 +696,13 @@ long pc; } -/* variables for length_16: */ +/* Local variables for length_16: */ struct LOC_length_16 { uchar *proc; long pc; } ; -void instlen(LINK) +static void instlen(LINK) struct LOC_length_16 *LINK; { uchar ch; @@ -853,7 +853,7 @@ long pc_; } -/* variables for assem_16: */ +/* Local variables for assem_16: */ struct LOC_assem_16 { uchar *proc; long *pc; @@ -862,9 +862,9 @@ struct LOC_assem_16 { long procsiz; } ; -void assem (struct LOC_assem_16 *LINK); +static void assem (struct LOC_assem_16 *LINK); -void store(b, LINK) +static void store(b, LINK) short b; struct LOC_assem_16 *LINK; { @@ -872,7 +872,7 @@ struct LOC_assem_16 *LINK; LINK->proc[*LINK->pc - 1] = b; } -int strcheck(s, pref, LINK) +static int strcheck(s, pref, LINK) char *s; char *pref; struct LOC_assem_16 *LINK; @@ -884,12 +884,12 @@ struct LOC_assem_16 *LINK; return false; } -/* variables for assem: */ +/* Local variables for assem: */ struct LOC_assem { struct LOC_assem_16 *LINK; } ; -void factor(LINK) +static void factor(LINK) struct LOC_assem *LINK; { long i, j, FORLIM; @@ -1224,7 +1224,7 @@ struct LOC_assem *LINK; } } -void assem(LINK) +static void assem(LINK) struct LOC_assem_16 *LINK; { struct LOC_assem V; @@ -1339,7 +1339,7 @@ long *pc_; } -/* variables for edit_16: */ +/* Local variables for edit_16: */ struct LOC_edit_16 { uchar **proc; long *proclen; @@ -1349,7 +1349,7 @@ struct LOC_edit_16 { uchar ch; } ; -void resizeproc(len, LINK) +static void resizeproc(len, LINK) long len; struct LOC_edit_16 *LINK; { @@ -1368,7 +1368,7 @@ struct LOC_edit_16 *LINK; *LINK->proc = newproc; } -void dasminst(LINK) +static void dasminst(LINK) struct LOC_edit_16 *LINK; { long ind; @@ -1389,7 +1389,7 @@ struct LOC_edit_16 *LINK; Free(buf); } -void showdef(LINK) +static void showdef(LINK) struct LOC_edit_16 *LINK; { long i, pc0, FORLIM; @@ -1425,7 +1425,7 @@ struct LOC_edit_16 *LINK; LINK->pc = pc0; } -int insertinst(p, n, LINK) +static int insertinst(p, n, LINK) long p, n; struct LOC_edit_16 *LINK; { @@ -1445,7 +1445,7 @@ struct LOC_edit_16 *LINK; return false; } -void deleteinst(p, n, LINK) +static void deleteinst(p, n, LINK) long p, n; struct LOC_edit_16 *LINK; { @@ -1458,7 +1458,7 @@ struct LOC_edit_16 *LINK; } while ((*LINK->proc)[i - 2] != '\0'); } -long doassem(s, repl, LINK) +static long doassem(s, repl, LINK) char *s; int repl; struct LOC_edit_16 *LINK; @@ -1479,7 +1479,7 @@ struct LOC_edit_16 *LINK; return Result; } -void bogusreadln(s, hasdef, LINK) +static void bogusreadln(s, hasdef, LINK) char *s; int hasdef; struct LOC_edit_16 *LINK; diff --git a/log/src/logsimh.c b/log/src/logsimh.c index 92b7d64ebdf08fc45675f7244cf83209b133d754..738565ba9cdc650e5a49763825540b66f631e5fd 100644 --- a/log/src/logsimh.c +++ b/log/src/logsimh.c @@ -367,9 +367,6 @@ char *msg; } - - - static void showerrormsg(hdef, msg_) hdefrec *hdef; char *msg_; @@ -706,7 +703,7 @@ typedef struct gaterec { typedef gaterec gatearray[log_million]; -/* variables for compilepage: */ +/* Local variables for compilepage: */ struct LOC_compilepage { hdefrec *hdef; long starttime; @@ -727,9 +724,9 @@ struct LOC_compilepage { int changed; } ; -instrrec *parseterm (struct LOC_compilepage *LINK); +static instrrec *parseterm (struct LOC_compilepage *LINK); -void error(msg, LINK) +static void error(msg, LINK) char *msg; struct LOC_compilepage *LINK; { @@ -738,7 +735,7 @@ struct LOC_compilepage *LINK; LINK->okay = false; } -void newinstr(ip, LINK) +static void newinstr(ip, LINK) instrrec **ip; struct LOC_compilepage *LINK; { @@ -750,7 +747,7 @@ struct LOC_compilepage *LINK; (*ip)->UU.U1.next = NULL; } -void disposetree(ip, LINK) +static void disposetree(ip, LINK) instrrec **ip; struct LOC_compilepage *LINK; { @@ -763,7 +760,7 @@ struct LOC_compilepage *LINK; Free(*ip); } -/* variables for dumptree: */ +/* Local variables for dumptree: */ struct LOC_dumptree { struct LOC_compilepage *LINK; FILE *f; @@ -772,7 +769,7 @@ struct LOC_dumptree { long i; } ; -void dump(ip, indent, LINK) +static void dump(ip, indent, LINK) instrrec *ip; long indent; struct LOC_dumptree *LINK; @@ -826,7 +823,7 @@ struct LOC_dumptree *LINK; } } -void dumptree(f_, ip, iphigh_, LINK) +static void dumptree(f_, ip, iphigh_, LINK) FILE *f_; instrrec *ip, *iphigh_; struct LOC_compilepage *LINK; @@ -840,7 +837,7 @@ struct LOC_compilepage *LINK; putc('\n', V.f); } -void debugtree(ip, iphigh, LINK) +static void debugtree(ip, iphigh, LINK) instrrec *ip, *iphigh; struct LOC_compilepage *LINK; { @@ -850,7 +847,7 @@ struct LOC_compilepage *LINK; } -int isinert(g, LINK) +static int isinert(g, LINK) log_grec *g; struct LOC_compilepage *LINK; { @@ -858,7 +855,7 @@ struct LOC_compilepage *LINK; strlist_find(LINK->inertlist, g->kind->name) != NULL); } -/* variables for parseterm: */ +/* Local variables for parseterm: */ struct LOC_parseterm { struct LOC_compilepage *LINK; instrrec *ip; @@ -866,7 +863,7 @@ struct LOC_parseterm { int done; } ; -void badop(LINK) +static void badop(LINK) struct LOC_parseterm *LINK; { char STR2[256]; @@ -876,7 +873,7 @@ struct LOC_parseterm *LINK; error(STR2, LINK->LINK); } -instrrec *parsepin(LINK) +static instrrec *parsepin(LINK) struct LOC_parseterm *LINK; { instrrec *ip; @@ -889,7 +886,7 @@ struct LOC_parseterm *LINK; return ip; } -long getpnum(LINK) +static long getpnum(LINK) struct LOC_parseterm *LINK; { long Result; @@ -906,14 +903,14 @@ struct LOC_parseterm *LINK; return Result; } -long findpin(i, LINK) +static long findpin(i, LINK) long i; struct LOC_parseterm *LINK; { return ((long)LINK->LINK->gpins[i - 1]->temp); } -long findvar(i, LINK) +static long findvar(i, LINK) long i; struct LOC_parseterm *LINK; { @@ -925,7 +922,7 @@ struct LOC_parseterm *LINK; return Result; } -void checkcomment(LINK) +static void checkcomment(LINK) struct LOC_parseterm *LINK; { char s[256]; @@ -951,7 +948,7 @@ struct LOC_parseterm *LINK; /* Parse a GDL definition into a tree */ -instrrec *parseterm(LINK) +static instrrec *parseterm(LINK) struct LOC_compilepage *LINK; { struct LOC_parseterm V; @@ -1362,7 +1359,7 @@ struct LOC_compilepage *LINK; /* Find out which pins are inputs and which are outputs */ -void getpindata(pindata, numpins, proc, LINK) +static void getpindata(pindata, numpins, proc, LINK) pdrec **pindata; long numpins; uchar *proc; @@ -1445,19 +1442,19 @@ struct LOC_compilepage *LINK; } -long setbytes(bits, LINK) +static long setbytes(bits, LINK) long bits; struct LOC_compilepage *LINK; { return ((bits + 63) / 32 * 4); } -/* variables for parsegates: */ +/* Local variables for parsegates: */ struct LOC_parsegates { struct LOC_compilepage *LINK; } ; -void subupdate(g1, LINK) +static void subupdate(g1, LINK) log_grec *g1; struct LOC_parsegates *LINK; { @@ -1487,7 +1484,7 @@ struct LOC_parsegates *LINK; } -void parsegates(LINK) +static void parsegates(LINK) struct LOC_compilepage *LINK; { struct LOC_parsegates V; @@ -1727,7 +1724,7 @@ struct LOC_compilepage *LINK; /* Simplify a procedure tree */ -int checkconn(ip, LINK) +static int checkconn(ip, LINK) instrrec *ip; struct LOC_compilepage *LINK; { @@ -1770,7 +1767,7 @@ struct LOC_compilepage *LINK; return Result; } -int cmptrees(ip1, ip2, LINK) +static int cmptrees(ip1, ip2, LINK) instrrec *ip1, *ip2; struct LOC_compilepage *LINK; { @@ -1798,7 +1795,7 @@ struct LOC_compilepage *LINK; return true; } -int treecontains(ip1, ip2, LINK) +static int treecontains(ip1, ip2, LINK) instrrec *ip1, *ip2; struct LOC_compilepage *LINK; { @@ -1811,7 +1808,7 @@ struct LOC_compilepage *LINK; treecontains(ip1->UU.U1.arg3, ip2, LINK)); } -int treerefers(ip, num, LINK) +static int treerefers(ip, num, LINK) instrrec *ip; long num; struct LOC_compilepage *LINK; @@ -1903,7 +1900,7 @@ struct LOC_compilepage *LINK; return Result; } -void swapinstrs(ip1, ip2, LINK) +static void swapinstrs(ip1, ip2, LINK) instrrec **ip1, **ip2; struct LOC_compilepage *LINK; { @@ -1915,7 +1912,7 @@ struct LOC_compilepage *LINK; LINK->changed = true; } -instrrec *makeinstr0(code, LINK) +static instrrec *makeinstr0(code, LINK) instrops code; struct LOC_compilepage *LINK; { @@ -1931,7 +1928,7 @@ struct LOC_compilepage *LINK; return ip; } -instrrec *makeinstr1(code, a1, LINK) +static instrrec *makeinstr1(code, a1, LINK) instrops code; instrrec *a1; struct LOC_compilepage *LINK; @@ -1948,7 +1945,7 @@ struct LOC_compilepage *LINK; return ip; } -instrrec *makeinstr2(code, a1, a2, LINK) +static instrrec *makeinstr2(code, a1, a2, LINK) instrops code; instrrec *a1, *a2; struct LOC_compilepage *LINK; @@ -1965,7 +1962,7 @@ struct LOC_compilepage *LINK; return ip; } -instrrec *makeinstr3(code, a1, a2, a3, LINK) +static instrrec *makeinstr3(code, a1, a2, a3, LINK) instrops code; instrrec *a1, *a2, *a3; struct LOC_compilepage *LINK; @@ -1982,21 +1979,21 @@ struct LOC_compilepage *LINK; return ip; } -instrrec *makefix0(arg, LINK) +static instrrec *makefix0(arg, LINK) instrrec *arg; struct LOC_compilepage *LINK; { return (makeinstr1(op_fix0, arg, LINK)); } -instrrec *makefix1(arg, LINK) +static instrrec *makefix1(arg, LINK) instrrec *arg; struct LOC_compilepage *LINK; { return (makeinstr1(op_fix1, arg, LINK)); } -instrrec *copytree(ip, LINK) +static instrrec *copytree(ip, LINK) instrrec *ip; struct LOC_compilepage *LINK; { @@ -2032,7 +2029,7 @@ struct LOC_compilepage *LINK; return Result; } -void replacetree(ip, ip2, LINK) +static void replacetree(ip, ip2, LINK) instrrec **ip, *ip2; struct LOC_compilepage *LINK; { @@ -2041,7 +2038,7 @@ struct LOC_compilepage *LINK; LINK->changed = true; } -void chgop(ip, opc, LINK) +static void chgop(ip, opc, LINK) instrrec *ip; instrops opc; struct LOC_compilepage *LINK; @@ -2052,7 +2049,7 @@ struct LOC_compilepage *LINK; } } -void killstmt(ip, LINK) +static void killstmt(ip, LINK) instrrec *ip; struct LOC_compilepage *LINK; { @@ -2064,7 +2061,7 @@ struct LOC_compilepage *LINK; } /* Change in "goodness" if we did makenot(arg) */ -long invertable(arg, LINK) +static long invertable(arg, LINK) instrrec *arg; struct LOC_compilepage *LINK; { @@ -2108,7 +2105,7 @@ struct LOC_compilepage *LINK; return Result; } -instrrec *makenot(arg, LINK) +static instrrec *makenot(arg, LINK) instrrec *arg; struct LOC_compilepage *LINK; { @@ -2140,7 +2137,7 @@ struct LOC_compilepage *LINK; return Result; } -long exprcost(ip, LINK) +static long exprcost(ip, LINK) instrrec *ip; struct LOC_compilepage *LINK; { @@ -2161,7 +2158,7 @@ struct LOC_compilepage *LINK; return Result; } -long expansioncost(ip, LINK) +static long expansioncost(ip, LINK) instrrec *ip; struct LOC_compilepage *LINK; { @@ -2192,14 +2189,14 @@ struct LOC_compilepage *LINK; return Result; } -/* variables for simplify: */ +/* Local variables for simplify: */ struct LOC_simplify { struct LOC_compilepage *LINK; long simplevel; trailrec *tbase; } ; -void chgposs2(i, newposs, newstrong, LINK) +static void chgposs2(i, newposs, newstrong, LINK) long i; long newposs; int newstrong; @@ -2228,7 +2225,7 @@ struct LOC_simplify *LINK; WITH->strong = newstrong; } -void chgposs(i, newposs, LINK) +static void chgposs(i, newposs, LINK) long i; long newposs; struct LOC_simplify *LINK; @@ -2236,7 +2233,7 @@ struct LOC_simplify *LINK; chgposs2(i, newposs, LINK->LINK->things[i].strong, LINK); } -void arith(ip, ident, LINK) +static void arith(ip, ident, LINK) instrrec **ip; instrops ident; struct LOC_simplify *LINK; @@ -2248,7 +2245,7 @@ struct LOC_simplify *LINK; } -void simplexpr(ip, nonelike, LINK) +static void simplexpr(ip, nonelike, LINK) instrrec **ip; log_16_value nonelike; struct LOC_simplify *LINK; @@ -2653,13 +2650,13 @@ struct LOC_simplify *LINK; LINK->LINK->changed = oldch; } -/* variables for simplstmt: */ +/* Local variables for simplstmt: */ struct LOC_simplstmt { struct LOC_simplify *LINK; instrrec **ipbase, *ip, **ipp; } ; -long iftonumber(ip, LINK) +static long iftonumber(ip, LINK) instrrec *ip; struct LOC_simplstmt *LINK; { @@ -2705,7 +2702,7 @@ struct LOC_simplstmt *LINK; return Result; } -instrops numbertoif(i, LINK) +static instrops numbertoif(i, LINK) long i; struct LOC_simplstmt *LINK; { @@ -2748,7 +2745,7 @@ struct LOC_simplstmt *LINK; return Result; } -void untrail(tp, LINK) +static void untrail(tp, LINK) trailrec *tp; struct LOC_simplstmt *LINK; { @@ -2767,7 +2764,7 @@ struct LOC_simplstmt *LINK; } } -void eattrail(tb, LINK) +static void eattrail(tb, LINK) trailrec **tb; struct LOC_simplstmt *LINK; { @@ -2779,7 +2776,7 @@ struct LOC_simplstmt *LINK; } /* Append list ip2 to end of list ip */ -void appendlist(ip, ip2, LINK) +static void appendlist(ip, ip2, LINK) instrrec **ip, *ip2; struct LOC_simplstmt *LINK; { @@ -2798,7 +2795,7 @@ struct LOC_simplstmt *LINK; } /* Insert list ip2 at front of list ip */ -void insertlist(ip, ip2, LINK) +static void insertlist(ip, ip2, LINK) instrrec **ip, *ip2; struct LOC_simplstmt *LINK; { @@ -2813,7 +2810,7 @@ struct LOC_simplstmt *LINK; *ip = ip2; } -void cleanpineq(ip, ival, LINK) +static void cleanpineq(ip, ival, LINK) instrrec *ip; long ival; struct LOC_simplstmt *LINK; @@ -2825,7 +2822,7 @@ struct LOC_simplstmt *LINK; } } -void builddefvusev(ip, defv, usev, LINK) +static void builddefvusev(ip, defv, usev, LINK) instrrec *ip; long *defv, *usev; struct LOC_simplstmt *LINK; @@ -2857,7 +2854,7 @@ struct LOC_simplstmt *LINK; } } -void checkdefvusev(ip, defv, usev, good, LINK) +static void checkdefvusev(ip, defv, usev, good, LINK) instrrec *ip; long *defv, *usev; int *good; @@ -2893,7 +2890,7 @@ struct LOC_simplstmt *LINK; } /*try to combine two "if x"'s into one*/ -void trymoveif(LINK) +static void trymoveif(LINK) struct LOC_simplstmt *LINK; { instrrec *ip2, *ip3, **ipp2; @@ -2972,7 +2969,7 @@ struct LOC_simplstmt *LINK; } /*try to factor common statements out of "if" and "else" branches*/ -void tryfactorif(LINK) +static void tryfactorif(LINK) struct LOC_simplstmt *LINK; { instrrec *ip2, *ip3, *ip4; @@ -2996,7 +2993,7 @@ struct LOC_simplstmt *LINK; killstmt(ip3, LINK->LINK->LINK); } -void simplstmt(ipbase_, LINK) +static void simplstmt(ipbase_, LINK) instrrec **ipbase_; struct LOC_simplify *LINK; { @@ -3441,7 +3438,7 @@ struct LOC_simplify *LINK; /*both parts*/ } -void simplify(ipbase, LINK) +static void simplify(ipbase, LINK) instrrec **ipbase; struct LOC_compilepage *LINK; { @@ -3461,7 +3458,7 @@ struct LOC_compilepage *LINK; /* Scan to find usage of variables and nodes */ -void scan(ip, scanlevel, LINK) +static void scan(ip, scanlevel, LINK) instrrec *ip; long scanlevel; struct LOC_compilepage *LINK; @@ -3545,7 +3542,7 @@ struct LOC_compilepage *LINK; /* Assign optimal variable names; also assign internal node numbers */ /* Concentrates most often-used variables in the faster A through P */ -void assignvars(LINK) +static void assignvars(LINK) struct LOC_compilepage *LINK; { long i, max, done, FORLIM; @@ -3594,7 +3591,7 @@ struct LOC_compilepage *LINK; /* Clean up node and variable numbers */ -void clean(ip, LINK) +static void clean(ip, LINK) instrrec *ip; struct LOC_compilepage *LINK; { @@ -3635,14 +3632,14 @@ struct LOC_compilepage *LINK; } } -/* variables for codegen: */ +/* Local variables for codegen: */ struct LOC_codegen { struct LOC_compilepage *LINK; int genflag; uchar *proc; } ; -void store(b, LINK) +static void store(b, LINK) long b; struct LOC_codegen *LINK; { @@ -3651,7 +3648,7 @@ struct LOC_codegen *LINK; LINK->proc[LINK->LINK->pc - 1] = (char)b; } -void storepnum(i, twobytes, LINK) +static void storepnum(i, twobytes, LINK) long i; int twobytes; struct LOC_codegen *LINK; @@ -3666,7 +3663,7 @@ struct LOC_codegen *LINK; store(32L, LINK); } -void genlist(ip, LINK) +static void genlist(ip, LINK) instrrec *ip; struct LOC_codegen *LINK; { @@ -3914,7 +3911,7 @@ struct LOC_codegen *LINK; /* Generate a GDL definition from a tree */ -void codegen(genflag_, LINK) +static void codegen(genflag_, LINK) int genflag_; struct LOC_compilepage *LINK; { @@ -3945,7 +3942,7 @@ struct LOC_compilepage *LINK; } /*codegen*/ -void writestats(f, pref, LINK) +static void writestats(f, pref, LINK) FILE *f; char *pref; struct LOC_compilepage *LINK; @@ -3996,7 +3993,7 @@ struct LOC_compilepage *LINK; } -void dodump(LINK) +static void dodump(LINK) struct LOC_compilepage *LINK; { FILE *f; @@ -4028,7 +4025,7 @@ struct LOC_compilepage *LINK; } -void dowritefile(fn_, LINK) +static void dowritefile(fn_, LINK) char *fn_; struct LOC_compilepage *LINK; { @@ -4059,7 +4056,7 @@ struct LOC_compilepage *LINK; } -void showstats(LINK) +static void showstats(LINK) struct LOC_compilepage *LINK; { char buf[256]; @@ -4733,14 +4730,14 @@ int clearit; } -/* variables for reconnectgate: */ +/* Local variables for reconnectgate: */ struct LOC_reconnectgate { log_grec *g; instinfo *ii; long lastwest; } ; -void check(dir, conn, port, LINK) +static void check(dir, conn, port, LINK) char *dir; long conn, port; struct LOC_reconnectgate *LINK; diff --git a/log/src/logspc.c b/log/src/logspc.c index 443769da96107d4bc714311fa6f29fb87ab3c0a7..e13bbee25a81a033bf8a401c0c90f82652d11c8c 100644 --- a/log/src/logspc.c +++ b/log/src/logspc.c @@ -244,14 +244,14 @@ char *fn; } -/* variables for Log_logspc_proc: */ +/* Locan variables for Log_logspc_proc: */ struct LOC_Log_logspc_proc { log_action_t *act; int errflag; } ; -void message(s_, LINK) +static void message(s_, LINK) char *s_; struct LOC_Log_logspc_proc *LINK; { @@ -264,7 +264,7 @@ struct LOC_Log_logspc_proc *LINK; } -void emessage(s_, LINK) +static void emessage(s_, LINK) char *s_; struct LOC_Log_logspc_proc *LINK; { @@ -278,7 +278,7 @@ struct LOC_Log_logspc_proc *LINK; } -void vmessage(s_, LINK) +static void vmessage(s_, LINK) char *s_; struct LOC_Log_logspc_proc *LINK; { @@ -291,7 +291,7 @@ struct LOC_Log_logspc_proc *LINK; } -void addlabel(s_, LINK) +static void addlabel(s_, LINK) char *s_; struct LOC_Log_logspc_proc *LINK; { @@ -303,7 +303,7 @@ struct LOC_Log_logspc_proc *LINK; } -void getword(buf, w, LINK) +static void getword(buf, w, LINK) char *buf, *w; struct LOC_Log_logspc_proc *LINK; { @@ -311,7 +311,7 @@ struct LOC_Log_logspc_proc *LINK; } -void spice_strword(s, word, filePtr) +static void spice_strword(s, word, filePtr) register char *s, *word; FILE *filePtr; { @@ -350,7 +350,7 @@ FILE *filePtr; } -void getint(buf, i, def, LINK) +static void getint(buf, i, def, LINK) char *buf; long *i, def; struct LOC_Log_logspc_proc *LINK; @@ -359,7 +359,7 @@ struct LOC_Log_logspc_proc *LINK; } -void readstrlist(buf, l1, LINK) +static void readstrlist(buf, l1, LINK) char *buf; na_strlist_t **l1; struct LOC_Log_logspc_proc *LINK; @@ -375,7 +375,7 @@ struct LOC_Log_logspc_proc *LINK; } -void readstrlista(buf, l1, LINK) +static void readstrlista(buf, l1, LINK) char *buf; na_strlist_t **l1; struct LOC_Log_logspc_proc *LINK; @@ -393,7 +393,7 @@ struct LOC_Log_logspc_proc *LINK; } -void readstrlistr(buf, l1, named, LINK) +static void readstrlistr(buf, l1, named, LINK) char *buf; na_strlist_t **l1; int named; @@ -416,7 +416,7 @@ struct LOC_Log_logspc_proc *LINK; } -void addcell(c1, name, cname, fname, LINK) +static void addcell(c1, name, cname, fname, LINK) cellrec **c1; char *name, *cname, *fname; struct LOC_Log_logspc_proc *LINK; @@ -434,7 +434,7 @@ struct LOC_Log_logspc_proc *LINK; } -void docommand(buf1_, buf_, complain, LINK) +static void docommand(buf1_, buf_, complain, LINK) char *buf1_, *buf_; int complain; struct LOC_Log_logspc_proc *LINK; @@ -634,7 +634,7 @@ struct LOC_Log_logspc_proc *LINK; } -void namenode(n, LINK) +static void namenode(n, LINK) log_nrec *n; struct LOC_Log_logspc_proc *LINK; { @@ -678,7 +678,7 @@ struct LOC_Log_logspc_proc *LINK; } -int trynamegate(g, LINK) +static int trynamegate(g, LINK) log_grec *g; struct LOC_Log_logspc_proc *LINK; { @@ -697,7 +697,7 @@ struct LOC_Log_logspc_proc *LINK; } -void namecellgates(c, LINK) +static void namecellgates(c, LINK) cellrec *c; struct LOC_Log_logspc_proc *LINK; { @@ -731,7 +731,7 @@ struct LOC_Log_logspc_proc *LINK; } -void nameprimgates(p, LINK) +static void nameprimgates(p, LINK) primrec *p; struct LOC_Log_logspc_proc *LINK; { @@ -764,7 +764,7 @@ struct LOC_Log_logspc_proc *LINK; } -void prolog(args_, bp, LINK) +static void prolog(args_, bp, LINK) char *args_; log_brec *bp; struct LOC_Log_logspc_proc *LINK; @@ -953,7 +953,7 @@ struct LOC_Log_logspc_proc *LINK; } -void epilog(LINK) +static void epilog(LINK) struct LOC_Log_logspc_proc *LINK; { cellrec *c; @@ -1014,7 +1014,7 @@ struct LOC_Log_logspc_proc *LINK; } -void addbogusname(newcmd, newthing, LINK) +static void addbogusname(newcmd, newthing, LINK) char *newcmd, *newthing; struct LOC_Log_logspc_proc *LINK; { @@ -1033,7 +1033,7 @@ struct LOC_Log_logspc_proc *LINK; } -na_strlist_t *mydefndirectory(pg, LINK) +static na_strlist_t *mydefndirectory(pg, LINK) short pg; struct LOC_Log_logspc_proc *LINK; { @@ -1051,14 +1051,14 @@ struct LOC_Log_logspc_proc *LINK; } -/* variables for dologspc: */ +/* Local variables for dologspc: */ struct LOC_dologspc { struct LOC_Log_logspc_proc *LINK; FILE *outf; } ; -/* variables for readcells: */ +/* Local variables for readcells: */ struct LOC_readcells { struct LOC_dologspc *LINK; FILE *f2; @@ -1066,7 +1066,7 @@ struct LOC_readcells { } ; -void readcellfile(fn, LINK) +static void readcellfile(fn, LINK) char *fn; struct LOC_readcells *LINK; { @@ -1146,7 +1146,7 @@ struct LOC_readcells *LINK; } -void readcells(LINK) +static void readcells(LINK) struct LOC_dologspc *LINK; { struct LOC_readcells V; @@ -1275,14 +1275,14 @@ struct LOC_dologspc *LINK; } -/* variables for writefile: */ +/* Local variables for writefile: */ struct LOC_writefile { struct LOC_dologspc *LINK; long linelen; } ; -void writeword(w, LINK) +static void writeword(w, LINK) char *w; struct LOC_writefile *LINK; { @@ -1300,7 +1300,7 @@ struct LOC_writefile *LINK; } -void writefile(LINK) +static void writefile(LINK) struct LOC_dologspc *LINK; { struct LOC_writefile V; @@ -1918,7 +1918,7 @@ struct LOC_dologspc *LINK; } -void showports(LINK) +static void showports(LINK) struct LOC_dologspc *LINK; { char buf[256]; @@ -1936,7 +1936,7 @@ struct LOC_dologspc *LINK; } -void dologspc(args_, LINK) +static void dologspc(args_, LINK) char *args_; struct LOC_Log_logspc_proc *LINK; { @@ -2133,7 +2133,7 @@ struct LOC_Log_logspc_proc *LINK; } -void probecommand(LINK) +static void probecommand(LINK) struct LOC_Log_logspc_proc *LINK; { na_strlist_t *defndir, *l1, *curdef; @@ -2278,7 +2278,7 @@ struct LOC_Log_logspc_proc *LINK; } -void identifycommand(args_, LINK) +static void identifycommand(args_, LINK) char *args_; struct LOC_Log_logspc_proc *LINK; { diff --git a/log/src/simdir.c b/log/src/simdir.c index 7fb5af05c4b908df10f83e08f7d3b06d46674707..eac27c3f8c9f673f8d8faa96d47f94d391438eae 100644 --- a/log/src/simdir.c +++ b/log/src/simdir.c @@ -5,21 +5,29 @@ extern void Log_0_proc(); extern void Log_16_proc(); +extern void Log_16_proc(); extern void Log_17_proc(); extern void Log_1_proc(); extern void Log_2_proc(); extern void Log_32_proc(); +extern void Log_32_proc(); extern void Log_33_proc(); +extern void Log_33_proc(); +extern void Log_7_proc(); extern void Log_7_proc(); struct ext_proc ext_proc_table[] = { "Log_0_proc", Log_0_proc, "Log_16_proc", Log_16_proc, + "Log_16_proc", Log_16_proc, "Log_17_proc", Log_17_proc, "Log_1_proc", Log_1_proc, "Log_2_proc", Log_2_proc, "Log_32_proc", Log_32_proc, + "Log_32_proc", Log_32_proc, "Log_33_proc", Log_33_proc, + "Log_33_proc", Log_33_proc, + "Log_7_proc", Log_7_proc, "Log_7_proc", Log_7_proc, NULL, NULL }; diff --git a/psys/include/p2c/newkbd.h b/psys/include/p2c/newkbd.h index d15bbecdca9bb9d580f326ec78caf36d2be72687..6dd536aaed2ae7d7b6d13c6ac9cbb1383b2bf4b7 100644 --- a/psys/include/p2c/newkbd.h +++ b/psys/include/p2c/newkbd.h @@ -6,6 +6,13 @@ #include <p2c/sysdevs.h> #include <p2c/misc.h> +#ifdef NEWKBD_G +#define vextern +#else +#define vextern extern +#endif + + #define nk_newkbddatestamp "Version of Jan 15, 1985 6:12 pm" @@ -69,13 +76,13 @@ typedef struct nk_remap_info { typedef nk_remap_info nk_remap_array[]; -extern char nk_error_fid[fidleng + 1]; -extern CRTWORD *nk_screen; +vextern char nk_error_fid[fidleng + 1]; +vextern CRTWORD *nk_screen; #define nk_screenhigh nc_highlight #define nk_screenwidth (80) /* vextern short nk_screenwidth, nk_screenhigh; */ -extern char (*nk_k0k9)[72]; -extern int nk_capslock; +vextern char (*nk_k0k9)[72]; +vextern int nk_capslock; diff --git a/psys/include/p2c/strings.h b/psys/include/p2c/strings.h index 9ce876b10c33916dd4dfc980103b9a9c0b22d81d..41a53d6b27a49eb043bcd5c76a17254697790daf 100644 --- a/psys/include/p2c/strings.h +++ b/psys/include/p2c/strings.h @@ -8,51 +8,51 @@ * * DEPRECATED : use strcat instead */ -void strsafeappend(char *s, char *s2) DEPRECATED; +extern void strsafeappend(char *s, char *s2) DEPRECATED; -//void strappendc(char *s, int ch); +//extern void strappendc(char *s, int ch); -char *strupper (char *result, char *s); -char *strlower (char *result, char *s); -char *strpart (char *result, char *s, long fist, long last); -char *strlast (char *result, char *s, size_t num); -char *strljust (char *result, char *s, long wid); -char *strrjust (char *result, char *s, long wid); -char *strcjust (char *result, char *s, long wid); -int strbegins (char *s1, char *s2); -int strends (char *s1, char *s2); -int strcibegins (char *s1, char *s2); -int strciends (char *s1, char *s2); -int strsubcmp (size_t n, char *s1, size_t i1, char *s2, size_t i2); -int strcisubcmp (size_t n, char *s1, size_t i1, char *s2, size_t i2); -void strsubst (char *repl, char *s, size_t index, size_t size); -char *strint (char *result, long i); -char *strint2 (char *result, long i, long w); -char *streal (char *result, double r); -char *strchar (char *result, int ch); -long strreadint (char *s); -double strreadreal (char *s); -size_t strposb (char *s1, char *s2, ptrdiff_t i); -size_t strposc (char *s1, char ch, ptrdiff_t i); -size_t strposcset (char *s1, char *s2, size_t i); -size_t strposbcset (char *s1, char *s2, size_t i); -size_t strpcipos2 (char *s1, char *s2, size_t i); -size_t strpciposb (char *s1, char *s2, size_t i); -int strpcontains (char *s1, char *s2); -int strsubset (char *s1, char *s2); -int strcommon (char *s1, char *s2); -size_t strlenv (char *s); -char *strhex (char * Result, long i, long w); -char *strbinary (char *Result, long i, size_t w); -char *stadate (char *Result, char *opts); -void strword (char *s, char *s2); -void strword2 (char *s, char *s2); -void strcomment (char *s, char* bracket); -void strcompress (char *s, char *chars, int all); -void strdispose (char **sp); -void strchange (char** sp, char *); -char *strcpy_overlap(char *dst, char *src); -char *strdate( char *res, char *opts); +extern char *strupper (char *result, char *s); +extern char *strlower (char *result, char *s); +extern char *strpart (char *result, char *s, long fist, long last); +extern char *strlast (char *result, char *s, size_t num); +extern char *strljust (char *result, char *s, long wid); +extern char *strrjust (char *result, char *s, long wid); +extern char *strcjust (char *result, char *s, size_t wid); +extern int strbegins (char *s1, char *s2); +extern int strends (char *s1, char *s2); +extern int strcibegins (char *s1, char *s2); +extern int strciends (char *s1, char *s2); +extern int strsubcmp (size_t n, char *s1, size_t i1, char *s2, size_t i2); +extern int strcisubcmp (size_t n, char *s1, size_t i1, char *s2, size_t i2); +extern void strsubst (char *repl, char *s, size_t index, size_t size); +extern char *strint (char *result, long i); +extern char *strint2 (char *result, long i, long w); +extern char *streal (char *result, double r); +extern char *strchar (char *result, int ch); +extern long strreadint (char *s); +extern double strreadreal (char *s); +extern size_t strposb (char *s1, char *s2, ptrdiff_t i); +extern size_t strposc (char *s1, char ch, ptrdiff_t i); +extern size_t strposcset (char *s1, char *s2, size_t i); +extern size_t strposbcset (char *s1, char *s2, size_t i); +extern size_t strpcipos2 (char *s1, char *s2, size_t i); +extern size_t strpciposb (char *s1, char *s2, size_t i); +extern int strpcontains (char *s1, char *s2); +extern int strsubset (char *s1, char *s2); +extern int strcommon (char *s1, char *s2); +extern size_t strlenv (char *s); +extern char *strhex (char * Result, long i, long w); +extern char *strbinary (char *Result, long i, size_t w); +extern char *stadate (char *Result, char *opts); +extern void strword (char *s, char *s2); +extern void strword2 (char *s, char *s2); +extern void strcomment (char *s, char* bracket); +extern void strcompress (char *s, char *chars, int all); +extern void strdispose (char **sp); +extern void strchange (char** sp, char *); +extern char *strcpy_overlap(char *dst, char *src); +extern char *strdate( char *res, char *opts); #endif diff --git a/psys/src/strings.c b/psys/src/strings.c index 24a78846039a6ff055cee984bde12938ac4b8080..1c0ab45028e6d1867383359951d86aafdb9e6d24 100644 --- a/psys/src/strings.c +++ b/psys/src/strings.c @@ -46,7 +46,7 @@ char *strlast(char *result, char *s, size_t num) return strcpy(result, cp); } -char *strjust(char *result, char *s, size_t wid) +char *strcjust(char *result, char *s, size_t wid) { size_t len = strlen(s); ptrdiff_t wid2;