No usage of C99 Designated Initializers

src/spicelib/devices/asrc/asrcinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "asrcitf.h"
 #include "asrcext.h"
@@ -41,39 +41,39 @@ SPICEdev ASRCinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : ASRCparam,
-    DEVmodParam   : NULL,
-    DEVload       : ASRCload,
-    DEVsetup      : ASRCsetup,
-    DEVunsetup    : ASRCunsetup,
-    DEVpzSetup    : ASRCsetup,
-    DEVtemperature: NULL,
-    DEVtrunc      : NULL,
-    DEVfindBranch : ASRCfindBr,
-    DEVacLoad     : ASRCacLoad,   /* ac and normal load functions NOT identical */
-    DEVaccept     : NULL,
-    DEVdestroy    : ASRCdestroy,
-    DEVmodDelete  : ASRCmDelete,
-    DEVdelete     : ASRCdelete,
-    DEVsetic      : NULL,
-    DEVask        : ASRCask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : ASRCpzLoad,
-    DEVconvTest   : ASRCconvTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ ASRCparam,
+ /* DEVmodParam   */ NULL,
+ /* DEVload       */ ASRCload,
+ /* DEVsetup      */ ASRCsetup,
+ /* DEVunsetup    */ ASRCunsetup,
+ /* DEVpzSetup    */ ASRCsetup,
+ /* DEVtemperature*/ NULL,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ ASRCfindBr,
+ /* DEVacLoad     */ ASRCacLoad,   /* ac and normal load functions NOT identical */
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ ASRCdestroy,
+ /* DEVmodDelete  */ ASRCmDelete,
+ /* DEVdelete     */ ASRCdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ ASRCask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ ASRCpzLoad,
+ /* DEVconvTest   */ ASRCconvTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump	  : NULL,
-    DEVacct       : NULL,
+ /* DEVdump	  */ NULL,
+ /* DEVacct       */ NULL,
 #endif                    
-    DEVinstSize   : &ASRCiSize,
-    DEVmodSize    : &ASRCmSize
+ /* DEVinstSize   */ &ASRCiSize,
+ /* DEVmodSize    */ &ASRCmSize
 };
 
 

src/spicelib/devices/bjt/bjtinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bjtitf.h"
 #include "bjtext.h"
@@ -40,39 +40,39 @@ SPICEdev BJTinfo = {                  /* description from struct IFdevice  */
       DEV_DEFAULT                     /*  int flags                */
     },
     
-    DEVparam      : BJTparam,
-    DEVmodParam   : BJTmParam,
-    DEVload       : BJTload,
-    DEVsetup      : BJTsetup,
-    DEVunsetup    : BJTunsetup,
-    DEVpzSetup    : BJTsetup,
-    DEVtemperature: BJTtemp,
-    DEVtrunc      : BJTtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BJTacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BJTdestroy,
-    DEVmodDelete  : BJTmDelete,
-    DEVdelete     : BJTdelete,
-    DEVsetic      : BJTgetic,
-    DEVask        : BJTask,
-    DEVmodAsk     : BJTmAsk,
-    DEVpzLoad     : BJTpzLoad,
-    DEVconvTest   : BJTconvTest,
-    DEVsenSetup   : BJTsSetup,
-    DEVsenLoad    : BJTsLoad,
-    DEVsenUpdate  : BJTsUpdate,
-    DEVsenAcLoad  : BJTsAcLoad,
-    DEVsenPrint   : BJTsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : BJTdisto,
-    DEVnoise      : BJTnoise,
+ /* DEVparam      */ BJTparam,
+ /* DEVmodParam   */ BJTmParam,
+ /* DEVload       */ BJTload,
+ /* DEVsetup      */ BJTsetup,
+ /* DEVunsetup    */ BJTunsetup,
+ /* DEVpzSetup    */ BJTsetup,
+ /* DEVtemperature*/ BJTtemp,
+ /* DEVtrunc      */ BJTtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BJTacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BJTdestroy,
+ /* DEVmodDelete  */ BJTmDelete,
+ /* DEVdelete     */ BJTdelete,
+ /* DEVsetic      */ BJTgetic,
+ /* DEVask        */ BJTask,
+ /* DEVmodAsk     */ BJTmAsk,
+ /* DEVpzLoad     */ BJTpzLoad,
+ /* DEVconvTest   */ BJTconvTest,
+ /* DEVsenSetup   */ BJTsSetup,
+ /* DEVsenLoad    */ BJTsLoad,
+ /* DEVsenUpdate  */ BJTsUpdate,
+ /* DEVsenAcLoad  */ BJTsAcLoad,
+ /* DEVsenPrint   */ BJTsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ BJTdisto,
+ /* DEVnoise      */ BJTnoise,
 #ifdef CIDER
-    DEVdump	  : NULL,
-    DEVacct       : NULL,
+ /* DEVdump	  */ NULL,
+ /* DEVacct       */ NULL,
 #endif                     
-    DEVinstSize   : &BJTiSize,
-    DEVmodSize    : &BJTmSize
+ /* DEVinstSize   */ &BJTiSize,
+ /* DEVmodSize    */ &BJTmSize
 
 };
 

src/spicelib/devices/bjt2/bjt2init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bjt2itf.h"
 #include "bjt2ext.h"
@@ -40,39 +40,39 @@ SPICEdev BJT2info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : BJT2param,
-    DEVmodParam   : BJT2mParam,
-    DEVload       : BJT2load,
-    DEVsetup      : BJT2setup,
-    DEVunsetup    : BJT2unsetup,
-    DEVpzSetup    : BJT2setup,
-    DEVtemperature: BJT2temp,
-    DEVtrunc      : BJT2trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BJT2acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BJT2destroy,
-    DEVmodDelete  : BJT2mDelete,
-    DEVdelete     : BJT2delete,
-    DEVsetic      : BJT2getic,
-    DEVask        : BJT2ask,
-    DEVmodAsk     : BJT2mAsk,
-    DEVpzLoad     : BJT2pzLoad,
-    DEVconvTest   : BJT2convTest,
-    DEVsenSetup   : BJT2sSetup,
-    DEVsenLoad    : BJT2sLoad,
-    DEVsenUpdate  : BJT2sUpdate,
-    DEVsenAcLoad  : BJT2sAcLoad,
-    DEVsenPrint   : BJT2sPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : BJT2disto,
-    DEVnoise      : BJT2noise,
+ /* DEVparam      */ BJT2param,
+ /* DEVmodParam   */ BJT2mParam,
+ /* DEVload       */ BJT2load,
+ /* DEVsetup      */ BJT2setup,
+ /* DEVunsetup    */ BJT2unsetup,
+ /* DEVpzSetup    */ BJT2setup,
+ /* DEVtemperature*/ BJT2temp,
+ /* DEVtrunc      */ BJT2trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BJT2acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BJT2destroy,
+ /* DEVmodDelete  */ BJT2mDelete,
+ /* DEVdelete     */ BJT2delete,
+ /* DEVsetic      */ BJT2getic,
+ /* DEVask        */ BJT2ask,
+ /* DEVmodAsk     */ BJT2mAsk,
+ /* DEVpzLoad     */ BJT2pzLoad,
+ /* DEVconvTest   */ BJT2convTest,
+ /* DEVsenSetup   */ BJT2sSetup,
+ /* DEVsenLoad    */ BJT2sLoad,
+ /* DEVsenUpdate  */ BJT2sUpdate,
+ /* DEVsenAcLoad  */ BJT2sAcLoad,
+ /* DEVsenPrint   */ BJT2sPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ BJT2disto,
+ /* DEVnoise      */ BJT2noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                    
-    DEVinstSize   : &BJT2iSize,
-    DEVmodSize    : &BJT2mSize
+ /* DEVinstSize   */ &BJT2iSize,
+ /* DEVmodSize    */ &BJT2mSize
 
 };
 

src/spicelib/devices/bsim1/bsim1init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bsim1itf.h"
 #include "bsim1ext.h"
@@ -40,39 +40,39 @@ SPICEdev B1info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : B1param,
-    DEVmodParam   : B1mParam,
-    DEVload       : B1load,
-    DEVsetup      : B1setup,
-    DEVunsetup    : B1unsetup,
-    DEVpzSetup    : B1setup,
-    DEVtemperature: B1temp,
-    DEVtrunc      : B1trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : B1acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : B1destroy,
-    DEVmodDelete  : B1mDelete,
-    DEVdelete     : B1delete, 
-    DEVsetic      : B1getic,
-    DEVask        : B1ask,
-    DEVmodAsk     : B1mAsk,
-    DEVpzLoad     : B1pzLoad,
-    DEVconvTest   : B1convTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : B1disto,
-    DEVnoise      : B1noise,	/* NOISE */
+ /* DEVparam      */ B1param,
+ /* DEVmodParam   */ B1mParam,
+ /* DEVload       */ B1load,
+ /* DEVsetup      */ B1setup,
+ /* DEVunsetup    */ B1unsetup,
+ /* DEVpzSetup    */ B1setup,
+ /* DEVtemperature*/ B1temp,
+ /* DEVtrunc      */ B1trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ B1acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ B1destroy,
+ /* DEVmodDelete  */ B1mDelete,
+ /* DEVdelete     */ B1delete, 
+ /* DEVsetic      */ B1getic,
+ /* DEVask        */ B1ask,
+ /* DEVmodAsk     */ B1mAsk,
+ /* DEVpzLoad     */ B1pzLoad,
+ /* DEVconvTest   */ B1convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ B1disto,
+ /* DEVnoise      */ B1noise,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif    
-    DEVinstSize   : &B1iSize,
-    DEVmodSize    : &B1mSize
+ /* DEVinstSize   */ &B1iSize,
+ /* DEVmodSize    */ &B1mSize
 
 };
 

src/spicelib/devices/bsim2/bsim2init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bsim2itf.h"
 #include "bsim2ext.h"
@@ -40,39 +40,39 @@ SPICEdev B2info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : B2param,
-    DEVmodParam   : B2mParam,
-    DEVload       : B2load,
-    DEVsetup      : B2setup,
-    DEVunsetup    : B2unsetup,
-    DEVpzSetup    : B2setup,
-    DEVtemperature: B2temp,
-    DEVtrunc      : B2trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : B2acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : B2destroy,
-    DEVmodDelete  : B2mDelete,
-    DEVdelete     : B2delete, 
-    DEVsetic      : B2getic,
-    DEVask        : B2ask,
-    DEVmodAsk     : B2mAsk,
-    DEVpzLoad     : B2pzLoad,
-    DEVconvTest   : B2convTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : B2noise,
+ /* DEVparam      */ B2param,
+ /* DEVmodParam   */ B2mParam,
+ /* DEVload       */ B2load,
+ /* DEVsetup      */ B2setup,
+ /* DEVunsetup    */ B2unsetup,
+ /* DEVpzSetup    */ B2setup,
+ /* DEVtemperature*/ B2temp,
+ /* DEVtrunc      */ B2trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ B2acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ B2destroy,
+ /* DEVmodDelete  */ B2mDelete,
+ /* DEVdelete     */ B2delete, 
+ /* DEVsetic      */ B2getic,
+ /* DEVask        */ B2ask,
+ /* DEVmodAsk     */ B2mAsk,
+ /* DEVpzLoad     */ B2pzLoad,
+ /* DEVconvTest   */ B2convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ B2noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif    
-    DEVinstSize   : &B2iSize,
-    DEVmodSize    : &B2mSize
+ /* DEVinstSize   */ &B2iSize,
+ /* DEVmodSize    */ &B2mSize
 
 };
 

src/spicelib/devices/bsim3/bsim3init.c

@@ -39,39 +39,39 @@ SPICEdev BSIM3info = {
         DEV_DEFAULT
     },
 
-    DEVparam      : BSIM3param,
-    DEVmodParam   : BSIM3mParam,
-    DEVload       : BSIM3load,
-    DEVsetup      : BSIM3setup,
-    DEVunsetup    : BSIM3unsetup,
-    DEVpzSetup    : BSIM3setup,
-    DEVtemperature: BSIM3temp,
-    DEVtrunc      : BSIM3trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BSIM3acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BSIM3destroy,
-    DEVmodDelete  : BSIM3mDelete,
-    DEVdelete     : BSIM3delete, 
-    DEVsetic      : BSIM3getic,
-    DEVask        : BSIM3ask,
-    DEVmodAsk     : BSIM3mAsk,
-    DEVpzLoad     : BSIM3pzLoad,
-    DEVconvTest   : BSIM3convTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : BSIM3noise,
+ /* DEVparam      */ BSIM3param,
+ /* DEVmodParam   */ BSIM3mParam,
+ /* DEVload       */ BSIM3load,
+ /* DEVsetup      */ BSIM3setup,
+ /* DEVunsetup    */ BSIM3unsetup,
+ /* DEVpzSetup    */ BSIM3setup,
+ /* DEVtemperature*/ BSIM3temp,
+ /* DEVtrunc      */ BSIM3trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BSIM3acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BSIM3destroy,
+ /* DEVmodDelete  */ BSIM3mDelete,
+ /* DEVdelete     */ BSIM3delete, 
+ /* DEVsetic      */ BSIM3getic,
+ /* DEVask        */ BSIM3ask,
+ /* DEVmodAsk     */ BSIM3mAsk,
+ /* DEVpzLoad     */ BSIM3pzLoad,
+ /* DEVconvTest   */ BSIM3convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ BSIM3noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                       
-    DEVinstSize   : &BSIM3iSize,
-    DEVmodSize    : &BSIM3mSize
+ /* DEVinstSize   */ &BSIM3iSize,
+ /* DEVmodSize    */ &BSIM3mSize
 
 };
 

src/spicelib/devices/bsim3soi/b3soiinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "b3soiitf.h"
 #include "b3soiext.h"
@@ -39,39 +39,39 @@ SPICEdev B3SOIinfo = {
 	
     },
 
-    DEVparam      : B3SOIparam,
-    DEVmodParam   : B3SOImParam,
-    DEVload       : B3SOIload,
-    DEVsetup      : B3SOIsetup,
-    DEVunsetup    : B3SOIunsetup,
-    DEVpzSetup    : B3SOIsetup,
-    DEVtemperature: B3SOItemp,
-    DEVtrunc      : B3SOItrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : B3SOIacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : B3SOIdestroy,
-    DEVmodDelete  : B3SOImDelete,
-    DEVdelete     : B3SOIdelete, 
-    DEVsetic      : B3SOIgetic,
-    DEVask        : B3SOIask,
-    DEVmodAsk     : B3SOImAsk,
-    DEVpzLoad     : B3SOIpzLoad,
-    DEVconvTest   : B3SOIconvTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : B3SOInoise,
+ /* DEVparam      */ B3SOIparam,
+ /* DEVmodParam   */ B3SOImParam,
+ /* DEVload       */ B3SOIload,
+ /* DEVsetup      */ B3SOIsetup,
+ /* DEVunsetup    */ B3SOIunsetup,
+ /* DEVpzSetup    */ B3SOIsetup,
+ /* DEVtemperature*/ B3SOItemp,
+ /* DEVtrunc      */ B3SOItrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ B3SOIacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ B3SOIdestroy,
+ /* DEVmodDelete  */ B3SOImDelete,
+ /* DEVdelete     */ B3SOIdelete, 
+ /* DEVsetic      */ B3SOIgetic,
+ /* DEVask        */ B3SOIask,
+ /* DEVmodAsk     */ B3SOImAsk,
+ /* DEVpzLoad     */ B3SOIpzLoad,
+ /* DEVconvTest   */ B3SOIconvTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ B3SOInoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif
-    DEVinstSize   : &B3SOIiSize,
-    DEVmodSize    : &B3SOImSize
+ /* DEVinstSize   */ &B3SOIiSize,
+ /* DEVmodSize    */ &B3SOImSize
 };
 
 SPICEdev *

src/spicelib/devices/bsim3soi_dd/b3soiddinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "b3soidditf.h"
 #include "b3soiddext.h"
@@ -38,39 +38,39 @@ SPICEdev B3SOIDDinfo = {
 	
     },
 
-    DEVparam      : B3SOIDDparam,
-    DEVmodParam   : B3SOIDDmParam,
-    DEVload       : B3SOIDDload,
-    DEVsetup      : B3SOIDDsetup,
-    DEVunsetup    : B3SOIDDunsetup,
-    DEVpzSetup    : B3SOIDDsetup,
-    DEVtemperature: B3SOIDDtemp,
-    DEVtrunc      : B3SOIDDtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : B3SOIDDacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : B3SOIDDdestroy,
-    DEVmodDelete  : B3SOIDDmDelete,
-    DEVdelete     : B3SOIDDdelete, 
-    DEVsetic      : B3SOIDDgetic,
-    DEVask        : B3SOIDDask,
-    DEVmodAsk     : B3SOIDDmAsk,
-    DEVpzLoad     : B3SOIDDpzLoad,
-    DEVconvTest   : B3SOIDDconvTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : B3SOIDDnoise,
+ /* DEVparam      */ B3SOIDDparam,
+ /* DEVmodParam   */ B3SOIDDmParam,
+ /* DEVload       */ B3SOIDDload,
+ /* DEVsetup      */ B3SOIDDsetup,
+ /* DEVunsetup    */ B3SOIDDunsetup,
+ /* DEVpzSetup    */ B3SOIDDsetup,
+ /* DEVtemperature*/ B3SOIDDtemp,
+ /* DEVtrunc      */ B3SOIDDtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ B3SOIDDacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ B3SOIDDdestroy,
+ /* DEVmodDelete  */ B3SOIDDmDelete,
+ /* DEVdelete     */ B3SOIDDdelete, 
+ /* DEVsetic      */ B3SOIDDgetic,
+ /* DEVask        */ B3SOIDDask,
+ /* DEVmodAsk     */ B3SOIDDmAsk,
+ /* DEVpzLoad     */ B3SOIDDpzLoad,
+ /* DEVconvTest   */ B3SOIDDconvTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ B3SOIDDnoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif
-    DEVinstSize   : &B3SOIDDiSize,
-    DEVmodSize    : &B3SOIDDmSize
+ /* DEVinstSize   */ &B3SOIDDiSize,
+ /* DEVmodSize    */ &B3SOIDDmSize
 };
 
 SPICEdev *

src/spicelib/devices/bsim3soi_fd/b3soifdinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "b3soifditf.h"
 #include "b3soifdext.h"
@@ -39,39 +39,39 @@ SPICEdev B3SOIFDinfo = {
 	
     },
 
-    DEVparam      : B3SOIFDparam,
-    DEVmodParam   : B3SOIFDmParam,
-    DEVload       : B3SOIFDload,
-    DEVsetup      : B3SOIFDsetup,
-    DEVunsetup    : B3SOIFDunsetup,
-    DEVpzSetup    : B3SOIFDsetup,
-    DEVtemperature: B3SOIFDtemp,
-    DEVtrunc      : B3SOIFDtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : B3SOIFDacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : B3SOIFDdestroy,
-    DEVmodDelete  : B3SOIFDmDelete,
-    DEVdelete     : B3SOIFDdelete, 
-    DEVsetic      : B3SOIFDgetic,
-    DEVask        : B3SOIFDask,
-    DEVmodAsk     : B3SOIFDmAsk,
-    DEVpzLoad     : B3SOIFDpzLoad,
-    DEVconvTest   : B3SOIFDconvTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : B3SOIFDnoise,
+ /* DEVparam      */ B3SOIFDparam,
+ /* DEVmodParam   */ B3SOIFDmParam,
+ /* DEVload       */ B3SOIFDload,
+ /* DEVsetup      */ B3SOIFDsetup,
+ /* DEVunsetup    */ B3SOIFDunsetup,
+ /* DEVpzSetup    */ B3SOIFDsetup,
+ /* DEVtemperature*/ B3SOIFDtemp,
+ /* DEVtrunc      */ B3SOIFDtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ B3SOIFDacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ B3SOIFDdestroy,
+ /* DEVmodDelete  */ B3SOIFDmDelete,
+ /* DEVdelete     */ B3SOIFDdelete, 
+ /* DEVsetic      */ B3SOIFDgetic,
+ /* DEVask        */ B3SOIFDask,
+ /* DEVmodAsk     */ B3SOIFDmAsk,
+ /* DEVpzLoad     */ B3SOIFDpzLoad,
+ /* DEVconvTest   */ B3SOIFDconvTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ B3SOIFDnoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif    
-    DEVinstSize:	&B3SOIFDiSize,
-    DEVmodSize:	&B3SOIFDmSize
+ /* DEVinstSize*/	&B3SOIFDiSize,
+ /* DEVmodSize*/	&B3SOIFDmSize
 };
 
 

src/spicelib/devices/bsim3soi_pd/b3soipdinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "b3soipditf.h"
 #include "b3soipdext.h"
@@ -36,43 +36,43 @@ SPICEdev B3SOIPDinfo = {
 /*---------------------------  End of SDB fix   -------------------------*/
 #endif	
    
-   DEV_DEFAULT
+  DEV_DEFAULT
    
     },
 
-    DEVparam:       B3SOIPDparam,
-    DEVmodParam:    B3SOIPDmParam,
-    DEVload:        B3SOIPDload,
-    DEVsetup:       B3SOIPDsetup,
-    DEVunsetup:     B3SOIPDunsetup,
-    DEVpzSetup:     B3SOIPDsetup,
-    DEVtemperature: B3SOIPDtemp,
-    DEVtrunc:       B3SOIPDtrunc,
-    DEVfindBranch:  NULL,
-    DEVacLoad:      B3SOIPDacLoad,
-    DEVaccept:      NULL,
-    DEVdestroy:     B3SOIPDdestroy,
-    DEVmodDelete:   B3SOIPDmDelete,
-    DEVdelete:      B3SOIPDdelete,
-    DEVsetic:       B3SOIPDgetic,
-    DEVask:         B3SOIPDask,
-    DEVmodAsk:      B3SOIPDmAsk,
-    DEVpzLoad:      B3SOIPDpzLoad,
-    DEVconvTest:    B3SOIPDconvTest,
-    DEVsenSetup:    NULL,
-    DEVsenLoad:     NULL,
-    DEVsenUpdate:   NULL,
-    DEVsenAcLoad:   NULL,
-    DEVsenPrint:    NULL,
-    DEVsenTrunc:    NULL,
-    DEVdisto:       NULL,
-    DEVnoise:       B3SOIPDnoise,
+ /* DEVparam*/       B3SOIPDparam,
+ /* DEVmodParam*/    B3SOIPDmParam,
+ /* DEVload*/        B3SOIPDload,
+ /* DEVsetup*/       B3SOIPDsetup,
+ /* DEVunsetup*/     B3SOIPDunsetup,
+ /* DEVpzSetup*/     B3SOIPDsetup,
+ /* DEVtemperature*/ B3SOIPDtemp,
+ /* DEVtrunc*/       B3SOIPDtrunc,
+ /* DEVfindBranch*/  NULL,
+ /* DEVacLoad*/      B3SOIPDacLoad,
+ /* DEVaccept*/      NULL,
+ /* DEVdestroy*/     B3SOIPDdestroy,
+ /* DEVmodDelete*/   B3SOIPDmDelete,
+ /* DEVdelete*/      B3SOIPDdelete,
+ /* DEVsetic*/       B3SOIPDgetic,
+ /* DEVask*/         B3SOIPDask,
+ /* DEVmodAsk*/      B3SOIPDmAsk,
+ /* DEVpzLoad*/      B3SOIPDpzLoad,
+ /* DEVconvTest*/    B3SOIPDconvTest,
+ /* DEVsenSetup*/    NULL,
+ /* DEVsenLoad*/     NULL,
+ /* DEVsenUpdate*/   NULL,
+ /* DEVsenAcLoad*/   NULL,
+ /* DEVsenPrint*/    NULL,
+ /* DEVsenTrunc*/    NULL,
+ /* DEVdisto*/       NULL,
+ /* DEVnoise*/       B3SOIPDnoise,
 #ifdef CIDER
-    DEVdump:        NULL,
-    DEVacct:        NULL,
+ /* DEVdump*/        NULL,
+ /* DEVacct*/        NULL,
 #endif
-    DEVinstSize:   &B3SOIPDiSize,
-    DEVmodSize:    &B3SOIPDmSize
+ /* DEVinstSize*/   &B3SOIPDiSize,
+ /* DEVmodSize*/    &B3SOIPDmSize
 };
 
 SPICEdev *

src/spicelib/devices/bsim3v0/bsim3v0init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bsim3v0itf.h"
 #include "bsim3v0ext.h"
@@ -38,39 +38,39 @@ SPICEdev B3v0info = {
         DEV_DEFAULT    
     },
 
-    DEVparam      : BSIM3v0param,
-    DEVmodParam   : BSIM3v0mParam,
-    DEVload       : BSIM3v0load,
-    DEVsetup      : BSIM3v0setup,  
-    DEVunsetup    : BSIM3v0unsetup,
-    DEVpzSetup    : BSIM3v0setup,
-    DEVtemperature: BSIM3v0temp,
-    DEVtrunc      : BSIM3v0trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BSIM3v0acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BSIM3v0destroy, 
-    DEVmodDelete  : BSIM3v0mDelete,
-    DEVdelete     : BSIM3v0delete,  
-    DEVsetic      : BSIM3v0getic,
-    DEVask        : BSIM3v0ask,
-    DEVmodAsk     : BSIM3v0mAsk, 
-    DEVpzLoad     : BSIM3v0pzLoad,    
-    DEVconvTest   : BSIM3v0convTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,        
-    DEVnoise      : BSIM3v0noise,
+ /* DEVparam      */ BSIM3v0param,
+ /* DEVmodParam   */ BSIM3v0mParam,
+ /* DEVload       */ BSIM3v0load,
+ /* DEVsetup      */ BSIM3v0setup,  
+ /* DEVunsetup    */ BSIM3v0unsetup,
+ /* DEVpzSetup    */ BSIM3v0setup,
+ /* DEVtemperature*/ BSIM3v0temp,
+ /* DEVtrunc      */ BSIM3v0trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BSIM3v0acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BSIM3v0destroy, 
+ /* DEVmodDelete  */ BSIM3v0mDelete,
+ /* DEVdelete     */ BSIM3v0delete,  
+ /* DEVsetic      */ BSIM3v0getic,
+ /* DEVask        */ BSIM3v0ask,
+ /* DEVmodAsk     */ BSIM3v0mAsk, 
+ /* DEVpzLoad     */ BSIM3v0pzLoad,    
+ /* DEVconvTest   */ BSIM3v0convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,        
+ /* DEVnoise      */ BSIM3v0noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                    
-    DEVinstSize   : &BSIM3v0iSize,
-    DEVmodSize    : &BSIM3v0mSize
+ /* DEVinstSize   */ &BSIM3v0iSize,
+ /* DEVmodSize    */ &BSIM3v0mSize
 
 };
 

src/spicelib/devices/bsim3v1/bsim3v1init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bsim3v1itf.h"
 #include "bsim3v1ext.h"
@@ -38,39 +38,39 @@ SPICEdev B3v1info = {
         DEV_DEFAULT
     },
 
-    DEVparam      : BSIM3v1param,
-    DEVmodParam   : BSIM3v1mParam,
-    DEVload       : BSIM3v1load,
-    DEVsetup      : BSIM3v1setup,  
-    DEVunsetup    : BSIM3v1unsetup,
-    DEVpzSetup    : BSIM3v1setup,
-    DEVtemperature: BSIM3v1temp,
-    DEVtrunc      : BSIM3v1trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BSIM3v1acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BSIM3v1destroy, 
-    DEVmodDelete  : BSIM3v1mDelete,
-    DEVdelete     : BSIM3v1delete,  
-    DEVsetic      : BSIM3v1getic,
-    DEVask        : BSIM3v1ask,
-    DEVmodAsk     : BSIM3v1mAsk, 
-    DEVpzLoad     : BSIM3v1pzLoad,    
-    DEVconvTest   : BSIM3v1convTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,        
-    DEVnoise      : BSIM3v1noise,
+ /* DEVparam      */ BSIM3v1param,
+ /* DEVmodParam   */ BSIM3v1mParam,
+ /* DEVload       */ BSIM3v1load,
+ /* DEVsetup      */ BSIM3v1setup,  
+ /* DEVunsetup    */ BSIM3v1unsetup,
+ /* DEVpzSetup    */ BSIM3v1setup,
+ /* DEVtemperature*/ BSIM3v1temp,
+ /* DEVtrunc      */ BSIM3v1trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BSIM3v1acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BSIM3v1destroy, 
+ /* DEVmodDelete  */ BSIM3v1mDelete,
+ /* DEVdelete     */ BSIM3v1delete,  
+ /* DEVsetic      */ BSIM3v1getic,
+ /* DEVask        */ BSIM3v1ask,
+ /* DEVmodAsk     */ BSIM3v1mAsk, 
+ /* DEVpzLoad     */ BSIM3v1pzLoad,    
+ /* DEVconvTest   */ BSIM3v1convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,        
+ /* DEVnoise      */ BSIM3v1noise,
 #ifdef CIDER    
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                    
-    DEVinstSize   : &BSIM3v1iSize,
-    DEVmodSize    : &BSIM3v1mSize
+ /* DEVinstSize   */ &BSIM3v1iSize,
+ /* DEVmodSize    */ &BSIM3v1mSize
 
 };
 

src/spicelib/devices/bsim3v1a/bsim3v1ainit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bsim3v1aitf.h"
 #include "bsim3v1aext.h"
@@ -41,39 +41,39 @@ SPICEdev B3v1Ainfo = {
 
     },
 
-    DEVparam      : BSIM3v1Aparam,
-    DEVmodParam   : BSIM3v1AmParam,
-    DEVload       : BSIM3v1Aload,
-    DEVsetup      : BSIM3v1Asetup,
-    DEVunsetup    : BSIM3v1Aunsetup,
-    DEVpzSetup    : BSIM3v1Asetup,
-    DEVtemperature: BSIM3v1Atemp,
-    DEVtrunc      : BSIM3v1Atrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BSIM3v1AacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BSIM3v1Adestroy,
-    DEVmodDelete  : BSIM3v1AmDelete,
-    DEVdelete     : BSIM3v1Adelete, 
-    DEVsetic      : BSIM3v1Agetic,
-    DEVask        : BSIM3v1Aask,
-    DEVmodAsk     : BSIM3v1AmAsk,
-    DEVpzLoad     : BSIM3v1ApzLoad,
-    DEVconvTest   : BSIM3v1AconvTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : BSIM3v1Anoise,
+ /* DEVparam      */ BSIM3v1Aparam,
+ /* DEVmodParam   */ BSIM3v1AmParam,
+ /* DEVload       */ BSIM3v1Aload,
+ /* DEVsetup      */ BSIM3v1Asetup,
+ /* DEVunsetup    */ BSIM3v1Aunsetup,
+ /* DEVpzSetup    */ BSIM3v1Asetup,
+ /* DEVtemperature*/ BSIM3v1Atemp,
+ /* DEVtrunc      */ BSIM3v1Atrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BSIM3v1AacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BSIM3v1Adestroy,
+ /* DEVmodDelete  */ BSIM3v1AmDelete,
+ /* DEVdelete     */ BSIM3v1Adelete, 
+ /* DEVsetic      */ BSIM3v1Agetic,
+ /* DEVask        */ BSIM3v1Aask,
+ /* DEVmodAsk     */ BSIM3v1AmAsk,
+ /* DEVpzLoad     */ BSIM3v1ApzLoad,
+ /* DEVconvTest   */ BSIM3v1AconvTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ BSIM3v1Anoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                    
-    DEVinstSize   : &BSIM3v1AiSize,
-    DEVmodSize    : &BSIM3v1AmSize
+ /* DEVinstSize   */ &BSIM3v1AiSize,
+ /* DEVmodSize    */ &BSIM3v1AmSize
 
 };
 

src/spicelib/devices/bsim3v1s/bsim3v1sinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bsim3v1sitf.h"
 #include "bsim3v1sext.h"
@@ -45,39 +45,39 @@ SPICEdev BSIM3v1Sinfo = {
 	DEV_DEFAULT,
     },
 
-    DEVparam      : BSIM3v1Sparam,
-    DEVmodParam   : BSIM3v1SmParam,
-    DEVload       : BSIM3v1Sload,
-    DEVsetup      : BSIM3v1Ssetup,
-    DEVunsetup    : BSIM3v1Sunsetup,
-    DEVpzSetup    : BSIM3v1Ssetup,
-    DEVtemperature: BSIM3v1Stemp,
-    DEVtrunc      : BSIM3v1Strunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BSIM3v1SacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BSIM3v1Sdestroy,
-    DEVmodDelete  : BSIM3v1SmDelete,
-    DEVdelete     : BSIM3v1Sdelete, 
-    DEVsetic      : BSIM3v1Sgetic,
-    DEVask        : BSIM3v1Sask,
-    DEVmodAsk     : BSIM3v1SmAsk,
-    DEVpzLoad     : BSIM3v1SpzLoad,
-    DEVconvTest   : BSIM3v1SconvTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : BSIM3v1Snoise,
+ /* DEVparam      */ BSIM3v1Sparam,
+ /* DEVmodParam   */ BSIM3v1SmParam,
+ /* DEVload       */ BSIM3v1Sload,
+ /* DEVsetup      */ BSIM3v1Ssetup,
+ /* DEVunsetup    */ BSIM3v1Sunsetup,
+ /* DEVpzSetup    */ BSIM3v1Ssetup,
+ /* DEVtemperature*/ BSIM3v1Stemp,
+ /* DEVtrunc      */ BSIM3v1Strunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BSIM3v1SacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BSIM3v1Sdestroy,
+ /* DEVmodDelete  */ BSIM3v1SmDelete,
+ /* DEVdelete     */ BSIM3v1Sdelete, 
+ /* DEVsetic      */ BSIM3v1Sgetic,
+ /* DEVask        */ BSIM3v1Sask,
+ /* DEVmodAsk     */ BSIM3v1SmAsk,
+ /* DEVpzLoad     */ BSIM3v1SpzLoad,
+ /* DEVconvTest   */ BSIM3v1SconvTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ BSIM3v1Snoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                    
-    DEVinstSize   : &BSIM3v1SiSize,
-    DEVmodSize    : &BSIM3v1SmSize
+ /* DEVinstSize   */ &BSIM3v1SiSize,
+ /* DEVmodSize    */ &BSIM3v1SmSize
 
 };
 

src/spicelib/devices/bsim3v32/bsim3v32init.c

@@ -39,39 +39,39 @@ SPICEdev BSIM3v32info = {
         DEV_DEFAULT
     },
 
-    DEVparam      : BSIM3v32param,
-    DEVmodParam   : BSIM3v32mParam,
-    DEVload       : BSIM3v32load,
-    DEVsetup      : BSIM3v32setup,
-    DEVunsetup    : BSIM3v32unsetup,
-    DEVpzSetup    : BSIM3v32setup,
-    DEVtemperature: BSIM3v32temp,
-    DEVtrunc      : BSIM3v32trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BSIM3v32acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BSIM3v32destroy,
-    DEVmodDelete  : BSIM3v32mDelete,
-    DEVdelete     : BSIM3v32delete, 
-    DEVsetic      : BSIM3v32getic,
-    DEVask        : BSIM3v32ask,
-    DEVmodAsk     : BSIM3v32mAsk,
-    DEVpzLoad     : BSIM3v32pzLoad,
-    DEVconvTest   : BSIM3v32convTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : BSIM3v32noise,
+ /* DEVparam      */ BSIM3v32param,
+ /* DEVmodParam   */ BSIM3v32mParam,
+ /* DEVload       */ BSIM3v32load,
+ /* DEVsetup      */ BSIM3v32setup,
+ /* DEVunsetup    */ BSIM3v32unsetup,
+ /* DEVpzSetup    */ BSIM3v32setup,
+ /* DEVtemperature*/ BSIM3v32temp,
+ /* DEVtrunc      */ BSIM3v32trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BSIM3v32acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BSIM3v32destroy,
+ /* DEVmodDelete  */ BSIM3v32mDelete,
+ /* DEVdelete     */ BSIM3v32delete, 
+ /* DEVsetic      */ BSIM3v32getic,
+ /* DEVask        */ BSIM3v32ask,
+ /* DEVmodAsk     */ BSIM3v32mAsk,
+ /* DEVpzLoad     */ BSIM3v32pzLoad,
+ /* DEVconvTest   */ BSIM3v32convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ BSIM3v32noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                       
-    DEVinstSize   : &BSIM3v32iSize,
-    DEVmodSize    : &BSIM3v32mSize
+ /* DEVinstSize   */ &BSIM3v32iSize,
+ /* DEVmodSize    */ &BSIM3v32mSize
 
 };
 

src/spicelib/devices/bsim4v2/bsim4v2init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bsim4v2itf.h"
 #include "bsim4v2ext.h"
@@ -40,36 +40,36 @@ SPICEdev BSIM4v2info = {
         DEV_DEFAULT
     },
 
-    DEVparam      : BSIM4v2param,
-    DEVmodParam   : BSIM4v2mParam,
-    DEVload       : BSIM4v2load,
-    DEVsetup      : BSIM4v2setup,
-    DEVunsetup    : BSIM4v2unsetup,
-    DEVpzSetup    : BSIM4v2setup,
-    DEVtemperature: BSIM4v2temp,
-    DEVtrunc      : BSIM4v2trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BSIM4v2acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BSIM4v2destroy,
-    DEVmodDelete  : BSIM4v2mDelete,
-    DEVdelete     : BSIM4v2delete, 
-    DEVsetic      : BSIM4v2getic,
-    DEVask        : BSIM4v2ask,
-    DEVmodAsk     : BSIM4v2mAsk,
-    DEVpzLoad     : BSIM4v2pzLoad,
-    DEVconvTest   : BSIM4v2convTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : BSIM4v2noise,
+ /* DEVparam      */ BSIM4v2param,
+ /* DEVmodParam   */ BSIM4v2mParam,
+ /* DEVload       */ BSIM4v2load,
+ /* DEVsetup      */ BSIM4v2setup,
+ /* DEVunsetup    */ BSIM4v2unsetup,
+ /* DEVpzSetup    */ BSIM4v2setup,
+ /* DEVtemperature*/ BSIM4v2temp,
+ /* DEVtrunc      */ BSIM4v2trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BSIM4v2acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BSIM4v2destroy,
+ /* DEVmodDelete  */ BSIM4v2mDelete,
+ /* DEVdelete     */ BSIM4v2delete, 
+ /* DEVsetic      */ BSIM4v2getic,
+ /* DEVask        */ BSIM4v2ask,
+ /* DEVmodAsk     */ BSIM4v2mAsk,
+ /* DEVpzLoad     */ BSIM4v2pzLoad,
+ /* DEVconvTest   */ BSIM4v2convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ BSIM4v2noise,
                     
-    DEVinstSize   : &BSIM4v2iSize,
-    DEVmodSize    : &BSIM4v2mSize
+ /* DEVinstSize   */ &BSIM4v2iSize,
+ /* DEVmodSize    */ &BSIM4v2mSize
 };
 
 

src/spicelib/devices/bsim4v3/bsim4v3init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "bsim4v3itf.h"
 #include "bsim4v3ext.h"
@@ -40,36 +40,36 @@ SPICEdev BSIM4v3info = {
         DEV_DEFAULT
     },
 
-    DEVparam      : BSIM4v3param,
-    DEVmodParam   : BSIM4v3mParam,
-    DEVload       : BSIM4v3load,
-    DEVsetup      : BSIM4v3setup,
-    DEVunsetup    : BSIM4v3unsetup,
-    DEVpzSetup    : BSIM4v3setup,
-    DEVtemperature: BSIM4v3temp,
-    DEVtrunc      : BSIM4v3trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : BSIM4v3acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : BSIM4v3destroy,
-    DEVmodDelete  : BSIM4v3mDelete,
-    DEVdelete     : BSIM4v3delete, 
-    DEVsetic      : BSIM4v3getic,
-    DEVask        : BSIM4v3ask,
-    DEVmodAsk     : BSIM4v3mAsk,
-    DEVpzLoad     : BSIM4v3pzLoad,
-    DEVconvTest   : BSIM4v3convTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : BSIM4v3noise,
+ /* DEVparam      */ BSIM4v3param,
+ /* DEVmodParam   */ BSIM4v3mParam,
+ /* DEVload       */ BSIM4v3load,
+ /* DEVsetup      */ BSIM4v3setup,
+ /* DEVunsetup    */ BSIM4v3unsetup,
+ /* DEVpzSetup    */ BSIM4v3setup,
+ /* DEVtemperature*/ BSIM4v3temp,
+ /* DEVtrunc      */ BSIM4v3trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ BSIM4v3acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ BSIM4v3destroy,
+ /* DEVmodDelete  */ BSIM4v3mDelete,
+ /* DEVdelete     */ BSIM4v3delete, 
+ /* DEVsetic      */ BSIM4v3getic,
+ /* DEVask        */ BSIM4v3ask,
+ /* DEVmodAsk     */ BSIM4v3mAsk,
+ /* DEVpzLoad     */ BSIM4v3pzLoad,
+ /* DEVconvTest   */ BSIM4v3convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ BSIM4v3noise,
                     
-    DEVinstSize   : &BSIM4v3iSize,
-    DEVmodSize    : &BSIM4v3mSize
+ /* DEVinstSize   */ &BSIM4v3iSize,
+ /* DEVmodSize    */ &BSIM4v3mSize
 };
 
 

src/spicelib/devices/cap/capinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "capitf.h"
 #include "capext.h"
@@ -39,39 +39,39 @@ SPICEdev CAPinfo = {
 	0
     },
 
-    DEVparam      : CAPparam,
-    DEVmodParam   : CAPmParam,
-    DEVload       : CAPload,
-    DEVsetup      : CAPsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : CAPsetup,
-    DEVtemperature: CAPtemp,
-    DEVtrunc      : CAPtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : CAPacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : CAPdestroy,
-    DEVmodDelete  : CAPmDelete,
-    DEVdelete     : CAPdelete,
-    DEVsetic      : CAPgetic,
-    DEVask        : CAPask,
-    DEVmodAsk     : CAPmAsk,
-    DEVpzLoad     : CAPpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : CAPsSetup,
-    DEVsenLoad    : CAPsLoad,
-    DEVsenUpdate  : CAPsUpdate,
-    DEVsenAcLoad  : CAPsAcLoad,
-    DEVsenPrint   : CAPsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ CAPparam,
+ /* DEVmodParam   */ CAPmParam,
+ /* DEVload       */ CAPload,
+ /* DEVsetup      */ CAPsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ CAPsetup,
+ /* DEVtemperature*/ CAPtemp,
+ /* DEVtrunc      */ CAPtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ CAPacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ CAPdestroy,
+ /* DEVmodDelete  */ CAPmDelete,
+ /* DEVdelete     */ CAPdelete,
+ /* DEVsetic      */ CAPgetic,
+ /* DEVask        */ CAPask,
+ /* DEVmodAsk     */ CAPmAsk,
+ /* DEVpzLoad     */ CAPpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ CAPsSetup,
+ /* DEVsenLoad    */ CAPsLoad,
+ /* DEVsenUpdate  */ CAPsUpdate,
+ /* DEVsenAcLoad  */ CAPsAcLoad,
+ /* DEVsenPrint   */ CAPsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif    
-    DEVinstSize   : &CAPiSize,
-    DEVmodSize    : &CAPmSize
+ /* DEVinstSize   */ &CAPiSize,
+ /* DEVmodSize    */ &CAPmSize
 };
 
 

src/spicelib/devices/cccs/cccsinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "cccsitf.h"
 #include "cccsext.h"
@@ -39,39 +39,39 @@ SPICEdev CCCSinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : CCCSparam,
-    DEVmodParam   : NULL,
-    DEVload       : CCCSload,
-    DEVsetup      : CCCSsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : CCCSsetup,
-    DEVtemperature: NULL,
-    DEVtrunc      : NULL,
-    DEVfindBranch : NULL,
-    DEVacLoad     : CCCSload,
-    DEVaccept     : NULL,
-    DEVdestroy    : CCCSdestroy,
-    DEVmodDelete  : CCCSmDelete,
-    DEVdelete     : CCCSdelete,
-    DEVsetic      : NULL,
-    DEVask        : CCCSask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : CCCSpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : CCCSsSetup,
-    DEVsenLoad    : CCCSsLoad,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : CCCSsAcLoad,
-    DEVsenPrint   : CCCSsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ CCCSparam,
+ /* DEVmodParam   */ NULL,
+ /* DEVload       */ CCCSload,
+ /* DEVsetup      */ CCCSsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ CCCSsetup,
+ /* DEVtemperature*/ NULL,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ CCCSload,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ CCCSdestroy,
+ /* DEVmodDelete  */ CCCSmDelete,
+ /* DEVdelete     */ CCCSdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ CCCSask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ CCCSpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ CCCSsSetup,
+ /* DEVsenLoad    */ CCCSsLoad,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ CCCSsAcLoad,
+ /* DEVsenPrint   */ CCCSsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif    
-    DEVinstSize   : &CCCSiSize,
-    DEVmodSize    : &CCCSmSize
+ /* DEVinstSize   */ &CCCSiSize,
+ /* DEVmodSize    */ &CCCSmSize
 
 };
 

src/spicelib/devices/ccvs/ccvsinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "ccvsitf.h"
 #include "ccvsext.h"
@@ -40,39 +40,39 @@ SPICEdev CCVSinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : CCVSparam,
-    DEVmodParam   : NULL,
-    DEVload       : CCVSload,
-    DEVsetup      : CCVSsetup,
-    DEVunsetup    : CCVSunsetup,
-    DEVpzSetup    : CCVSsetup,
-    DEVtemperature: NULL,
-    DEVtrunc      : NULL,
-    DEVfindBranch : CCVSfindBr,
-    DEVacLoad     : CCVSload,   /* ac and normal load functions identical */
-    DEVaccept     : NULL,
-    DEVdestroy    : CCVSdestroy,
-    DEVmodDelete  : CCVSmDelete,
-    DEVdelete     : CCVSdelete,
-    DEVsetic      : NULL,
-    DEVask        : CCVSask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : CCVSpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : CCVSsSetup,
-    DEVsenLoad    : CCVSsLoad,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : CCVSsAcLoad,
-    DEVsenPrint   : CCVSsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ CCVSparam,
+ /* DEVmodParam   */ NULL,
+ /* DEVload       */ CCVSload,
+ /* DEVsetup      */ CCVSsetup,
+ /* DEVunsetup    */ CCVSunsetup,
+ /* DEVpzSetup    */ CCVSsetup,
+ /* DEVtemperature*/ NULL,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ CCVSfindBr,
+ /* DEVacLoad     */ CCVSload,   /* ac and normal load functions identical */
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ CCVSdestroy,
+ /* DEVmodDelete  */ CCVSmDelete,
+ /* DEVdelete     */ CCVSdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ CCVSask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ CCVSpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ CCVSsSetup,
+ /* DEVsenLoad    */ CCVSsLoad,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ CCVSsAcLoad,
+ /* DEVsenPrint   */ CCVSsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif
-    DEVinstSize   : &CCVSiSize,
-    DEVmodSize    : &CCVSmSize
+ /* DEVinstSize   */ &CCVSiSize,
+ /* DEVmodSize    */ &CCVSmSize
 
 };
 

src/spicelib/devices/cpl/cplinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "cplitf.h"
 #include "cplext.h"
@@ -40,39 +40,39 @@ SPICEdev CPLinfo = {
   },
 
  
-  DEVparam       : CPLparam,
-  DEVmodParam    : CPLmParam,
-  DEVload        : CPLload,
-  DEVsetup       : CPLsetup,
-  DEVunsetup     : CPLunsetup,
-  DEVpzSetup     : NULL,
-  DEVtemperature : NULL,
-  DEVtrunc       : NULL,
-  DEVfindBranch  : NULL, /* CPLfindBranch, */
-  DEVacLoad      : NULL, 
-  DEVaccept      : NULL,
-  DEVdestroy     : CPLdestroy,
-  DEVmodDelete   : CPLmDelete,
-  DEVdelete      : CPLdelete,
-  DEVsetic       : NULL,
-  DEVask         : CPLask,
-  DEVmodAsk      : CPLmAsk,
-  DEVpzLoad      : NULL,
-  DEVconvTest    : NULL,
-  DEVsenSetup    : NULL,
-  DEVsenLoad     : NULL,
-  DEVsenUpdate   : NULL,
-  DEVsenAcLoad   : NULL,
-  DEVsenPrint    : NULL,
-  DEVsenTrunc    : NULL,
-  DEVdisto       : NULL,
-  DEVnoise       : NULL,
+/* DEVparam       */ CPLparam,
+/* DEVmodParam    */ CPLmParam,
+/* DEVload        */ CPLload,
+/* DEVsetup       */ CPLsetup,
+/* DEVunsetup     */ CPLunsetup,
+/* DEVpzSetup     */ NULL,
+/* DEVtemperature */ NULL,
+/* DEVtrunc       */ NULL,
+/* DEVfindBranch  */ NULL, /* CPLfindBranch, */
+/* DEVacLoad      */ NULL, 
+/* DEVaccept      */ NULL,
+/* DEVdestroy     */ CPLdestroy,
+/* DEVmodDelete   */ CPLmDelete,
+/* DEVdelete      */ CPLdelete,
+/* DEVsetic       */ NULL,
+/* DEVask         */ CPLask,
+/* DEVmodAsk      */ CPLmAsk,
+/* DEVpzLoad      */ NULL,
+/* DEVconvTest    */ NULL,
+/* DEVsenSetup    */ NULL,
+/* DEVsenLoad     */ NULL,
+/* DEVsenUpdate   */ NULL,
+/* DEVsenAcLoad   */ NULL,
+/* DEVsenPrint    */ NULL,
+/* DEVsenTrunc    */ NULL,
+/* DEVdisto       */ NULL,
+/* DEVnoise       */ NULL,
 #ifdef CIDER
-  DEVdump        : NULL,
-  DEVacct        : NULL,
+/* DEVdump        */ NULL,
+/* DEVacct        */ NULL,
 #endif   
-  DEVinstSize    : &CPLiSize,
-  DEVmodSize     : &CPLmSize
+/* DEVinstSize    */ &CPLiSize,
+/* DEVmodSize     */ &CPLmSize
 
 };
 

src/spicelib/devices/csw/cswinit.c

@@ -1,8 +1,8 @@
 /* Modified: 2000 AlansFixes */
 
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "cswitf.h"
 #include "cswext.h"
@@ -42,39 +42,39 @@ SPICEdev CSWinfo = {
 	0
     },
 
-    DEVparam      : CSWparam,
-    DEVmodParam   : CSWmParam,
-    DEVload       : CSWload,
-    DEVsetup      : CSWsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : CSWsetup,
-    DEVtemperature: NULL,
-    DEVtrunc      :CSWtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : CSWacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : CSWdestroy,
-    DEVmodDelete  : CSWmDelete,
-    DEVdelete     : CSWdelete,
-    DEVsetic      : NULL,
-    DEVask        : CSWask,
-    DEVmodAsk     : CSWmAsk,
-    DEVpzLoad     : CSWpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : CSWnoise,
+ /* DEVparam      */ CSWparam,
+ /* DEVmodParam   */ CSWmParam,
+ /* DEVload       */ CSWload,
+ /* DEVsetup      */ CSWsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ CSWsetup,
+ /* DEVtemperature*/ NULL,
+ /* DEVtrunc      */ CSWtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ CSWacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ CSWdestroy,
+ /* DEVmodDelete  */ CSWmDelete,
+ /* DEVdelete     */ CSWdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ CSWask,
+ /* DEVmodAsk     */ CSWmAsk,
+ /* DEVpzLoad     */ CSWpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ CSWnoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif
-    DEVinstSize   : &CSWiSize,
-    DEVmodSize    : &CSWmSize
+ /* DEVinstSize   */ &CSWiSize,
+ /* DEVmodSize    */ &CSWmSize
 
 };
 

src/spicelib/devices/dio/dioinit.c

@@ -42,39 +42,39 @@ SPICEdev DIOinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : DIOparam,
-    DEVmodParam   : DIOmParam,
-    DEVload       : DIOload,
-    DEVsetup      : DIOsetup,
-    DEVunsetup    : DIOunsetup,
-    DEVpzSetup    : DIOsetup,
-    DEVtemperature: DIOtemp,
-    DEVtrunc      : DIOtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : DIOacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : DIOdestroy,
-    DEVmodDelete  : DIOmDelete,
-    DEVdelete     : DIOdelete,
-    DEVsetic      : DIOgetic,
-    DEVask        : DIOask,
-    DEVmodAsk     : DIOmAsk,
-    DEVpzLoad     : DIOpzLoad,
-    DEVconvTest   : DIOconvTest,
-    DEVsenSetup   : DIOsSetup,
-    DEVsenLoad    : DIOsLoad,
-    DEVsenUpdate  : DIOsUpdate,
-    DEVsenAcLoad  : DIOsAcLoad,
-    DEVsenPrint   : DIOsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : DIOdisto,
-    DEVnoise      : DIOnoise,
+ /* DEVparam      */ DIOparam,
+ /* DEVmodParam   */ DIOmParam,
+ /* DEVload       */ DIOload,
+ /* DEVsetup      */ DIOsetup,
+ /* DEVunsetup    */ DIOunsetup,
+ /* DEVpzSetup    */ DIOsetup,
+ /* DEVtemperature*/ DIOtemp,
+ /* DEVtrunc      */ DIOtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ DIOacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ DIOdestroy,
+ /* DEVmodDelete  */ DIOmDelete,
+ /* DEVdelete     */ DIOdelete,
+ /* DEVsetic      */ DIOgetic,
+ /* DEVask        */ DIOask,
+ /* DEVmodAsk     */ DIOmAsk,
+ /* DEVpzLoad     */ DIOpzLoad,
+ /* DEVconvTest   */ DIOconvTest,
+ /* DEVsenSetup   */ DIOsSetup,
+ /* DEVsenLoad    */ DIOsLoad,
+ /* DEVsenUpdate  */ DIOsUpdate,
+ /* DEVsenAcLoad  */ DIOsAcLoad,
+ /* DEVsenPrint   */ DIOsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ DIOdisto,
+ /* DEVnoise      */ DIOnoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                     
-    DEVinstSize   : &DIOiSize,
-    DEVmodSize    : &DIOmSize
+ /* DEVinstSize   */ &DIOiSize,
+ /* DEVmodSize    */ &DIOmSize
 };
 
 

src/spicelib/devices/hfet1/hfetinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "hfetitf.h"
 #include "hfetext.h"
@@ -40,39 +40,39 @@ SPICEdev HFETAinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : HFETAparam,
-    DEVmodParam   : HFETAmParam,
-    DEVload       : HFETAload,
-    DEVsetup      : HFETAsetup,
-    DEVunsetup    : HFETAunsetup,
-    DEVpzSetup    : HFETAsetup,
-    DEVtemperature: HFETAtemp,
-    DEVtrunc      : HFETAtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : HFETAacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : HFETAdestroy,
-    DEVmodDelete  : HFETAmDelete,
-    DEVdelete     : HFETAdelete,
-    DEVsetic      : HFETAgetic,
-    DEVask        : HFETAask,
-    DEVmodAsk     : HFETAmAsk,
-    DEVpzLoad     : HFETApzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : NULL,
+ /* DEVparam      */ HFETAparam,
+ /* DEVmodParam   */ HFETAmParam,
+ /* DEVload       */ HFETAload,
+ /* DEVsetup      */ HFETAsetup,
+ /* DEVunsetup    */ HFETAunsetup,
+ /* DEVpzSetup    */ HFETAsetup,
+ /* DEVtemperature*/ HFETAtemp,
+ /* DEVtrunc      */ HFETAtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ HFETAacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ HFETAdestroy,
+ /* DEVmodDelete  */ HFETAmDelete,
+ /* DEVdelete     */ HFETAdelete,
+ /* DEVsetic      */ HFETAgetic,
+ /* DEVask        */ HFETAask,
+ /* DEVmodAsk     */ HFETAmAsk,
+ /* DEVpzLoad     */ HFETApzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif    
-    DEVinstSize   : &HFETAiSize,
-    DEVmodSize    : &HFETAmSize
+ /* DEVinstSize   */ &HFETAiSize,
+ /* DEVmodSize    */ &HFETAmSize
 
 };
 

src/spicelib/devices/hfet2/hfet2init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "hfet2itf.h"
 #include "hfet2ext.h"
@@ -40,39 +40,39 @@ SPICEdev HFET2info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : HFET2param,
-    DEVmodParam   : HFET2mParam,
-    DEVload       : HFET2load,
-    DEVsetup      : HFET2setup,
-    DEVunsetup    : HFET2unsetup,
-    DEVpzSetup    : HFET2setup,
-    DEVtemperature: HFET2temp,
-    DEVtrunc      : HFET2trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : HFET2acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : HFET2destroy,
-    DEVmodDelete  : HFET2mDelete,
-    DEVdelete     : HFET2delete,
-    DEVsetic      : HFET2getic,
-    DEVask        : HFET2ask,
-    DEVmodAsk     : HFET2mAsk,
-    DEVpzLoad     : HFET2pzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : NULL,
+ /* DEVparam      */ HFET2param,
+ /* DEVmodParam   */ HFET2mParam,
+ /* DEVload       */ HFET2load,
+ /* DEVsetup      */ HFET2setup,
+ /* DEVunsetup    */ HFET2unsetup,
+ /* DEVpzSetup    */ HFET2setup,
+ /* DEVtemperature*/ HFET2temp,
+ /* DEVtrunc      */ HFET2trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ HFET2acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ HFET2destroy,
+ /* DEVmodDelete  */ HFET2mDelete,
+ /* DEVdelete     */ HFET2delete,
+ /* DEVsetic      */ HFET2getic,
+ /* DEVask        */ HFET2ask,
+ /* DEVmodAsk     */ HFET2mAsk,
+ /* DEVpzLoad     */ HFET2pzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif    
-    DEVinstSize   : &HFET2iSize,
-    DEVmodSize    : &HFET2mSize
+ /* DEVinstSize   */ &HFET2iSize,
+ /* DEVmodSize    */ &HFET2mSize
 
 };
 

src/spicelib/devices/hisim/hsm1init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "hsm1def.h"
 #include "hsm1itf.h"
@@ -39,40 +39,39 @@ SPICEdev HSM1info = {
 	DEV_DEFAULT
   },
 
-  DEVparam      : HSM1param,
-  DEVmodParam   : HSM1mParam,
-  DEVload       : HSM1load,
-  DEVsetup      : HSM1setup,
-  DEVunsetup    : HSM1unsetup,
-  DEVpzSetup    : HSM1setup,
-  DEVtemperature: HSM1temp,
-  DEVtrunc      : HSM1trunc,
-  DEVfindBranch : NULL,
-  DEVacLoad     : HSM1acLoad,
-  DEVaccept     : NULL,
-  DEVdestroy    : HSM1destroy,
-  DEVmodDelete  : HSM1mDelete,
-  DEVdelete     : HSM1delete, 
-  DEVsetic      : HSM1getic,
-  DEVask        : HSM1ask,
-  DEVmodAsk     : HSM1mAsk,
-  DEVpzLoad     : HSM1pzLoad,
-  DEVconvTest   : HSM1convTest,
-  DEVsenSetup   : NULL,
-  DEVsenLoad    : NULL,
-  DEVsenUpdate  : NULL,
-  DEVsenAcLoad  : NULL,
-  DEVsenPrint   : NULL,
-  DEVsenTrunc   : NULL,
-  DEVdisto      : NULL,
-
-  DEVnoise      : HSM1noise,
+ /* DEVparam      */ HSM1param,
+ /* DEVmodParam   */ HSM1mParam,
+ /* DEVload       */ HSM1load,
+ /* DEVsetup      */ HSM1setup,
+ /* DEVunsetup    */ HSM1unsetup,
+ /* DEVpzSetup    */ HSM1setup,
+ /* DEVtemperature*/ HSM1temp,
+ /* DEVtrunc      */ HSM1trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ HSM1acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ HSM1destroy,
+ /* DEVmodDelete  */ HSM1mDelete,
+ /* DEVdelete     */ HSM1delete, 
+ /* DEVsetic      */ HSM1getic,
+ /* DEVask        */ HSM1ask,
+ /* DEVmodAsk     */ HSM1mAsk,
+ /* DEVpzLoad     */ HSM1pzLoad,
+ /* DEVconvTest   */ HSM1convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ HSM1noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif
-  DEVinstSize   : &HSM1iSize,
-  DEVmodSize    : &HSM1mSize
+ /* DEVinstSize   */ &HSM1iSize,
+ /* DEVmodSize    */ &HSM1mSize
 
 };
 

src/spicelib/devices/ind/indinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "inditf.h"
 #include "indext.h"
@@ -39,39 +39,39 @@ SPICEdev INDinfo = {
 	0
     },
 
-    DEVparam      : INDparam,
-    DEVmodParam   : INDmParam,
-    DEVload       : INDload,
-    DEVsetup      : INDsetup,
-    DEVunsetup    : INDunsetup,
-    DEVpzSetup    : INDsetup,
-    DEVtemperature: INDtemp,
-    DEVtrunc      : INDtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : INDacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : INDdestroy,
-    DEVmodDelete  : INDmDelete,
-    DEVdelete     : INDdelete,
-    DEVsetic      : NULL,
-    DEVask        : INDask,
-    DEVmodAsk     : INDmAsk,
-    DEVpzLoad     : INDpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : INDsSetup,
-    DEVsenLoad    : INDsLoad,
-    DEVsenUpdate  : INDsUpdate,
-    DEVsenAcLoad  : INDsAcLoad,
-    DEVsenPrint   : INDsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ INDparam,
+ /* DEVmodParam   */ INDmParam,
+ /* DEVload       */ INDload,
+ /* DEVsetup      */ INDsetup,
+ /* DEVunsetup    */ INDunsetup,
+ /* DEVpzSetup    */ INDsetup,
+ /* DEVtemperature*/ INDtemp,
+ /* DEVtrunc      */ INDtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ INDacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ INDdestroy,
+ /* DEVmodDelete  */ INDmDelete,
+ /* DEVdelete     */ INDdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ INDask,
+ /* DEVmodAsk     */ INDmAsk,
+ /* DEVpzLoad     */ INDpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ INDsSetup,
+ /* DEVsenLoad    */ INDsLoad,
+ /* DEVsenUpdate  */ INDsUpdate,
+ /* DEVsenAcLoad  */ INDsAcLoad,
+ /* DEVsenPrint   */ INDsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                       
-    DEVinstSize   : &INDiSize,
-    DEVmodSize    : &INDmSize
+ /* DEVinstSize   */ &INDiSize,
+ /* DEVmodSize    */ &INDmSize
 
 };
 
@@ -108,36 +108,36 @@ SPICEdev MUTinfo = {
 	0
     },
 
-    DEVparam      : MUTparam,
-    DEVmodParam   : NULL,
-    DEVload       : NULL,/* load handled by INDload */
-    DEVsetup      : MUTsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : MUTsetup,
-    DEVtemperature: MUTtemp,
-    DEVtrunc      : NULL,
-    DEVfindBranch : NULL,
-    DEVacLoad     : MUTacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : MUTdestroy,
-    DEVmodDelete  : MUTmDelete,
-    DEVdelete     : MUTdelete,
-    DEVsetic      : NULL,
-    DEVask        : MUTask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : MUTpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : MUTsSetup,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : MUTsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      :NULL,	/* NOISE */
+ /* DEVparam      */ MUTparam,
+ /* DEVmodParam   */ NULL,
+ /* DEVload       */ NULL,/* load handled by INDload */
+ /* DEVsetup      */ MUTsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ MUTsetup,
+ /* DEVtemperature*/ MUTtemp,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ MUTacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ MUTdestroy,
+ /* DEVmodDelete  */ MUTmDelete,
+ /* DEVdelete     */ MUTdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ MUTask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ MUTpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ MUTsSetup,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ MUTsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif  
     &MUTiSize,
     &MUTmSize

src/spicelib/devices/isrc/isrcinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "isrcitf.h"
 #include "isrcext.h"
@@ -40,39 +40,39 @@ SPICEdev ISRCinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : ISRCparam,
-    DEVmodParam   : NULL,
-    DEVload       : ISRCload,
-    DEVsetup      : NULL,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : NULL,
-    DEVtemperature: ISRCtemp,
-    DEVtrunc      : NULL,
-    DEVfindBranch : NULL,
-    DEVacLoad     : ISRCacLoad,
-    DEVaccept     : ISRCaccept,
-    DEVdestroy    : ISRCdestroy,
-    DEVmodDelete  : ISRCmDelete,
-    DEVdelete     : ISRCdelete,
-    DEVsetic      : NULL,
-    DEVask        : ISRCask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : NULL,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ ISRCparam,
+ /* DEVmodParam   */ NULL,
+ /* DEVload       */ ISRCload,
+ /* DEVsetup      */ NULL,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ NULL,
+ /* DEVtemperature*/ ISRCtemp,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ ISRCacLoad,
+ /* DEVaccept     */ ISRCaccept,
+ /* DEVdestroy    */ ISRCdestroy,
+ /* DEVmodDelete  */ ISRCmDelete,
+ /* DEVdelete     */ ISRCdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ ISRCask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ NULL,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &ISRCiSize,
-    DEVmodSize    : &ISRCmSize
+ /* DEVinstSize   */ &ISRCiSize,
+ /* DEVmodSize    */ &ISRCmSize
 };
 
 

src/spicelib/devices/jfet/jfetinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "jfetitf.h"
 #include "jfetext.h"
@@ -40,39 +40,39 @@ SPICEdev JFETinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : JFETparam,
-    DEVmodParam   : JFETmParam,
-    DEVload       : JFETload,
-    DEVsetup      : JFETsetup,
-    DEVunsetup    : JFETunsetup,
-    DEVpzSetup    : JFETsetup,
-    DEVtemperature: JFETtemp,
-    DEVtrunc      : JFETtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : JFETacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : JFETdestroy,
-    DEVmodDelete  : JFETmDelete,
-    DEVdelete     : JFETdelete,
-    DEVsetic      : JFETgetic,
-    DEVask        : JFETask,
-    DEVmodAsk     : JFETmAsk,
-    DEVpzLoad     : JFETpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : JFETdisto,
-    DEVnoise      : JFETnoise,
+ /* DEVparam      */ JFETparam,
+ /* DEVmodParam   */ JFETmParam,
+ /* DEVload       */ JFETload,
+ /* DEVsetup      */ JFETsetup,
+ /* DEVunsetup    */ JFETunsetup,
+ /* DEVpzSetup    */ JFETsetup,
+ /* DEVtemperature*/ JFETtemp,
+ /* DEVtrunc      */ JFETtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ JFETacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ JFETdestroy,
+ /* DEVmodDelete  */ JFETmDelete,
+ /* DEVdelete     */ JFETdelete,
+ /* DEVsetic      */ JFETgetic,
+ /* DEVask        */ JFETask,
+ /* DEVmodAsk     */ JFETmAsk,
+ /* DEVpzLoad     */ JFETpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ JFETdisto,
+ /* DEVnoise      */ JFETnoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &JFETiSize,
-    DEVmodSize    : &JFETmSize
+ /* DEVinstSize   */ &JFETiSize,
+ /* DEVmodSize    */ &JFETmSize
 
 };
 

src/spicelib/devices/jfet2/jfet2init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "jfet2itf.h"
 #include "jfet2ext.h"
@@ -40,39 +40,39 @@ SPICEdev JFET2info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : JFET2param,
-    DEVmodParam   : JFET2mParam,
-    DEVload       : JFET2load,
-    DEVsetup      : JFET2setup,
-    DEVunsetup    : JFET2unsetup,
-    DEVpzSetup    : JFET2setup,
-    DEVtemperature: JFET2temp,
-    DEVtrunc      : JFET2trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : JFET2acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : JFET2destroy,
-    DEVmodDelete  : JFET2mDelete,
-    DEVdelete     : JFET2delete,
-    DEVsetic      : JFET2getic,
-    DEVask        : JFET2ask,
-    DEVmodAsk     : JFET2mAsk,
-    DEVpzLoad     : NULL, /* AN_pz */
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL, /* AN_disto */
-    DEVnoise      : JFET2noise,
+ /* DEVparam      */ JFET2param,
+ /* DEVmodParam   */ JFET2mParam,
+ /* DEVload       */ JFET2load,
+ /* DEVsetup      */ JFET2setup,
+ /* DEVunsetup    */ JFET2unsetup,
+ /* DEVpzSetup    */ JFET2setup,
+ /* DEVtemperature*/ JFET2temp,
+ /* DEVtrunc      */ JFET2trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ JFET2acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ JFET2destroy,
+ /* DEVmodDelete  */ JFET2mDelete,
+ /* DEVdelete     */ JFET2delete,
+ /* DEVsetic      */ JFET2getic,
+ /* DEVask        */ JFET2ask,
+ /* DEVmodAsk     */ JFET2mAsk,
+ /* DEVpzLoad     */ NULL, /* AN_pz */
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL, /* AN_disto */
+ /* DEVnoise      */ JFET2noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &JFET2iSize,
-    DEVmodSize    : &JFET2mSize
+ /* DEVinstSize   */ &JFET2iSize,
+ /* DEVmodSize    */ &JFET2mSize
 
 };
 

src/spicelib/devices/ltra/ltrainit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "ltraitf.h"
 #include "ltraext.h"
@@ -40,39 +40,39 @@ SPICEdev LTRAinfo = {
 	0
     },
 
-    DEVparam      : LTRAparam,
-    DEVmodParam   : LTRAmParam,
-    DEVload       : LTRAload,
-    DEVsetup      : LTRAsetup,
-    DEVunsetup    : LTRAunsetup,
-    DEVpzSetup    : LTRAsetup,
-    DEVtemperature: LTRAtemp,
-    DEVtrunc      : LTRAtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : LTRAacLoad /*LTRAacLoad*/,
-    DEVaccept     : LTRAaccept,
-    DEVdestroy    : LTRAdestroy,
-    DEVmodDelete  : LTRAmDelete,
-    DEVdelete     : LTRAdelete,
-    DEVsetic      : NULL, 	/* getic */
-    DEVask        : LTRAask,
-    DEVmodAsk     : LTRAmAsk, 	/* */
-    DEVpzLoad     : NULL,	/* pzLoad */
-    DEVconvTest   : NULL,	/* convTest */
-    DEVsenSetup   : NULL,	/* sSetup */
-    DEVsenLoad    : NULL,	/* sLoad */
-    DEVsenUpdate  : NULL,	/* sUpdate */
-    DEVsenAcLoad  : NULL,	/* sAcLoad */
-    DEVsenPrint   : NULL,	/* sPrint */
-    DEVsenTrunc   : NULL,	/* */
-    DEVdisto      : NULL,	/* disto */
-    DEVnoise      : NULL,	/* noise */
+ /* DEVparam      */ LTRAparam,
+ /* DEVmodParam   */ LTRAmParam,
+ /* DEVload       */ LTRAload,
+ /* DEVsetup      */ LTRAsetup,
+ /* DEVunsetup    */ LTRAunsetup,
+ /* DEVpzSetup    */ LTRAsetup,
+ /* DEVtemperature*/ LTRAtemp,
+ /* DEVtrunc      */ LTRAtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ LTRAacLoad /*LTRAacLoad*/,
+ /* DEVaccept     */ LTRAaccept,
+ /* DEVdestroy    */ LTRAdestroy,
+ /* DEVmodDelete  */ LTRAmDelete,
+ /* DEVdelete     */ LTRAdelete,
+ /* DEVsetic      */ NULL, 	/* getic */
+ /* DEVask        */ LTRAask,
+ /* DEVmodAsk     */ LTRAmAsk, 	/* */
+ /* DEVpzLoad     */ NULL,	/* pzLoad */
+ /* DEVconvTest   */ NULL,	/* convTest */
+ /* DEVsenSetup   */ NULL,	/* sSetup */
+ /* DEVsenLoad    */ NULL,	/* sLoad */
+ /* DEVsenUpdate  */ NULL,	/* sUpdate */
+ /* DEVsenAcLoad  */ NULL,	/* sAcLoad */
+ /* DEVsenPrint   */ NULL,	/* sPrint */
+ /* DEVsenTrunc   */ NULL,	/* */
+ /* DEVdisto      */ NULL,	/* disto */
+ /* DEVnoise      */ NULL,	/* noise */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &LTRAiSize,
-    DEVmodSize    : &LTRAmSize
+ /* DEVinstSize   */ &LTRAiSize,
+ /* DEVmodSize    */ &LTRAmSize
 
 };
 

src/spicelib/devices/mes/mesinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "mesitf.h"
 #include "mesext.h"
@@ -40,39 +40,39 @@ SPICEdev MESinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : MESparam,
-    DEVmodParam   : MESmParam,
-    DEVload       : MESload,
-    DEVsetup      : MESsetup,
-    DEVunsetup    : MESunsetup,
-    DEVpzSetup    : MESsetup,
-    DEVtemperature: MEStemp,
-    DEVtrunc      : MEStrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : MESacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : MESdestroy,
-    DEVmodDelete  : MESmDelete,
-    DEVdelete     : MESdelete,
-    DEVsetic      : MESgetic,
-    DEVask        : MESask,
-    DEVmodAsk     : MESmAsk,
-    DEVpzLoad     : MESpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : MESdisto,
-    DEVnoise      : MESnoise,
+ /* DEVparam      */ MESparam,
+ /* DEVmodParam   */ MESmParam,
+ /* DEVload       */ MESload,
+ /* DEVsetup      */ MESsetup,
+ /* DEVunsetup    */ MESunsetup,
+ /* DEVpzSetup    */ MESsetup,
+ /* DEVtemperature*/ MEStemp,
+ /* DEVtrunc      */ MEStrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ MESacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ MESdestroy,
+ /* DEVmodDelete  */ MESmDelete,
+ /* DEVdelete     */ MESdelete,
+ /* DEVsetic      */ MESgetic,
+ /* DEVask        */ MESask,
+ /* DEVmodAsk     */ MESmAsk,
+ /* DEVpzLoad     */ MESpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ MESdisto,
+ /* DEVnoise      */ MESnoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &MESiSize,
-    DEVmodSize    : &MESmSize
+ /* DEVinstSize   */ &MESiSize,
+ /* DEVmodSize    */ &MESmSize
 
 };
 

src/spicelib/devices/mesa/mesainit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "mesaitf.h"
 #include "mesaext.h"
@@ -40,39 +40,39 @@ SPICEdev MESAinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : MESAparam,
-    DEVmodParam   : MESAmParam,
-    DEVload       : MESAload,
-    DEVsetup      : MESAsetup,
-    DEVunsetup    : MESAunsetup,
-    DEVpzSetup    : MESAsetup,
-    DEVtemperature: MESAtemp,
-    DEVtrunc      : MESAtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : MESAacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : MESAdestroy,
-    DEVmodDelete  : MESAmDelete,
-    DEVdelete     : MESAdelete,
-    DEVsetic      : MESAgetic,
-    DEVask        : MESAask,
-    DEVmodAsk     : MESAmAsk,
-    DEVpzLoad     : MESApzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : NULL,
+ /* DEVparam      */ MESAparam,
+ /* DEVmodParam   */ MESAmParam,
+ /* DEVload       */ MESAload,
+ /* DEVsetup      */ MESAsetup,
+ /* DEVunsetup    */ MESAunsetup,
+ /* DEVpzSetup    */ MESAsetup,
+ /* DEVtemperature*/ MESAtemp,
+ /* DEVtrunc      */ MESAtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ MESAacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ MESAdestroy,
+ /* DEVmodDelete  */ MESAmDelete,
+ /* DEVdelete     */ MESAdelete,
+ /* DEVsetic      */ MESAgetic,
+ /* DEVask        */ MESAask,
+ /* DEVmodAsk     */ MESAmAsk,
+ /* DEVpzLoad     */ MESApzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &MESAiSize,
-    DEVmodSize    : &MESAmSize
+ /* DEVinstSize   */ &MESAiSize,
+ /* DEVmodSize    */ &MESAmSize
 
 };
 

src/spicelib/devices/mos1/mos1init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "mos1itf.h"
 #include "mos1ext.h"
@@ -40,39 +40,39 @@ SPICEdev MOS1info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : MOS1param,
-    DEVmodParam   : MOS1mParam,
-    DEVload       : MOS1load,
-    DEVsetup      : MOS1setup,
-    DEVunsetup    : MOS1unsetup,
-    DEVpzSetup    : MOS1setup,
-    DEVtemperature: MOS1temp,
-    DEVtrunc      : MOS1trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : MOS1acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : MOS1destroy,
-    DEVmodDelete  : MOS1mDelete,
-    DEVdelete     : MOS1delete,
-    DEVsetic      : MOS1getic,
-    DEVask        : MOS1ask,
-    DEVmodAsk     : MOS1mAsk,
-    DEVpzLoad     : MOS1pzLoad,
-    DEVconvTest   : MOS1convTest,
-    DEVsenSetup   : MOS1sSetup,
-    DEVsenLoad    : MOS1sLoad,
-    DEVsenUpdate  : MOS1sUpdate,
-    DEVsenAcLoad  : MOS1sAcLoad,
-    DEVsenPrint   : MOS1sPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : MOS1disto,
-    DEVnoise      : MOS1noise,
+ /* DEVparam      */ MOS1param,
+ /* DEVmodParam   */ MOS1mParam,
+ /* DEVload       */ MOS1load,
+ /* DEVsetup      */ MOS1setup,
+ /* DEVunsetup    */ MOS1unsetup,
+ /* DEVpzSetup    */ MOS1setup,
+ /* DEVtemperature*/ MOS1temp,
+ /* DEVtrunc      */ MOS1trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ MOS1acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ MOS1destroy,
+ /* DEVmodDelete  */ MOS1mDelete,
+ /* DEVdelete     */ MOS1delete,
+ /* DEVsetic      */ MOS1getic,
+ /* DEVask        */ MOS1ask,
+ /* DEVmodAsk     */ MOS1mAsk,
+ /* DEVpzLoad     */ MOS1pzLoad,
+ /* DEVconvTest   */ MOS1convTest,
+ /* DEVsenSetup   */ MOS1sSetup,
+ /* DEVsenLoad    */ MOS1sLoad,
+ /* DEVsenUpdate  */ MOS1sUpdate,
+ /* DEVsenAcLoad  */ MOS1sAcLoad,
+ /* DEVsenPrint   */ MOS1sPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ MOS1disto,
+ /* DEVnoise      */ MOS1noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                       
-    DEVinstSize   : &MOS1iSize,
-    DEVmodSize    : &MOS1mSize
+ /* DEVinstSize   */ &MOS1iSize,
+ /* DEVmodSize    */ &MOS1mSize
 };
 
 

src/spicelib/devices/mos2/mos2init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "mos2itf.h"
 #include "mos2ext.h"
@@ -40,39 +40,39 @@ SPICEdev MOS2info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : MOS2param,
-    DEVmodParam   : MOS2mParam,
-    DEVload       : MOS2load,
-    DEVsetup      : MOS2setup,
-    DEVunsetup    : MOS2unsetup,
-    DEVpzSetup    : MOS2setup,
-    DEVtemperature: MOS2temp,
-    DEVtrunc      : MOS2trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : MOS2acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : MOS2destroy,
-    DEVmodDelete  : MOS2mDelete,
-    DEVdelete     : MOS2delete,
-    DEVsetic      : MOS2getic,
-    DEVask        : MOS2ask,
-    DEVmodAsk     : MOS2mAsk,
-    DEVpzLoad     : MOS2pzLoad,
-    DEVconvTest   : MOS2convTest,
-    DEVsenSetup   : MOS2sSetup,
-    DEVsenLoad    : MOS2sLoad,
-    DEVsenUpdate  : MOS2sUpdate,
-    DEVsenAcLoad  : MOS2sAcLoad,
-    DEVsenPrint   : MOS2sPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : MOS2disto,
-    DEVnoise      : MOS2noise,
+ /* DEVparam      */ MOS2param,
+ /* DEVmodParam   */ MOS2mParam,
+ /* DEVload       */ MOS2load,
+ /* DEVsetup      */ MOS2setup,
+ /* DEVunsetup    */ MOS2unsetup,
+ /* DEVpzSetup    */ MOS2setup,
+ /* DEVtemperature*/ MOS2temp,
+ /* DEVtrunc      */ MOS2trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ MOS2acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ MOS2destroy,
+ /* DEVmodDelete  */ MOS2mDelete,
+ /* DEVdelete     */ MOS2delete,
+ /* DEVsetic      */ MOS2getic,
+ /* DEVask        */ MOS2ask,
+ /* DEVmodAsk     */ MOS2mAsk,
+ /* DEVpzLoad     */ MOS2pzLoad,
+ /* DEVconvTest   */ MOS2convTest,
+ /* DEVsenSetup   */ MOS2sSetup,
+ /* DEVsenLoad    */ MOS2sLoad,
+ /* DEVsenUpdate  */ MOS2sUpdate,
+ /* DEVsenAcLoad  */ MOS2sAcLoad,
+ /* DEVsenPrint   */ MOS2sPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ MOS2disto,
+ /* DEVnoise      */ MOS2noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif    
-    DEVinstSize   : &MOS2iSize,
-    DEVmodSize    : &MOS2mSize
+ /* DEVinstSize   */ &MOS2iSize,
+ /* DEVmodSize    */ &MOS2mSize
 };
 
 

src/spicelib/devices/mos3/mos3init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "mos3itf.h"
 #include "mos3ext.h"
@@ -40,39 +40,39 @@ SPICEdev MOS3info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : MOS3param,
-    DEVmodParam   : MOS3mParam,
-    DEVload       : MOS3load,
-    DEVsetup      : MOS3setup,
-    DEVunsetup    : MOS3unsetup,
-    DEVpzSetup    : MOS3setup,
-    DEVtemperature: MOS3temp,
-    DEVtrunc      : MOS3trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : MOS3acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : MOS3destroy,
-    DEVmodDelete  : MOS3mDelete,
-    DEVdelete     : MOS3delete,
-    DEVsetic      : MOS3getic,
-    DEVask        : MOS3ask,
-    DEVmodAsk     : MOS3mAsk,
-    DEVpzLoad     : MOS3pzLoad,
-    DEVconvTest   : MOS3convTest,
-    DEVsenSetup   : MOS3sSetup,
-    DEVsenLoad    : MOS3sLoad,
-    DEVsenUpdate  : MOS3sUpdate,
-    DEVsenAcLoad  : MOS3sAcLoad,
-    DEVsenPrint   : MOS3sPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : MOS3disto,
-    DEVnoise      : MOS3noise,
+ /* DEVparam      */ MOS3param,
+ /* DEVmodParam   */ MOS3mParam,
+ /* DEVload       */ MOS3load,
+ /* DEVsetup      */ MOS3setup,
+ /* DEVunsetup    */ MOS3unsetup,
+ /* DEVpzSetup    */ MOS3setup,
+ /* DEVtemperature*/ MOS3temp,
+ /* DEVtrunc      */ MOS3trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ MOS3acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ MOS3destroy,
+ /* DEVmodDelete  */ MOS3mDelete,
+ /* DEVdelete     */ MOS3delete,
+ /* DEVsetic      */ MOS3getic,
+ /* DEVask        */ MOS3ask,
+ /* DEVmodAsk     */ MOS3mAsk,
+ /* DEVpzLoad     */ MOS3pzLoad,
+ /* DEVconvTest   */ MOS3convTest,
+ /* DEVsenSetup   */ MOS3sSetup,
+ /* DEVsenLoad    */ MOS3sLoad,
+ /* DEVsenUpdate  */ MOS3sUpdate,
+ /* DEVsenAcLoad  */ MOS3sAcLoad,
+ /* DEVsenPrint   */ MOS3sPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ MOS3disto,
+ /* DEVnoise      */ MOS3noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                         
-    DEVinstSize   : &MOS3iSize,
-    DEVmodSize    : &MOS3mSize
+ /* DEVinstSize   */ &MOS3iSize,
+ /* DEVmodSize    */ &MOS3mSize
 
 };
 

src/spicelib/devices/mos6/mos6init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "mos6itf.h"
 #include "mos6ext.h"
@@ -40,39 +40,39 @@ SPICEdev MOS6info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : MOS6param,
-    DEVmodParam   : MOS6mParam,
-    DEVload       : MOS6load,
-    DEVsetup      : MOS6setup,
-    DEVunsetup    : MOS6unsetup,
-    DEVpzSetup    : NULL, /* PZsetup routine */
-    DEVtemperature: MOS6temp,
-    DEVtrunc      : MOS6trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : NULL, /* MOS6acLoad, XXX */
-    DEVaccept     : NULL,
-    DEVdestroy    : MOS6destroy,
-    DEVmodDelete  : NULL,
-    DEVdelete     : NULL,
-    DEVsetic      : MOS6getic,
-    DEVask        : MOS6ask,
-    DEVmodAsk     : MOS6mAsk,
-    DEVpzLoad     : NULL, /*MOS6pzLoad, XXX */
-    DEVconvTest   : MOS6convTest,
-    DEVsenSetup   : NULL /* MOS6sSetup */,
-    DEVsenLoad    : NULL /* MOS6sLoad */,
-    DEVsenUpdate  : NULL /* MOS6sUpdate */,
-    DEVsenAcLoad  : NULL /* MOS6sAcLoad */,
-    DEVsenPrint   : NULL /* MOS6sPrint */,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL, /* Distortion routine */
-    DEVnoise      : NULL, /* Noise routine */
+ /* DEVparam      */ MOS6param,
+ /* DEVmodParam   */ MOS6mParam,
+ /* DEVload       */ MOS6load,
+ /* DEVsetup      */ MOS6setup,
+ /* DEVunsetup    */ MOS6unsetup,
+ /* DEVpzSetup    */ NULL, /* PZsetup routine */
+ /* DEVtemperature*/ MOS6temp,
+ /* DEVtrunc      */ MOS6trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ NULL, /* MOS6acLoad, XXX */
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ MOS6destroy,
+ /* DEVmodDelete  */ NULL,
+ /* DEVdelete     */ NULL,
+ /* DEVsetic      */ MOS6getic,
+ /* DEVask        */ MOS6ask,
+ /* DEVmodAsk     */ MOS6mAsk,
+ /* DEVpzLoad     */ NULL, /*MOS6pzLoad, XXX */
+ /* DEVconvTest   */ MOS6convTest,
+ /* DEVsenSetup   */ NULL /* MOS6sSetup */,
+ /* DEVsenLoad    */ NULL /* MOS6sLoad */,
+ /* DEVsenUpdate  */ NULL /* MOS6sUpdate */,
+ /* DEVsenAcLoad  */ NULL /* MOS6sAcLoad */,
+ /* DEVsenPrint   */ NULL /* MOS6sPrint */,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL, /* Distortion routine */
+ /* DEVnoise      */ NULL, /* Noise routine */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &MOS6iSize,
-    DEVmodSize    : &MOS6mSize
+ /* DEVinstSize   */ &MOS6iSize,
+ /* DEVmodSize    */ &MOS6mSize
 };
 
 

src/spicelib/devices/mos9/mos9init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "mos9itf.h"
 #include "mos9ext.h"
@@ -40,39 +40,39 @@ SPICEdev MOS9info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : MOS9param,
-    DEVmodParam   : MOS9mParam,
-    DEVload       : MOS9load,
-    DEVsetup      : MOS9setup,
-    DEVunsetup    : MOS9unsetup,
-    DEVpzSetup    : MOS9setup,
-    DEVtemperature: MOS9temp,
-    DEVtrunc      : MOS9trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : MOS9acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : MOS9destroy,
-    DEVmodDelete  : MOS9mDelete,
-    DEVdelete     : MOS9delete,
-    DEVsetic      : MOS9getic,
-    DEVask        : MOS9ask,
-    DEVmodAsk     : MOS9mAsk,
-    DEVpzLoad     : MOS9pzLoad,
-    DEVconvTest   : MOS9convTest,
-    DEVsenSetup   : MOS9sSetup,
-    DEVsenLoad    : MOS9sLoad,
-    DEVsenUpdate  : MOS9sUpdate,
-    DEVsenAcLoad  : MOS9sAcLoad,
-    DEVsenPrint   : MOS9sPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : MOS9disto,
-    DEVnoise      : MOS9noise,
+ /* DEVparam      */ MOS9param,
+ /* DEVmodParam   */ MOS9mParam,
+ /* DEVload       */ MOS9load,
+ /* DEVsetup      */ MOS9setup,
+ /* DEVunsetup    */ MOS9unsetup,
+ /* DEVpzSetup    */ MOS9setup,
+ /* DEVtemperature*/ MOS9temp,
+ /* DEVtrunc      */ MOS9trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ MOS9acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ MOS9destroy,
+ /* DEVmodDelete  */ MOS9mDelete,
+ /* DEVdelete     */ MOS9delete,
+ /* DEVsetic      */ MOS9getic,
+ /* DEVask        */ MOS9ask,
+ /* DEVmodAsk     */ MOS9mAsk,
+ /* DEVpzLoad     */ MOS9pzLoad,
+ /* DEVconvTest   */ MOS9convTest,
+ /* DEVsenSetup   */ MOS9sSetup,
+ /* DEVsenLoad    */ MOS9sLoad,
+ /* DEVsenUpdate  */ MOS9sUpdate,
+ /* DEVsenAcLoad  */ MOS9sAcLoad,
+ /* DEVsenPrint   */ MOS9sPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ MOS9disto,
+ /* DEVnoise      */ MOS9noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &MOS9iSize,
-    DEVmodSize    : &MOS9mSize
+ /* DEVinstSize   */ &MOS9iSize,
+ /* DEVmodSize    */ &MOS9mSize
 
 };
 

src/spicelib/devices/nbjt/nbjtinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "nbjtitf.h"
 #include "nbjtext.h"
@@ -40,40 +40,40 @@ SPICEdev NBJTinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : NBJTparam,
-    DEVmodParam   : NBJTmParam,
-    DEVload       : NBJTload,
-    DEVsetup      : NBJTsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : NBJTsetup,
-    DEVtemperature: NBJTtemp,
-    DEVtrunc      : NBJTtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : NBJTacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : NBJTdestroy,
-    DEVmodDelete  : NBJTmDelete,
-    DEVdelete     : NBJTdelete,
-    DEVsetic      : NULL,
-    DEVask        : NBJTask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : NBJTpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : NULL,
+ /* DEVparam      */ NBJTparam,
+ /* DEVmodParam   */ NBJTmParam,
+ /* DEVload       */ NBJTload,
+ /* DEVsetup      */ NBJTsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ NBJTsetup,
+ /* DEVtemperature*/ NBJTtemp,
+ /* DEVtrunc      */ NBJTtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ NBJTacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ NBJTdestroy,
+ /* DEVmodDelete  */ NBJTmDelete,
+ /* DEVdelete     */ NBJTdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ NBJTask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ NBJTpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-    DEVdump       : NBJTdump,
-    DEVacct       : NBJTacct,
+ /* DEVdump       */ NBJTdump,
+ /* DEVacct       */ NBJTacct,
 #endif
 
-    DEVinstSize   : &NBJTiSize,
-    DEVmodSize    : &NBJTmSize
+ /* DEVinstSize   */ &NBJTiSize,
+ /* DEVmodSize    */ &NBJTmSize
 
 };
 

src/spicelib/devices/nbjt2/nbt2init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "nbjt2itf.h"
 #include "nbjt2ext.h"
@@ -40,40 +40,40 @@ SPICEdev NBJT2info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : NBJT2param,
-    DEVmodParam   : NBJT2mParam,
-    DEVload       : NBJT2load,
-    DEVsetup      : NBJT2setup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : NBJT2setup,
-    DEVtemperature: NBJT2temp,
-    DEVtrunc      : NBJT2trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : NBJT2acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : NBJT2destroy,
-    DEVmodDelete  : NBJT2mDelete,
-    DEVdelete     : NBJT2delete,
-    DEVsetic      : NULL,
-    DEVask        : NBJT2ask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : NBJT2pzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : NULL,
+ /* DEVparam      */ NBJT2param,
+ /* DEVmodParam   */ NBJT2mParam,
+ /* DEVload       */ NBJT2load,
+ /* DEVsetup      */ NBJT2setup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ NBJT2setup,
+ /* DEVtemperature*/ NBJT2temp,
+ /* DEVtrunc      */ NBJT2trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ NBJT2acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ NBJT2destroy,
+ /* DEVmodDelete  */ NBJT2mDelete,
+ /* DEVdelete     */ NBJT2delete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ NBJT2ask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ NBJT2pzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-    DEVdump       : NBJT2dump,
-    DEVacct       : NBJT2acct,
+ /* DEVdump       */ NBJT2dump,
+ /* DEVacct       */ NBJT2acct,
 #endif  
                     
-    DEVinstSize   : &NBJT2iSize,
-    DEVmodSize    : &NBJT2mSize
+ /* DEVinstSize   */ &NBJT2iSize,
+ /* DEVmodSize    */ &NBJT2mSize
 
 };
 

src/spicelib/devices/ndev/ndevinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "ndevitf.h"
 #include "ndevext.h"
@@ -40,40 +40,40 @@ SPICEdev NDEVinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : NDEVparam,
-    DEVmodParam   : NDEVmParam,
-    DEVload       : NDEVload,
-    DEVsetup      : NDEVsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : NDEVsetup,
-    DEVtemperature: NDEVtemp,
-    DEVtrunc      : NDEVtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : NDEVacLoad,
-    DEVaccept     : NDEVaccept,
-    DEVdestroy    : NDEVdestroy,
-    DEVmodDelete  : NDEVmDelete,
-    DEVdelete     : NDEVdelete,
-    DEVsetic      : NDEVgetic,
-    DEVask        : NDEVask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : NDEVpzLoad,
-    DEVconvTest   : NDEVconvTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : NULL,
+ /* DEVparam      */ NDEVparam,
+ /* DEVmodParam   */ NDEVmParam,
+ /* DEVload       */ NDEVload,
+ /* DEVsetup      */ NDEVsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ NDEVsetup,
+ /* DEVtemperature*/ NDEVtemp,
+ /* DEVtrunc      */ NDEVtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ NDEVacLoad,
+ /* DEVaccept     */ NDEVaccept,
+ /* DEVdestroy    */ NDEVdestroy,
+ /* DEVmodDelete  */ NDEVmDelete,
+ /* DEVdelete     */ NDEVdelete,
+ /* DEVsetic      */ NDEVgetic,
+ /* DEVask        */ NDEVask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ NDEVpzLoad,
+ /* DEVconvTest   */ NDEVconvTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif               
                     
-    DEVinstSize   : &NDEViSize,
-    DEVmodSize    : &NDEVmSize
+ /* DEVinstSize   */ &NDEViSize,
+ /* DEVmodSize    */ &NDEVmSize
 
 };
 

src/spicelib/devices/numd/numdinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "numditf.h"
 #include "numdext.h"
@@ -40,40 +40,40 @@ SPICEdev NUMDinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : NUMDparam,
-    DEVmodParam   : NUMDmParam,
-    DEVload       : NUMDload,
-    DEVsetup      : NUMDsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : NUMDsetup,
-    DEVtemperature: NUMDtemp,
-    DEVtrunc      : NUMDtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : NUMDacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : NUMDdestroy,
-    DEVmodDelete  : NUMDmDelete,
-    DEVdelete     : NUMDdelete,
-    DEVsetic      : NULL,
-    DEVask        : NUMDask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : NUMDpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : NULL,
+ /* DEVparam      */ NUMDparam,
+ /* DEVmodParam   */ NUMDmParam,
+ /* DEVload       */ NUMDload,
+ /* DEVsetup      */ NUMDsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ NUMDsetup,
+ /* DEVtemperature*/ NUMDtemp,
+ /* DEVtrunc      */ NUMDtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ NUMDacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ NUMDdestroy,
+ /* DEVmodDelete  */ NUMDmDelete,
+ /* DEVdelete     */ NUMDdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ NUMDask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ NUMDpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-    DEVdump	  : NUMDdump,
-    DEVacct       : NUMDacct,
+ /* DEVdump	  */ NUMDdump,
+ /* DEVacct       */ NUMDacct,
 #endif
                     
-    DEVinstSize   : &NUMDiSize,
-    DEVmodSize    : &NUMDmSize
+ /* DEVinstSize   */ &NUMDiSize,
+ /* DEVmodSize    */ &NUMDmSize
 
 };
 

src/spicelib/devices/numd2/numd2init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "numd2itf.h"
 #include "numd2ext.h"
@@ -40,40 +40,40 @@ SPICEdev NUMD2info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : NUMD2param,
-    DEVmodParam   : NUMD2mParam,
-    DEVload       : NUMD2load,
-    DEVsetup      : NUMD2setup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : NUMD2setup,
-    DEVtemperature: NUMD2temp,
-    DEVtrunc      : NUMD2trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : NUMD2acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : NUMD2destroy,
-    DEVmodDelete  : NUMD2mDelete,
-    DEVdelete     : NUMD2delete,
-    DEVsetic      : NULL,
-    DEVask        : NUMD2ask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : NUMD2pzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : NULL,
+ /* DEVparam      */ NUMD2param,
+ /* DEVmodParam   */ NUMD2mParam,
+ /* DEVload       */ NUMD2load,
+ /* DEVsetup      */ NUMD2setup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ NUMD2setup,
+ /* DEVtemperature*/ NUMD2temp,
+ /* DEVtrunc      */ NUMD2trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ NUMD2acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ NUMD2destroy,
+ /* DEVmodDelete  */ NUMD2mDelete,
+ /* DEVdelete     */ NUMD2delete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ NUMD2ask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ NUMD2pzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-    DEVdump       : NUMD2dump,
-    DEVacct       : NUMD2acct,
+ /* DEVdump       */ NUMD2dump,
+ /* DEVacct       */ NUMD2acct,
 #endif
                     
-    DEVinstSize   : &NUMD2iSize,
-    DEVmodSize    : &NUMD2mSize
+ /* DEVinstSize   */ &NUMD2iSize,
+ /* DEVmodSize    */ &NUMD2mSize
 
 };
 

src/spicelib/devices/numos/numosinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "numositf.h"
 #include "numosext.h"
@@ -40,40 +40,40 @@ SPICEdev NUMOSinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : NUMOSparam,
-    DEVmodParam   : NUMOSmParam,
-    DEVload       : NUMOSload,
-    DEVsetup      : NUMOSsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : NUMOSsetup,
-    DEVtemperature: NUMOStemp,
-    DEVtrunc      : NUMOStrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : NUMOSacLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : NUMOSdestroy,
-    DEVmodDelete  : NUMOSmDelete,
-    DEVdelete     : NUMOSdelete,
-    DEVsetic      : NULL,
-    DEVask        : NUMOSask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : NUMOSpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : NULL,
+ /* DEVparam      */ NUMOSparam,
+ /* DEVmodParam   */ NUMOSmParam,
+ /* DEVload       */ NUMOSload,
+ /* DEVsetup      */ NUMOSsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ NUMOSsetup,
+ /* DEVtemperature*/ NUMOStemp,
+ /* DEVtrunc      */ NUMOStrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ NUMOSacLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ NUMOSdestroy,
+ /* DEVmodDelete  */ NUMOSmDelete,
+ /* DEVdelete     */ NUMOSdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ NUMOSask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ NUMOSpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-    DEVdump       : NUMOSdump,
-    DEVacct       : NUMOSacct,
+ /* DEVdump       */ NUMOSdump,
+ /* DEVacct       */ NUMOSacct,
 #endif
                     
-    DEVinstSize   : &NUMOSiSize,
-    DEVmodSize    : &NUMOSmSize
+ /* DEVinstSize   */ &NUMOSiSize,
+ /* DEVmodSize    */ &NUMOSmSize
 
 };
 

src/spicelib/devices/res/resinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "resitf.h"
 #include "resext.h"
@@ -40,39 +40,39 @@ SPICEdev RESinfo = {
 	0
     },
 
-    DEVparam      : RESparam,
-    DEVmodParam   : RESmParam,
-    DEVload       : RESload,
-    DEVsetup      : RESsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : RESsetup,
-    DEVtemperature: REStemp,
-    DEVtrunc      : NULL,
-    DEVfindBranch : NULL,
-    DEVacLoad     : RESacload,  /* ac load and normal load are identical */
-    DEVaccept     : NULL,
-    DEVdestroy    : RESdestroy,
-    DEVmodDelete  : RESmDelete,
-    DEVdelete     : RESdelete,
-    DEVsetic      : NULL,
-    DEVask        : RESask,
-    DEVmodAsk     : RESmodAsk,
-    DEVpzLoad     : RESpzLoad,
-    DEVconvTest   : NULL,     /* RESconvTest, XXXX experimental */
-    DEVsenSetup   : RESsSetup,
-    DEVsenLoad    : RESsLoad,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : RESsAcLoad,
-    DEVsenPrint   : RESsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : RESnoise,
+ /* DEVparam      */ RESparam,
+ /* DEVmodParam   */ RESmParam,
+ /* DEVload       */ RESload,
+ /* DEVsetup      */ RESsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ RESsetup,
+ /* DEVtemperature*/ REStemp,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ RESacload,  /* ac load and normal load are identical */
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ RESdestroy,
+ /* DEVmodDelete  */ RESmDelete,
+ /* DEVdelete     */ RESdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ RESask,
+ /* DEVmodAsk     */ RESmodAsk,
+ /* DEVpzLoad     */ RESpzLoad,
+ /* DEVconvTest   */ NULL,     /* RESconvTest, XXXX experimental */
+ /* DEVsenSetup   */ RESsSetup,
+ /* DEVsenLoad    */ RESsLoad,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ RESsAcLoad,
+ /* DEVsenPrint   */ RESsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ RESnoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &RESiSize,
-    DEVmodSize    : &RESmSize
+ /* DEVinstSize   */ &RESiSize,
+ /* DEVmodSize    */ &RESmSize
 
 };
 

src/spicelib/devices/soi3/soi3init.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "soi3itf.h"
 #include "soi3ext.h"
@@ -40,39 +40,39 @@ SPICEdev SOI3info = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : SOI3param,
-    DEVmodParam   : SOI3mParam,
-    DEVload       : SOI3load,
-    DEVsetup      : SOI3setup,
-    DEVunsetup    : SOI3unsetup,
-    DEVpzSetup    : SOI3setup,
-    DEVtemperature: SOI3temp,
-    DEVtrunc      : SOI3trunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : SOI3acLoad,
-    DEVaccept     : NULL,
-    DEVdestroy    : SOI3destroy,
-    DEVmodDelete  : SOI3mDelete,
-    DEVdelete     : SOI3delete,
-    DEVsetic      : SOI3getic,
-    DEVask        : SOI3ask,
-    DEVmodAsk     : SOI3mAsk,
-    DEVpzLoad     : NULL,
-    DEVconvTest   : SOI3convTest,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,
-    DEVnoise      : SOI3noise,
+ /* DEVparam      */ SOI3param,
+ /* DEVmodParam   */ SOI3mParam,
+ /* DEVload       */ SOI3load,
+ /* DEVsetup      */ SOI3setup,
+ /* DEVunsetup    */ SOI3unsetup,
+ /* DEVpzSetup    */ SOI3setup,
+ /* DEVtemperature*/ SOI3temp,
+ /* DEVtrunc      */ SOI3trunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ SOI3acLoad,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ SOI3destroy,
+ /* DEVmodDelete  */ SOI3mDelete,
+ /* DEVdelete     */ SOI3delete,
+ /* DEVsetic      */ SOI3getic,
+ /* DEVask        */ SOI3ask,
+ /* DEVmodAsk     */ SOI3mAsk,
+ /* DEVpzLoad     */ NULL,
+ /* DEVconvTest   */ SOI3convTest,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ SOI3noise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &SOI3iSize,
-    DEVmodSize    : &SOI3mSize
+ /* DEVinstSize   */ &SOI3iSize,
+ /* DEVmodSize    */ &SOI3mSize
 
 };
 

src/spicelib/devices/sw/swinit.c

@@ -1,7 +1,7 @@
 /* Modified: Alansfixes */
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "switf.h"
 #include "swext.h"
@@ -41,39 +41,39 @@ SPICEdev SWinfo = {
 	0
     },
 
-    DEVparam      : SWparam,
-    DEVmodParam   : SWmParam,
-    DEVload       : SWload,
-    DEVsetup      : SWsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : SWsetup,
-    DEVtemperature: NULL,
-    DEVtrunc      : SWtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : SWacLoad,   
-    DEVaccept     : NULL,
-    DEVdestroy    : SWdestroy,
-    DEVmodDelete  : SWmDelete,
-    DEVdelete     : SWdelete,
-    DEVsetic      : NULL,
-    DEVask        : SWask,
-    DEVmodAsk     : SWmAsk,
-    DEVpzLoad     : SWpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL, /* DISTO */
-    DEVnoise      : SWnoise,
+ /* DEVparam      */ SWparam,
+ /* DEVmodParam   */ SWmParam,
+ /* DEVload       */ SWload,
+ /* DEVsetup      */ SWsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ SWsetup,
+ /* DEVtemperature*/ NULL,
+ /* DEVtrunc      */ SWtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ SWacLoad,   
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ SWdestroy,
+ /* DEVmodDelete  */ SWmDelete,
+ /* DEVdelete     */ SWdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ SWask,
+ /* DEVmodAsk     */ SWmAsk,
+ /* DEVpzLoad     */ SWpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL, /* DISTO */
+ /* DEVnoise      */ SWnoise,
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif /* CIDER */                        
-    DEVinstSize   : &SWiSize,
-    DEVmodSize    : &SWmSize
+ /* DEVinstSize   */ &SWiSize,
+ /* DEVmodSize    */ &SWmSize
 
 };
 

src/spicelib/devices/tra/trainit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "traitf.h"
 #include "traext.h"
@@ -40,39 +40,39 @@ SPICEdev TRAinfo = {
 	0
     },
 
-    DEVparam      : TRAparam,
-    DEVmodParam   : NULL,
-    DEVload       : TRAload,
-    DEVsetup      : TRAsetup,
-    DEVunsetup    : TRAunsetup,
-    DEVpzSetup    : TRAsetup,
-    DEVtemperature: TRAtemp,
-    DEVtrunc      : TRAtrunc,
-    DEVfindBranch : NULL,
-    DEVacLoad     : TRAacLoad,
-    DEVaccept     : TRAaccept,
-    DEVdestroy    : TRAdestroy,
-    DEVmodDelete  : TRAmDelete,
-    DEVdelete     : TRAdelete,
-    DEVsetic      : NULL,
-    DEVask        : TRAask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : NULL,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ TRAparam,
+ /* DEVmodParam   */ NULL,
+ /* DEVload       */ TRAload,
+ /* DEVsetup      */ TRAsetup,
+ /* DEVunsetup    */ TRAunsetup,
+ /* DEVpzSetup    */ TRAsetup,
+ /* DEVtemperature*/ TRAtemp,
+ /* DEVtrunc      */ TRAtrunc,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ TRAacLoad,
+ /* DEVaccept     */ TRAaccept,
+ /* DEVdestroy    */ TRAdestroy,
+ /* DEVmodDelete  */ TRAmDelete,
+ /* DEVdelete     */ TRAdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ TRAask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ NULL,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &TRAiSize,
-    DEVmodSize    : &TRAmSize
+ /* DEVinstSize   */ &TRAiSize,
+ /* DEVmodSize    */ &TRAmSize
 
 };
 

src/spicelib/devices/txl/txlinit.c

@@ -3,9 +3,9 @@ Copyright 1992 Regents of the University of California.  All rights
 reserved.
 Author: 1992 Charles Hough
 **********/
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "txlitf.h"
 #include "txlext.h"
@@ -45,39 +45,39 @@ SPICEdev TXLinfo = {
     0
   },
 
-  DEVparam      : TXLparam,
-  DEVmodParam   : TXLmParam,
-  DEVload       : TXLload,
-  DEVsetup      : TXLsetup,
-  DEVunsetup    : TXLunsetup,
-  DEVpzSetup    : NULL,
-  DEVtemperature: NULL,
-  DEVtrunc      : NULL,
-  DEVfindBranch : NULL, /* TXLfindBranch default: disabled */
-  DEVacLoad     : TXLload, /* ac load */
-  DEVaccept     : NULL, /* TXLaccept default: disabled */
-  DEVdestroy    : TXLdestroy,
-  DEVmodDelete  : TXLmDelete,
-  DEVdelete     : TXLdelete,
-  DEVsetic      : NULL,
-  DEVask        : TXLask,
-  DEVmodAsk     : TXLmodAsk,
-  DEVpzLoad     : NULL,
-  DEVconvTest   : NULL,
-  DEVsenSetup   : NULL,
-  DEVsenLoad    : NULL,
-  DEVsenUpdate  : NULL,
-  DEVsenAcLoad  : NULL,
-  DEVsenPrint   : NULL,
-  DEVsenTrunc   : NULL,
-  DEVdisto      : NULL,
-  DEVnoise      : NULL,
+ /* DEVparam      */ TXLparam,
+ /* DEVmodParam   */ TXLmParam,
+ /* DEVload       */ TXLload,
+ /* DEVsetup      */ TXLsetup,
+ /* DEVunsetup    */ TXLunsetup,
+ /* DEVpzSetup    */ NULL,
+ /* DEVtemperature*/ NULL,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ NULL, /* TXLfindBranch default disabled */
+ /* DEVacLoad     */ TXLload, /* ac load */
+ /* DEVaccept     */ NULL, /* TXLaccept default disabled */
+ /* DEVdestroy    */ TXLdestroy,
+ /* DEVmodDelete  */ TXLmDelete,
+ /* DEVdelete     */ TXLdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ TXLask,
+ /* DEVmodAsk     */ TXLmodAsk,
+ /* DEVpzLoad     */ NULL,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,
+ /* DEVnoise      */ NULL,
 #ifdef CIDER
-  DEVdump       : NULL,
-  DEVacct       : NULL,  
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,  
 #endif
-  &TXLiSize,
-  &TXLmSize
+    &TXLiSize,
+    &TXLmSize
 
 };
 

src/spicelib/devices/urc/urcinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "urcitf.h"
 #include "urcext.h"
@@ -40,39 +40,39 @@ SPICEdev URCinfo = {
 	0
     },
 
-    DEVparam      : URCparam,
-    DEVmodParam   : URCmParam,
-    DEVload       : NULL,
-    DEVsetup      : URCsetup,
-    DEVunsetup    : URCunsetup,
-    DEVpzSetup    : URCsetup,
-    DEVtemperature: NULL,
-    DEVtrunc      : NULL,
-    DEVfindBranch : NULL,
-    DEVacLoad     : NULL,
-    DEVaccept     : NULL,
-    DEVdestroy    : URCdestroy,
-    DEVmodDelete  : URCmDelete,
-    DEVdelete     : URCdelete,
-    DEVsetic      : NULL,
-    DEVask        : URCask,
-    DEVmodAsk     : URCmAsk,
-    DEVpzLoad     : NULL,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ URCparam,
+ /* DEVmodParam   */ URCmParam,
+ /* DEVload       */ NULL,
+ /* DEVsetup      */ URCsetup,
+ /* DEVunsetup    */ URCunsetup,
+ /* DEVpzSetup    */ URCsetup,
+ /* DEVtemperature*/ NULL,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ NULL,
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ URCdestroy,
+ /* DEVmodDelete  */ URCmDelete,
+ /* DEVdelete     */ URCdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ URCask,
+ /* DEVmodAsk     */ URCmAsk,
+ /* DEVpzLoad     */ NULL,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &URCiSize,
-    DEVmodSize    : &URCmSize
+ /* DEVinstSize   */ &URCiSize,
+ /* DEVmodSize    */ &URCmSize
 
 };
 

src/spicelib/devices/vccs/vccsinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "vccsitf.h"
 #include "vccsext.h"
@@ -40,39 +40,39 @@ SPICEdev VCCSinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : VCCSparam,
-    DEVmodParam   : NULL,
-    DEVload       : VCCSload,
-    DEVsetup      : VCCSsetup,
-    DEVunsetup    : NULL,
-    DEVpzSetup    : VCCSsetup,
-    DEVtemperature: NULL,
-    DEVtrunc      : NULL,
-    DEVfindBranch : NULL,
-    DEVacLoad     : VCCSload,   /* ac and normal loads are identical */
-    DEVaccept     : NULL,
-    DEVdestroy    : VCCSdestroy,
-    DEVmodDelete  : VCCSmDelete,
-    DEVdelete     : VCCSdelete,
-    DEVsetic      : NULL,
-    DEVask        : VCCSask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : VCCSpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : VCCSsSetup,
-    DEVsenLoad    : VCCSsLoad,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : VCCSsAcLoad,
-    DEVsenPrint   : VCCSsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ VCCSparam,
+ /* DEVmodParam   */ NULL,
+ /* DEVload       */ VCCSload,
+ /* DEVsetup      */ VCCSsetup,
+ /* DEVunsetup    */ NULL,
+ /* DEVpzSetup    */ VCCSsetup,
+ /* DEVtemperature*/ NULL,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ NULL,
+ /* DEVacLoad     */ VCCSload,   /* ac and normal loads are identical */
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ VCCSdestroy,
+ /* DEVmodDelete  */ VCCSmDelete,
+ /* DEVdelete     */ VCCSdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ VCCSask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ VCCSpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ VCCSsSetup,
+ /* DEVsenLoad    */ VCCSsLoad,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ VCCSsAcLoad,
+ /* DEVsenPrint   */ VCCSsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &VCCSiSize,
-    DEVmodSize    : &VCCSmSize
+ /* DEVinstSize   */ &VCCSiSize,
+ /* DEVmodSize    */ &VCCSmSize
 
 
 };

src/spicelib/devices/vcvs/vcvsinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "vcvsitf.h"
 #include "vcvsext.h"
@@ -40,39 +40,39 @@ SPICEdev VCVSinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : VCVSparam,
-    DEVmodParam   : NULL,
-    DEVload       : VCVSload,
-    DEVsetup      : VCVSsetup,
-    DEVunsetup    : VCVSunsetup,
-    DEVpzSetup    : VCVSsetup,
-    DEVtemperature: NULL,
-    DEVtrunc      : NULL,
-    DEVfindBranch : VCVSfindBr,
-    DEVacLoad     : VCVSload,   /* AC and normal loads are identical */
-    DEVaccept     : NULL,
-    DEVdestroy    : VCVSdestroy,
-    DEVmodDelete  : VCVSmDelete,
-    DEVdelete     : VCVSdelete,
-    DEVsetic      : NULL,
-    DEVask        : VCVSask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : VCVSpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : VCVSsSetup,
-    DEVsenLoad    : VCVSsLoad,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : VCVSsAcLoad,
-    DEVsenPrint   : VCVSsPrint,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL,	/* DISTO */
-    DEVnoise      : NULL,	/* NOISE */
+ /* DEVparam      */ VCVSparam,
+ /* DEVmodParam   */ NULL,
+ /* DEVload       */ VCVSload,
+ /* DEVsetup      */ VCVSsetup,
+ /* DEVunsetup    */ VCVSunsetup,
+ /* DEVpzSetup    */ VCVSsetup,
+ /* DEVtemperature*/ NULL,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ VCVSfindBr,
+ /* DEVacLoad     */ VCVSload,   /* AC and normal loads are identical */
+ /* DEVaccept     */ NULL,
+ /* DEVdestroy    */ VCVSdestroy,
+ /* DEVmodDelete  */ VCVSmDelete,
+ /* DEVdelete     */ VCVSdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ VCVSask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ VCVSpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ VCVSsSetup,
+ /* DEVsenLoad    */ VCVSsLoad,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ VCVSsAcLoad,
+ /* DEVsenPrint   */ VCVSsPrint,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL,	/* DISTO */
+ /* DEVnoise      */ NULL,	/* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                          
-    DEVinstSize   : &VCVSiSize,
-    DEVmodSize    : &VCVSmSize
+ /* DEVinstSize   */ &VCVSiSize,
+ /* DEVmodSize    */ &VCVSmSize
 
 };
 

src/spicelib/devices/vsrc/vsrcinit.c

@@ -1,6 +1,6 @@
-#include <config.h>
+#include "config.h"
 
-#include <devdefs.h>
+#include "devdefs.h"
 
 #include "vsrcitf.h"
 #include "vsrcext.h"
@@ -40,39 +40,39 @@ SPICEdev VSRCinfo = {
 	DEV_DEFAULT
     },
 
-    DEVparam      : VSRCparam,
-    DEVmodParam   : NULL,
-    DEVload       : VSRCload,
-    DEVsetup      : VSRCsetup,
-    DEVunsetup    : VSRCunsetup,
-    DEVpzSetup    : VSRCpzSetup,
-    DEVtemperature: VSRCtemp,
-    DEVtrunc      : NULL,
-    DEVfindBranch : VSRCfindBr,
-    DEVacLoad     : VSRCacLoad,
-    DEVaccept     : VSRCaccept,
-    DEVdestroy    : VSRCdestroy,
-    DEVmodDelete  : VSRCmDelete,
-    DEVdelete     : VSRCdelete,
-    DEVsetic      : NULL,
-    DEVask        : VSRCask,
-    DEVmodAsk     : NULL,
-    DEVpzLoad     : VSRCpzLoad,
-    DEVconvTest   : NULL,
-    DEVsenSetup   : NULL,
-    DEVsenLoad    : NULL,
-    DEVsenUpdate  : NULL,
-    DEVsenAcLoad  : NULL,
-    DEVsenPrint   : NULL,
-    DEVsenTrunc   : NULL,
-    DEVdisto      : NULL, /* DISTO */
-    DEVnoise      : NULL, /* NOISE */
+ /* DEVparam      */ VSRCparam,
+ /* DEVmodParam   */ NULL,
+ /* DEVload       */ VSRCload,
+ /* DEVsetup      */ VSRCsetup,
+ /* DEVunsetup    */ VSRCunsetup,
+ /* DEVpzSetup    */ VSRCpzSetup,
+ /* DEVtemperature*/ VSRCtemp,
+ /* DEVtrunc      */ NULL,
+ /* DEVfindBranch */ VSRCfindBr,
+ /* DEVacLoad     */ VSRCacLoad,
+ /* DEVaccept     */ VSRCaccept,
+ /* DEVdestroy    */ VSRCdestroy,
+ /* DEVmodDelete  */ VSRCmDelete,
+ /* DEVdelete     */ VSRCdelete,
+ /* DEVsetic      */ NULL,
+ /* DEVask        */ VSRCask,
+ /* DEVmodAsk     */ NULL,
+ /* DEVpzLoad     */ VSRCpzLoad,
+ /* DEVconvTest   */ NULL,
+ /* DEVsenSetup   */ NULL,
+ /* DEVsenLoad    */ NULL,
+ /* DEVsenUpdate  */ NULL,
+ /* DEVsenAcLoad  */ NULL,
+ /* DEVsenPrint   */ NULL,
+ /* DEVsenTrunc   */ NULL,
+ /* DEVdisto      */ NULL, /* DISTO */
+ /* DEVnoise      */ NULL, /* NOISE */
 #ifdef CIDER
-    DEVdump       : NULL,
-    DEVacct       : NULL,
+ /* DEVdump       */ NULL,
+ /* DEVacct       */ NULL,
 #endif                        
-    DEVinstSize   : &VSRCiSize,
-    DEVmodSize    : &VSRCmSize
+ /* DEVinstSize   */ &VSRCiSize,
+ /* DEVmodSize    */ &VSRCmSize
 };