linse/sicspsi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- remove drivers based on eve

Browse Source 
- added drviers base on ease/pardef
- generalized initialization
This commit is contained in:
zolliker
2005-09-05 08:10:26 +00:00
parent f5bb7d6366
commit cf1dcda2c5
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
make_gen
View File

@ -16,8 +16,10 @@ OBJ=psi.o buffer.o ruli.o dmc.o nxsans.o nextrics.o sps.o pimotor.o \
el755driv.o amorscan.o serial.o scontroller.o t_update.o \
t_rlp.o t_conv.o el737hpdriv.o dornier2.o el734hp.o \
el737hpv2driv.o swmotor2.o tricssupport.o \
oicom.o fsm.o remob.o eve.o logger.o dgrambroadcast.o \
ipsdriv.o itcdriv.o ilmdriv.o lcdriv.o sinq.o tabledrive.o
fsm.o remob.o logger.o sugar.o pardef.o \
ease.o initializer.o strobj.o oxinst.o \
ipsdriv.o ilmdriv.o itcdriv.o ighdriv.o euro2kdriv.o modbus.o \
dgrambroadcast.o sinq.o tabledrive.o
libpsi.a: $(OBJ)
rm -f libpsi.a

34
psi.c
View File

@ -54,9 +54,26 @@
#include "sinq.h"
#include "tabledrive.h"
static pSite sitePSI = NULL;
int LoggerGraph(SConnection *pCon, SicsInterp *pSics, void *pData, int argc, char *argv[]);
/*--------------------------------------------------------------------------*/
void SiteInit(void) {
#define INIT(F) { void F(void); F(); }
/* insert here initialization routines ... */
INIT(LoggerInit);
INIT(IlmStartup);
INIT(IpsStartup);
INIT(ItcStartup);
INIT(IghStartup);
INIT(Euro2kStartup);
INIT(StrObjStartup);
}
static pSite sitePSI = NULL;
/*----------------------------------------------------------------------*/
static void AddPsiCommands(SicsInterp *pInter){
@ -82,7 +99,6 @@ static void AddPsiCommands(SicsInterp *pInter){
AddCommand(pInter,"SerialInit",SerialInit,NULL,NULL);
AddCommand(pInter,"InstallFocusMerge",InstallFocusMerge,NULL,NULL);
AddCommand(pInter,"Remob",RemobCreate,NULL,NULL);
AddCommand(pInter,"Graph",LoggerGraph,NULL,NULL);
AddCommand(pInter,"MakeSinq",SinqFactory,NULL,NULL);
AddCommand(pInter,"MakeTableDrive",TableDriveFactory,NULL,NULL);
/*
@ -346,10 +362,6 @@ static void ConfigureController(char *name, pEVControl pNew,
/*-------------------------------------------------------------------*/
extern pEVDriver CreateSLSDriv(int argc, char *argv[]);
pEVControl IpsMakeEVC(SConnection *pCon, int argc, char *argv[]);
pEVControl ItcMakeEVC(SConnection *pCon, int argc, char *argv[]);
pEVControl IlmMakeEVC(SConnection *pCon, int argc, char *argv[]);
pEVControl LcMakeEVC(SConnection *pCon, int argc, char *argv[]);
/*------------------------------------------------------------------*/
static pEVControl InstallPsiEnvironmentController(SicsInterp *pSics,
@ -389,14 +401,6 @@ static pEVControl InstallPsiEnvironmentController(SicsInterp *pSics,
commandInstalled = 1;
}
}
} else if(strcmp(argv[3],"ips") == 0) {
return IpsMakeEVC(pCon, argc-2, argv+2); /* we should organize all devices like this M.Z. */
} else if(strcmp(argv[3],"itc") == 0) {
return ItcMakeEVC(pCon, argc-2, argv+2);
} else if(strcmp(argv[3],"ilm") == 0) {
return IlmMakeEVC(pCon, argc-2, argv+2);
} else if(strcmp(argv[3],"lc") == 0) {
return LcMakeEVC(pCon, argc-2, argv+2);
} else if(strcmp(argv[3],"bruker") == 0){
checkError = 1;
pDriv = CreateBrukerDriver(argc-4,&argv[4]);