- Removed old code
- Extended tasker to support task groups - Added task functions for motors and counters - Modifed devexec to use the new task functions - Modified TAS to treat the monochromator separatly - Coded a EIGER monochromator module to reflect even more new requirements - Added EPICS counters and motors - Modified multicounter to be better performing SKIPPED: psi/eigermono.c psi/make_gen psi/makefile_linux psi/psi.c psi/sinqhttp.c
This commit is contained in:
19
nserver.c
19
nserver.c
@@ -39,10 +39,6 @@
|
||||
#include "sicshipadaba.h"
|
||||
#include "commandlog.h"
|
||||
|
||||
int ServerSetupInterrupt(int iPort, pNetRead pNet, pTaskMan pTasker);
|
||||
/*
|
||||
configures a port for listening for interrupts
|
||||
*/
|
||||
|
||||
extern void StopExit(void); /* in SICSmain.c */
|
||||
|
||||
@@ -236,10 +232,6 @@ int InitServer(char *file, pServer * pServ)
|
||||
IFDeleteOptions(pSICSOptions);
|
||||
return 0;
|
||||
}
|
||||
iRet = ServerSetupInterrupt(iPort, pReader, self->pTasker);
|
||||
if (!iRet) {
|
||||
SCWrite(pCon, "WARNING: UDP interrupt port not initialized", eWarning);
|
||||
}
|
||||
/* install a secret fully priviledged entry point for ME */
|
||||
AddUser("Achterbahn", "Kiel", usInternal);
|
||||
|
||||
@@ -346,10 +338,6 @@ void StopServer(pServer self)
|
||||
/* remove the in memory password database */
|
||||
KillPasswd();
|
||||
|
||||
|
||||
/* close Interrupt system */
|
||||
ServerStopInterrupt();
|
||||
|
||||
/* Remove Status Callback */
|
||||
KillStatus(NULL);
|
||||
|
||||
@@ -481,6 +469,13 @@ int UserWait(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
}
|
||||
}
|
||||
/*--------------------------------------------------------------------------*/
|
||||
int UserYield(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
int argc, char *argv[])
|
||||
{
|
||||
TaskYield(pServ->pTasker);
|
||||
return 1;
|
||||
}
|
||||
/*--------------------------------------------------------------------------*/
|
||||
int SicsWait(long lTime)
|
||||
{
|
||||
pTaskMan pTasker = NULL;
|
||||
|
||||
Reference in New Issue
Block a user