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

merge work in progress

Browse Source
This commit is contained in:
Douglas Clowes
2012-11-26 15:10:25 +11:00
parent 9a1be5a80b
commit 49123234d0
6 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
site_ansto/site_ansto.c
View File

@@ -50,11 +50,6 @@
/*@observer@*//*@null@*/ pCounterDriver CreateMonCounter(/*@observer@*/SConnection *pCon, /*@observer@*/char *name, char *params);
/*
from tcpdornier.c
*/
extern int VelSelTcpFactory(SConnection *pCon, SicsInterp *pSics, void *pData, int argc, char *argv[]);
extern pCodri MakeTcpDoChoDriver(char *tclArray, SConnection *pCon);
extern void AddGalilProtocoll();
extern void AddModbusProtocoll();
extern void AddOxfordProtocoll();
@@ -139,7 +134,6 @@ static void AddCommands(SicsInterp *pInter)
ORHVPSInitProtocol(pInter);
LS340InitProtocol(pInter);
AddCommand(pInter,"InstallProtocolHandler", InstallProtocol,NULL,NULL);
AddCommand(pInter,"MakeTCPSelector",VelSelTcpFactory,NULL,NULL);
AddCommand(pInter,"hostnam",hostNamCmd,NULL,NULL);
AddCommand(pInter,"portnum",portNumCmd,NULL,NULL);
AddCommand(pInter,"abortbatch",AbortBatch,NULL,NULL);
@@ -237,7 +231,7 @@ static pCodri CreateController(SConnection *pCon,int argc, char *argv[]){
eError);
return NULL;
}
return MakeTcpDoChoDriver(argv[1], pCon);
return NULL;
}
return pNew;
}