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

Linked epics statically

Browse Source
This commit is contained in:
koennecke
2014-04-10 10:53:18 +02:00
parent 722fab935e
commit 8e1ac545ce
8 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commandlog.h
View File

@ -9,7 +9,7 @@
--------------------------------------------------------------------------*/ --------------------------------------------------------------------------*/
#ifndef COMMANDLOG #ifndef COMMANDLOG
#define COMMANDLOG #define COMMANDLOG
void WriteToCommandLog(char *prompt, char *pText); void WriteToCommandLog(const char *prompt, const char *pText);
void WriteToCommandLogId(char *prompt, int id, char *text); void WriteToCommandLogId(char *prompt, int id, char *text);
void WriteToCommandLogCmd(int id, char *text); void WriteToCommandLogCmd(int id, char *text);
int CompactCommandLog(void); int CompactCommandLog(void);

2
hipadaba.h
View File

@ -71,7 +71,7 @@ typedef struct __hipadaba {
struct __hdbcallback *callBackChain; struct __hdbcallback *callBackChain;
char *name; char *name;
hdbValue value; hdbValue value;
int protected; int iprotected;
pStringDict properties; pStringDict properties;
} Hdb, *pHdb; } Hdb, *pHdb;
/*-------------- return values for callback functions -------------------------*/ /*-------------- return values for callback functions -------------------------*/

2
make_gen
View File

@ -69,7 +69,7 @@ all: libmat libhlib libtecsl libpsi SICServer
full: purge all full: purge all
SICServer: $(OBJ) $(SUBLIBS) SICServer: $(OBJ) $(SUBLIBS)
$(CC) $(DBG) -o SICServer $(OBJ) $(LIBS) g++ $(DBG) -o SICServer $(OBJ) $(LIBS)
matrix/libmatrix.a: libmat matrix/libmatrix.a: libmat

5
makefile_slinux
View File

@ -12,11 +12,14 @@ NI= -DHAVENI
NIOBJ= nigpib.o NIOBJ= nigpib.o
NILIB=$(SINQDIR)/sl6/lib/cib.o NILIB=$(SINQDIR)/sl6/lib/cib.o
EPICSLIBS=-L$(SINQDIR)/sl6/lib/linux-x86 -lezca -lca -lCom EPICSDIR=$(SINQDIR)/sl6/lib/linux-x86
EPICSLIBS=$(EPICSDIR)/libezca.a $(EPICSDIR)/libca.a $(EPICSDIR)/libCom.a -lreadline -lhistory
#EPICSLIBS=-L$(EPICSDIR) -lezca -lca -lCom
include sllinux_def include sllinux_def
CC = gcc CC = gcc
CFLAGS = -I$(HDFROOT)/include -DNXXML -DHDF5 $(NI) \ CFLAGS = -I$(HDFROOT)/include -DNXXML -DHDF5 $(NI) \
-I$(SICSROOT)/sicspsi/hardsup -I$(SICSROOT) -I. -MMD \ -I$(SICSROOT)/sicspsi/hardsup -I$(SICSROOT) -I. -MMD \
-Werror -DCYGNUS -DNONINTF $(DBG) $(DFORTIFY) \ -Werror -DCYGNUS -DNONINTF $(DBG) $(DFORTIFY) \

7
network.c
View File

@ -67,7 +67,7 @@ struct timeval lastclose = { -1, 0 };
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
Redefine this function if another means of error reporting is necessary. Redefine this function if another means of error reporting is necessary.
*/ */
static void NetError(char *pText) static void NetError(const char pText[])
{ {
/* /*
SICSLogWrite(pText,eError); SICSLogWrite(pText,eError);
@ -607,7 +607,7 @@ int NETReadTillTerm(mkChannel * self, long timeout,
gettimeofday(&start, NULL); gettimeofday(&start, NULL);
if (pTerm == NULL) if (pTerm == NULL)
pTerm = ""; pTerm = strdup("");
length = strlen(pTerm); length = strlen(pTerm);
memset(pBuffer, 0, iBufLen); memset(pBuffer, 0, iBufLen);
@ -842,8 +842,9 @@ mkChannel *UDPOpen(int iPort)
i = 1; i = 1;
setsockopt(pRes->sockid, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(int)); setsockopt(pRes->sockid, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(int));
/*
assert(pRes->sockid < (sizeof(long) * 8)); assert(pRes->sockid < (sizeof(long) * 8));
/* if this fails the masks for select will be to if this fails the masks for select will be to
short. short.
*/ */

4
sicshdbadapter.c
View File

@ -315,7 +315,7 @@ static pHdb CreateMotorAdapter(char *name, pMotor pMot)
DeleteHipadabaNode(result, NULL); DeleteHipadabaNode(result, NULL);
return NULL; return NULL;
} }
result->protected = 1; result->iprotected = 1;
return result; return result;
} }
@ -499,7 +499,7 @@ static pHdb MakeSicsVarNode(pSicsVariable pVar, char *name)
snprintf(command, 1023, "%s ", pVar->name); snprintf(command, 1023, "%s ", pVar->name);
SetHdbProperty(node, "sicscommand", command); SetHdbProperty(node, "sicscommand", command);
node->protected = 1; node->iprotected = 1;
return node; return node;
} }

2
sicshipadaba.c
View File

@ -2342,7 +2342,7 @@ static int isNodeProtected(pHdb node)
{ {
pHdb current = NULL; pHdb current = NULL;
if (node->protected == 1) { if (node->iprotected == 1) {
return 1; return 1;
} }
current = node->child; current = node->child;

2
sllinux_def
View File

@ -12,4 +12,4 @@ MFLAGS=-f makefile_linux$(DUMMY)
HDFROOT=/afs/psi.ch/project/sinq/sl6 HDFROOT=/afs/psi.ch/project/sinq/sl6
TCLINC=. TCLINC=.
DBG= -g DBG= -g