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

D.Maden. 11-Sep-2000.

Browse Source 
Makefiles modified to generate a Linux SICServer.
   Other files modified to get rid of irritating compiler warning messages.
This commit is contained in:
cvs
2000-09-11 09:17:43 +00:00
parent b88e4c1a7b
commit fc6c4acd79
23 changed files with 140 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Makefile
View File

@ -4,21 +4,26 @@
# Mark Koennecke 1996-2000 # Mark Koennecke 1996-2000
# Markus Zolliker March 2000: add tecs # Markus Zolliker March 2000: add tecs
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
BINTARGET=$(HOME)/bin/sics
#------- comment and uncommanet this if a fortified version is required. #------- comment or uncomment this if a fortified version is required.
# A -DFORTIFY needs to be added to the CFLAGS as well. # Note: A -DFORTIFY needs to be added to the CFLAGS as well.
#
#FORTIFYOBJ = fortify.o strdup.o #FORTIFYOBJ = fortify.o strdup.o
#----
FORTIFYOBJ = FORTIFYOBJ =
#---------------------------------------------------------------------------
#----- comment and uncomment according if a difrac version is required
#----- comment or uncomment if a difrac version is required
#DIFOBJ= #DIFOBJ=
#DIFIL= #DIFIL=
#DIFOBJ=difrac.o -Ldifrac -ldif -lfor #DIFOBJ=difrac.o -Ldifrac -ldif -lfor
#---- #----
DIFOBJ=difrac.o -Ldifrac -ldif DIFOBJ=difrac.o -Ldifrac -ldif
DIFIL= difrac.o DIFIL= difrac.o
#---------------------------------------------------------------------------
COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ) COBJ = Sclient.o network.o ifile.o intcli.o $(FORTIFYOBJ)
SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \ SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
@ -47,15 +52,18 @@ VELOOBJ = velo.o velosim.o velodorn.o velodornier.o
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .tcl .htm .c .o .SUFFIXES: .tcl .htm .c .o
#----- comment or uncomment the following according to operating system
#------------- for Digital Unix #------------- for Digital Unix
HDFROOT=/data/koenneck #BINTARGET=$(HOME)/bin/sics
CC=cc #HDFROOT=/data/koenneck
EXTRA= #CC=cc
CFLAGS = -I$(HDFROOT)/include -Ihardsup -I. -std1 -g -warnprotos -c #EXTRA=
#CFLAGS = -I$(HDFROOT)/include -Ihardsup -I. -std1 -g -warnprotos -c
#CFLAGS = -I$(HDFROOT)/include -DFORTIFY -Ihardsup -g -std1 -warnprotos -c #CFLAGS = -I$(HDFROOT)/include -DFORTIFY -Ihardsup -g -std1 -warnprotos -c
LIBS = -L$(HDFROOT)/lib -Lhardsup -lhlib -Lmatrix -lmatrix -Ltecs \ #LIBS = -L$(HDFROOT)/lib -Lhardsup -lhlib -Lmatrix -lmatrix -Ltecs \
-ltecsl -ltcl8.0 -lfor -lmfhdf -ldf $(HDFROOT)/lib/libjpeg.a \ # -ltecsl -ltcl8.0 -lfor -lmfhdf -ldf $(HDFROOT)/lib/libjpeg.a \
-lz -lm -ll -lc # -lz -lm -ll -lc
#------- for cygnus #------- for cygnus
#HDFROOT=../HDF411 #HDFROOT=../HDF411
@ -66,14 +74,15 @@ LIBS = -L$(HDFROOT)/lib -Lhardsup -lhlib -Lmatrix -lmatrix -Ltecs \
# -lmfhdf -ldf -ljpeg -lz -lm # -lmfhdf -ldf -ljpeg -lz -lm
#---------- for linux #---------- for linux
#HDFROOT=/usr/local BINTARGET=../bin
#TCLROOT=/home/koenneck/tcl76 HDFROOT=/usr/local
#CC=gcc CC=gcc
#CFLAGS = -I$(HDFROOT)/include -Ihardsup -fwritable-strings -DCYGNUS -g -c CFLAGS = -I$(HDFROOT)/include -Ihardsup -fwritable-strings \
#LIBS= -L$(HDFROOT)/lib -Lhardsup -L$(TCLROOT)/lib -lhlib \ -DCYGNUS -DNONINTF -g -c
# -ltcl7.6 -lmfhdf -ldf -ljpeg -lz -lm -lg2c -ldl LIBS= -L$(HDFROOT)/lib -Lhardsup -Ltecs -ltecsl -Lmatrix -lmatrix -lhlib \
#EXTRA=nintf.o -ltcl8.0 -lmfhdf -ldf -ljpeg -lz -lm -lg2c -ldl
EXTRA=nintf.o
#---------------------------------------------------------------------------
.c.o: .c.o:
$(CC) $(CFLAGS) $*.c $(CC) $(CFLAGS) $*.c
@ -87,8 +96,8 @@ server: $(SOBJ) $(MOTOROBJ) $(COUNTEROBJ) $(DMCOBJ) $(VELOOBJ) $(DIFIL) \
cp SICServer $(BINTARGET) cp SICServer $(BINTARGET)
clean: clean:
- rm *.o - rm -f *.o
- rm SICServer - rm -f SICServer
Dbg.o: Dbg.c Dbg.o: Dbg.c
cc -g -I/data/koenneck/include -c Dbg.c cc -g -I/data/koenneck/include -c Dbg.c

2
amorstat.c
View File

@ -199,7 +199,7 @@
UserData ud; UserData ud;
iRet = LLDnodePtr2First(self->iUserList); iRet = LLDnodePtr2First(self->iUserList);
while(iRet != NULL) while(iRet != 0)
{ {
LLDnodeDataTo(self->iUserList,&ud); LLDnodeDataTo(self->iUserList,&ud);
if(ud.fX != NULL) if(ud.fX != NULL)

16
difrac/Makefile
View File

@ -3,7 +3,17 @@
# #
# Mark Koennecke, November 1999 # Mark Koennecke, November 1999
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
CFLAGS = -C -g -c
#---------- for Redhat linux
CC= gcc
CFLAGS= -C -g -c
#------------ for DigitalUnix
##CC=cc
##CFLAGS= -C -g -c
#----------------------------------------------------------------------------
FL = f77 $(CFLAGS) FL = f77 $(CFLAGS)
ROOT = .. ROOT = ..
LIBS = $(ROOT)\libs LIBS = $(ROOT)\libs
@ -32,10 +42,10 @@ GENS = yesno.o freefm.o alfnum.o matrix.o \
all: lib all: lib
clean: clean:
rm *.o rm -f *.o
lib: $(OBJECTS) $(GENS) lib: $(OBJECTS) $(GENS)
- rm libdif.a - rm -f libdif.a
ar cr libdif.a $(OBJECTS) $(GENS) ar cr libdif.a $(OBJECTS) $(GENS)
ranlib libdif.a ranlib libdif.a

16
hardsup/Makefile
View File

@ -9,12 +9,14 @@ OBJ= el734_utility.o asynsrv_utility.o stredit.o \
makeprint.o makeprint.o
#---------- for Redhat linux #---------- for Redhat linux
#CC= gcc CC= gcc
#CFLAGS= -I/usr/local/include -I. -I../ -DLINUX -g -c ###CFLAGS= -I/usr/local/include -I. -I../ -DLINUX -g -c
CFLAGS=-I. -I../ -DLINUX -g -c
#------------ for DigitalUnix #------------ for DigitalUnix
CC=cc ##CC=cc
CFLAGS= -I/data/koenneck/include -I. -I../ -std1 -g -c ##CFLAGS= -I/data/koenneck/include -I. -I../ -std1 -g -c
#------------ for DigitalUnix with Fortify #------------ for DigitalUnix with Fortify
#CFLAGS= -I/data/koenneck/include -DFORTIFY -I. -I../ -std1 -g -c #CFLAGS= -I/data/koenneck/include -DFORTIFY -I. -I../ -std1 -g -c
@ -26,10 +28,10 @@ CFLAGS= -I/data/koenneck/include -I. -I../ -std1 -g -c
$(CC) $(CFLAGS) $*.c $(CC) $(CFLAGS) $*.c
hlib: $(OBJ) hlib: $(OBJ)
- rm libhlib.a - rm -f libhlib.a
ar cr libhlib.a $(OBJ) ar cr libhlib.a $(OBJ)
ranlib libhlib.a ranlib libhlib.a
clean: clean:
rm *.o rm -f *.o
rm *.a rm -f *.a

8
hardsup/sinqhm.c
View File

@ -55,11 +55,9 @@
#include "sinqhm.h" #include "sinqhm.h"
#include "sinqhm.i" #include "sinqhm.i"
/* missing in cygnus and linux network stuff?? */ /* missing in some network stuff?? */
#ifdef LINUX
#define CYGNUS #ifndef MSG_WAITALL
#endif
#ifdef CYGNUS
#define MSG_WAITALL 0 #define MSG_WAITALL 0
#endif #endif

4
macro.c
View File

@ -505,7 +505,7 @@ extern Tcl_Interp *InterpGetTcl(SicsInterp *pSics);
if(!pInter) if(!pInter)
{ {
SCWrite(pCon,"ERROR: out of memory in InternalFileEval",eError); SCWrite(pCon,"ERROR: out of memory in InternalFileEval",eError);
return NULL; return 0;
} }
SCnoSock(pIntern); SCnoSock(pIntern);
@ -570,7 +570,7 @@ extern Tcl_Interp *InterpGetTcl(SicsInterp *pSics);
strtolower(ppCode); strtolower(ppCode);
while(pCode[i] != NULL) while(pCode[i] != NULL)
{ {
if(strcmp(pCode[i],ppCode)== NULL) if(strcmp(pCode[i],ppCode) == 0)
{ {
break; break;
} }

14
matrix/Makefile
View File

@ -8,12 +8,12 @@ OBJ= matadd.o matcreat.o matdet.o matdump.o matdurbn.o materr.o \
mattran.o mattran.o
#---------- for Redhat linux #---------- for Redhat linux
#CC= gcc CC= gcc
#CFLAGS= -I/usr/local/include -I. -I../ -DLINUX -g -c CFLAGS= -I/usr/local/include -I. -I../ -DLINUX -g -c
#------------ for DigitalUnix #------------ for DigitalUnix
CC=cc #CC=cc
CFLAGS= -I/data/koenneck/include -I. -I../ -std1 -g -c #CFLAGS= -I/data/koenneck/include -I. -I../ -std1 -g -c
#------------ for DigitalUnix with Fortify #------------ for DigitalUnix with Fortify
#CFLAGS= -I/data/koenneck/include -DFORTIFY -I. -I../ -std1 -g -c #CFLAGS= -I/data/koenneck/include -DFORTIFY -I. -I../ -std1 -g -c
@ -25,10 +25,10 @@ CFLAGS= -I/data/koenneck/include -I. -I../ -std1 -g -c
$(CC) $(CFLAGS) $*.c $(CC) $(CFLAGS) $*.c
matrix: $(OBJ) matrix: $(OBJ)
- rm libmatrix.a - rm -f libmatrix.a
ar cr libmatrix.a $(OBJ) ar cr libmatrix.a $(OBJ)
ranlib libmatrix.a ranlib libmatrix.a
clean: clean:
rm *.o rm -f *.o
rm *.a rm -f *.a

3
matrix/matdump.c
View File

@ -73,6 +73,3 @@ FILE *fp;
return (A); return (A);
} }


1
matrix/matdurbn.c
View File

@ -130,4 +130,3 @@ MATRIX A, B;
mat_free( R ); mat_free( R );
return (X); return (X);
} }


2
matrix/materr.c
View File

@ -42,5 +42,3 @@ int errno;
return (NULL); return (NULL);
} }


1
matrix/matinv.c
View File

@ -74,4 +74,3 @@ MATRIX a;
mat_free(P); mat_free(P);
return (C); return (C);
} }


3
matrix/matmul.c
View File

@ -55,6 +55,3 @@ MATRIX A;
} }
return (result); return (result);
} }


2
matrix/matsubx.c
View File

@ -45,4 +45,4 @@ int i,j;
} }
return (S); return (S);
} }

2
maximize.c
View File

@ -158,7 +158,7 @@
start: start:
lMax = 0; lMax = 0;
lMin = 999999999999; lMin = 0x7fffffff;
fStart = pDriv->GetValue(pVar,pCon); fStart = pDriv->GetValue(pVar,pCon);
if(fStart < -999999.) if(fStart < -999999.)
{ {

2
mumo.c
View File

@ -106,7 +106,7 @@
assert(pData); assert(pData);
self = (pMulMot)pData; self = (pMulMot)pData;
assert(strcmp(self->pDes->name,"MulMot") == NULL); assert(strcmp(self->pDes->name,"MulMot") == 0);
/* remove string dictionaries */ /* remove string dictionaries */
if(self->pAlias) if(self->pAlias)

6
napi.c
View File

@ -35,7 +35,7 @@
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
static const char* rscid = "$Id: napi.c,v 1.2 2000/02/21 08:11:15 cvs Exp $"; /* Revision interted by CVS */ static const char* rscid = "$Id: napi.c,v 1.3 2000/09/11 09:17:44 cvs Exp $"; /* Revision interted by CVS */
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
@ -1130,8 +1130,8 @@ static const char* rscid = "$Id: napi.c,v 1.2 2000/02/21 08:11:15 cvs Exp $"; /*
else else
{ {
/* write directly */ /* write directly */
iRet = SDwritedata (pFile->iCurrentSDS,iStart, iRet = SDwritedata (pFile->iCurrentSDS, (int32 *) iStart,
iStride, iSize, data); iStride, (int32 *) iSize, data);
} }
/* deal with HDF errors */ /* deal with HDF errors */

4
nxdata.c
View File

@ -352,7 +352,7 @@
int32 iDim[2]; int32 iDim[2];
iDim[0] = iLong; iDim[0] = iLong;
iStat = NXmakedata(Nfil,name,datatype,1,iDim); iStat = NXmakedata (Nfil, name, datatype, 1, (int *) iDim);
if(iStat == NX_ERROR) if(iStat == NX_ERROR)
{ {
NXclose(&Nfil); NXclose(&Nfil);
@ -388,7 +388,7 @@
int32 iDim[2]; int32 iDim[2];
iDim[0] = iLong; iDim[0] = iLong;
iStat = NXmakedata(Nfil,name,datatype,1,iDim); iStat = NXmakedata (Nfil, name, datatype, 1, (int *) iDim);
if(iStat == NX_ERROR) if(iStat == NX_ERROR)
{ {
NXclose(&Nfil); NXclose(&Nfil);

10
nxdict.c
View File

@ -41,7 +41,7 @@
extern void *NXpData; extern void *NXpData;
extern void (*NXIReportError)(void *pData, char *pBuffer); extern void (*NXIReportError)(void *pData, char *pBuffer);
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
/*#define DEFDEBUG 1*/ /* #define DEFDEBUG 1*/
/* define DEFDEBUG when you wish to print your definition strings before /* define DEFDEBUG when you wish to print your definition strings before
action. This can help a lot to resolve mysteries when working with action. This can help a lot to resolve mysteries when working with
dictionaries. dictionaries.
@ -682,7 +682,7 @@
{"-LZW",DLZW}, {"-LZW",DLZW},
{"-HUF",DHUF}, {"-HUF",DHUF},
{"-RLE",DRLE}, {"-RLE",DRLE},
{NULL,0} }; {"",0} };
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static void NXDIDefToken(ParDat *sStat) static void NXDIDefToken(ParDat *sStat)
@ -995,7 +995,7 @@
{"DFNT_INT32",DFNT_INT32}, {"DFNT_INT32",DFNT_INT32},
{"DFNT_UINT32",DFNT_UINT32}, {"DFNT_UINT32",DFNT_UINT32},
{"DFNT_CHAR",DFNT_CHAR}, {"DFNT_CHAR",DFNT_CHAR},
{NULL,-122} }; {"",0} };
@ -1088,7 +1088,7 @@
iRank = atoi(pParse->pToken); iRank = atoi(pParse->pToken);
break; break;
case DDIM: case DDIM:
iRet = NXDIParseDim(pParse, iDim); iRet = NXDIParseDim (pParse, (int *) iDim);
if(iRet == NX_ERROR) if(iRet == NX_ERROR)
{ {
LLDdelete(iList); LLDdelete(iList);
@ -1153,7 +1153,7 @@
/* we need to create it, if we may */ /* we need to create it, if we may */
if(pParse->iMayCreate) if(pParse->iMayCreate)
{ {
iRet = NXmakedata(hfil,pName,iType, iRank,iDim); iRet = NXmakedata (hfil, pName, iType, iRank, (int *) iDim);
if(iRet != NX_OK) if(iRet != NX_OK)
{ {
/* a comment on this one has already been written! */ /* a comment on this one has already been written! */

8
nxdict.w
View File

@ -941,7 +941,7 @@ This is the tokenizer:
{"-type",DTYPE}, {"-type",DTYPE},
{"-rank",DRANK}, {"-rank",DRANK},
{"-attr",DATTR}, {"-attr",DATTR},
{NULL,0} }; {"",0} };
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
static void NXDIDefToken(ParDat *sStat) static void NXDIDefToken(ParDat *sStat)
@ -1272,7 +1272,7 @@ parsing:
iRank = atoi(pParse->pToken); iRank = atoi(pParse->pToken);
break; break;
case DDIM: case DDIM:
iRet = NXDIParseDim(pParse, iDim); iRet = NXDIParseDim (pParse, (int *) iDim);
if(iRet == NX_ERROR) if(iRet == NX_ERROR)
{ {
LLDdelete(iList); LLDdelete(iList);
@ -1328,7 +1328,7 @@ parsing:
/* we need to create it, if we may */ /* we need to create it, if we may */
if(pParse->iMayCreate) if(pParse->iMayCreate)
{ {
iRet = NXmakedata(hfil,pName,iType, iRank,iDim); iRet = NXmakedata (hfil, pName, iType, iRank, (int *) iDim);
if(iRet != NX_OK) if(iRet != NX_OK)
{ {
/* a comment on this one has already been written! */ /* a comment on this one has already been written! */
@ -1386,7 +1386,7 @@ as one of the standard NeXus data types.
{"DFNT_UINT16",DFNT_UINT16}, {"DFNT_UINT16",DFNT_UINT16},
{"DFNT_INT32",DFNT_INT32}, {"DFNT_INT32",DFNT_INT32},
{"DFNT_UINT32",DFNT_UINT32}, {"DFNT_UINT32",DFNT_UINT32},
{NULL,-122} }; {"",0} };

2
rmtrail.c
View File

@ -25,7 +25,7 @@ char *rmtrail(char *str)
if (!isspace(str[i])) if (!isspace(str[i]))
break; break;
} }
str[++i] = NULL; str[++i] = NUL;
} }
return str; return str;
} }

2
status.c
View File

@ -179,7 +179,7 @@
if(argc > 1) if(argc > 1)
{ {
strtolower(argv[1]); strtolower(argv[1]);
if(strcmp(argv[1],"interest") == NULL) if(strcmp(argv[1],"interest") == 0)
{ {
lID = RegisterCallback(pCall, VALUECHANGE, StatusCallback, lID = RegisterCallback(pCall, VALUECHANGE, StatusCallback,
pCon, NULL); pCon, NULL);

26
tecs/Makefile
View File

@ -10,10 +10,12 @@ CLI_OBJ= tecs_cli.o coc_client.o $(LIBR_OBJ)
TCLI_OBJ= tecs_client.o tecs_plot.o tecs_for.o sys_aunix.o sys_aunix_c.o str.o cho.o $(CLI_OBJ) $(DLOG_OBJ) TCLI_OBJ= tecs_client.o tecs_plot.o tecs_for.o sys_aunix.o sys_aunix_c.o str.o cho.o $(CLI_OBJ) $(DLOG_OBJ)
#------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version) #------------ for DigitalUnix (add -DFORTIFY to CFLAGS for fortified version)
CC=cc ##CC=cc
##CFLAGS= -std1 -g -warnprotos -I../ -I. -I../hardsup
#CFLAGS= -std1 -g -warnprotos -I../ -I. -I../hardsup -DFORTIFY #------------ for Linux
CFLAGS= -std1 -g -warnprotos -I../ -I. -I../hardsup CC=gcc
CFLAGS = -fwritable-strings -DCYGNUS -DNONINTF -g -I../ -I. -I../hardsup
#------------
.f.o: .f.o:
f77 -c -g $*.f f77 -c -g $*.f
@ -21,18 +23,18 @@ CFLAGS= -std1 -g -warnprotos -I../ -I. -I../hardsup
.c.o: .c.o:
$(CC) $(CFLAGS) -c $*.c $(CC) $(CFLAGS) -c $*.c
all: libtecsl.a bin/TecsServer tecs
libtecsl.a: $(CLI_OBJ) libtecsl.a: $(CLI_OBJ)
- rm libtecsl.a - rm -f libtecsl.a
ar cr libtecsl.a $(CLI_OBJ) ar cr libtecsl.a $(CLI_OBJ)
ranlib libtecsl.a ranlib libtecsl.a
all: libtecsl.a bin/TecsServer tecs
tecs_plot.o: tecs_plot.f90 tecs_plot.o: tecs_plot.f90
f90 -c -g tecs_plot.f90 f90 -c -g tecs_plot.f90
bin/TecsServer: $(SERV_OBJ) bin/TecsServer: $(SERV_OBJ)
- rm bin/TecsServer - rm -f bin/TecsServer
$(CC) $(CFLAGS) -o bin/TecsServer -g $(SERV_OBJ) fortify1.c \ $(CC) $(CFLAGS) -o bin/TecsServer -g $(SERV_OBJ) fortify1.c \
-lm -L../hardsup -lhlib -lfor -lm -L../hardsup -lhlib -lfor
@ -41,7 +43,7 @@ tecs: $(TCLI_OBJ)
-L/data/lnslib/lib -lpgplot -so_archive -lreadline -ltermcap -lX11 -lXm -L/data/lnslib/lib -lpgplot -so_archive -lreadline -ltermcap -lX11 -lXm
clean: clean:
- rm *.o - rm -f *.o
- rm *.a - rm -f *.a
- rm bin/TecsServer - rm -f bin/TecsServer
- rm tecs - rm -f tecs

95
velodorn.c
View File

@ -76,22 +76,22 @@
"TIME: \0 ", "TIME: \0 ",
"Hz:\0 "}; "Hz:\0 "};
char tok_buf[TOK_BUF_L], *ptr_token, *ptr_src, *ptr; char tok_buf[TOK_BUF_L], *ptr_token, *ptr_src, *ptr;
const char tok_c[] = "/\\\0"; const char tok_c[] = "/\\\0";
char status[255]; char status[255];
ptr_src = pText; ptr_src = pText;
memset(pResult,0,sizeof(DornierStatus)); memset(pResult,0,sizeof(DornierStatus));
/* skip over first token, should be command echo */ /* skip over first token, should be command echo */
ptr_token = strtok(ptr_src, tok_c); ptr_token = strtok(ptr_src, tok_c);
if (ptr_token == NULL) return 0; /* error */ if (ptr_token == NULL) return 0; /* error */
strcpy(pResult->echo,(const char *)ptr_token); strcpy(pResult->echo,(const char *)ptr_token);
ptr_src += strlen(ptr_token); ptr_src += strlen(ptr_token);
ptr_src = NULL; /* necessary for further search with strtok */ ptr_src = NULL; /* necessary for further search with strtok */
for (;;) for (;;)
{ {
/* read text till next separator '/' */ /* read text till next separator '/' */
ptr_token = strtok(ptr_src, tok_c); ptr_token = strtok(ptr_src, tok_c);
if (ptr_token == NULL) break; if (ptr_token == NULL) break;
@ -100,52 +100,41 @@
for (key_id = 0; key_id<=15; key_id++) for (key_id = 0; key_id<=15; key_id++)
{ {
/* search key ? */ /* search key ? */
sl = strlen(keys[key_id]); sl = strlen(keys[key_id]);
if (strncmp(&keys[key_id][0], tok_buf, sl) == NULL) if (strncmp(&keys[key_id][0], tok_buf, sl) == 0)
{ {
/* step over key */ /* step over key */
for (cnt=0;cnt+sl < TOK_BUF_L; cnt++) for (cnt=0;cnt+sl < TOK_BUF_L; cnt++)
tok_buf[cnt] = tok_buf[cnt+sl]; tok_buf[cnt] = tok_buf[cnt+sl];
switch (key_id) switch (key_id)
{ {
case 0: case 0: {strcpy(pResult->rm, tok_buf); break;}
{ case 1: {sscanf(tok_buf,"%d",&pResult->nom_rpm); break;}
strcpy(pResult->rm, tok_buf); case 2: {sscanf(tok_buf,"%d",&pResult->cur_rpm); break;}
break; case 3: {sscanf(tok_buf,"%d",&pResult->pwr); break;}
} case 4: {sscanf(tok_buf,"%f",&pResult->curr); break;}
case 1: {sscanf(tok_buf,"%d",&pResult->nom_rpm); break;} case 5: {sscanf(tok_buf,"%d",&pResult->rot_temp); break;}
case 2: {sscanf(tok_buf,"%d",&pResult->cur_rpm); break;} case 6: {sscanf(tok_buf,"%d",&pResult->cont_temp); break;}
case 3: {sscanf(tok_buf,"%d",&pResult->pwr); break;} case 7: {sscanf(tok_buf,"%d",&pResult->inl_temp); break;}
case 4: {sscanf(tok_buf,"%f",&pResult->curr); break;} case 8: {sscanf(tok_buf,"%d",&pResult->outl_temp); break;}
case 5: {sscanf(tok_buf,"%d",&pResult->rot_temp); break;} case 9: {sscanf(tok_buf,"%f",&pResult->cool_wat); break;}
case 6: {sscanf(tok_buf,"%d",&pResult->cont_temp); break;} case 10: {sscanf(tok_buf,"%f",&pResult->vacuum); break;}
case 7: {sscanf(tok_buf,"%d",&pResult->inl_temp); break;} case 11: {sscanf(tok_buf,"%f",&pResult->accel); break;}
case 8: {sscanf(tok_buf,"%d",&pResult->outl_temp); break;} case 12: {
case 9: {sscanf(tok_buf,"%f",&pResult->cool_wat); break;} if (strcmp(tok_buf, ena_str) == 0)
case 10: {sscanf(tok_buf,"%f",&pResult->vacuum); break;}
case 11: {sscanf(tok_buf,"%f",&pResult->accel); break;}
case 12:
{
if (strcmp(tok_buf, ena_str) == NULL)
{pResult->komm = 1; break;} {pResult->komm = 1; break;}
if (strcmp(tok_buf, dis_str) == NULL) if (strcmp(tok_buf, dis_str) == 0)
{pResult->komm = 0;break;} {pResult->komm = 0;break;}
break; break;
} }
case 13: case 13: break; /* date */
/* date */ case 14: break; /* time */
break; case 15: {sscanf(tok_buf,"%d",&pResult->iHz); break;}
case 14: }
/* time */ }
break;
case 15:
sscanf(tok_buf,"%d",&pResult->iHz);
break;
}
}
} }
} }
return(1); return(1);
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
int DornierSend(void **pData, char *pCommand, char *pReply, int iRepLen) int DornierSend(void **pData, char *pCommand, char *pReply, int iRepLen)