- 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:
42
intserv.c
42
intserv.c
@ -8,6 +8,10 @@
|
||||
|
||||
Mark Koennecke, November 1996
|
||||
Revised: Mark Koennecke, September 1997
|
||||
|
||||
Removed unused UDP interrupt port stuff
|
||||
|
||||
Mark Koennecke, February 2013
|
||||
|
||||
Copyright: see copyright.h
|
||||
|
||||
@ -22,10 +26,7 @@
|
||||
#include <strlutil.h>
|
||||
|
||||
#include "fortify.h"
|
||||
#include "conman.h"
|
||||
#include "SCinter.h"
|
||||
#include "nserver.h"
|
||||
#include "obdes.h"
|
||||
#include "sics.h"
|
||||
#include "network.h"
|
||||
#include "interrupt.h"
|
||||
#include "status.h"
|
||||
@ -40,8 +41,6 @@
|
||||
#define MAXINTERRUPT 7
|
||||
#define INTERUPTWAIT 5
|
||||
|
||||
static mkChannel *IntPort = NULL;
|
||||
static pTaskMan pTask = NULL;
|
||||
/*----------------------------------------------------------------------------*/
|
||||
static char *pIntText[] = {
|
||||
"continue",
|
||||
@ -53,35 +52,6 @@ static char *pIntText[] = {
|
||||
"end",
|
||||
NULL
|
||||
};
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
int ServerSetupInterrupt(int iPort, pNetRead pNet, pTaskMan pTasker)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
||||
pTask = pTasker;
|
||||
/* setup interrupt port */
|
||||
IntPort = UDPOpen(iPort);
|
||||
if (IntPort == NULL) {
|
||||
return 0;
|
||||
} else {
|
||||
NetReadRegister(pNet, IntPort, udp, NULL);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
void ServerStopInterrupt(void)
|
||||
{
|
||||
|
||||
/* close the port */
|
||||
if (IntPort) {
|
||||
NETClosePort(IntPort);
|
||||
free(IntPort);
|
||||
}
|
||||
}
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
void SetInterrupt(int iCode)
|
||||
{
|
||||
@ -89,7 +59,7 @@ void SetInterrupt(int iCode)
|
||||
|
||||
iInt = iCode;
|
||||
|
||||
TaskSignal(pTask, SICSINT, &iInt);
|
||||
TaskSignal(pServ->pTasker, SICSINT, &iInt);
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
Reference in New Issue
Block a user