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

- Funny things with header files...

Browse Source
This commit is contained in:
cvs
2003-12-10 15:32:43 +00:00
parent f4d6298a95
commit f1eb0a8eff
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dornier2.c
View File

@ -214,6 +214,7 @@ static int takeControl(pDornier pDorn){
pDornier pDorn = NULL; pDornier pDorn = NULL;
int startFlag = 0; int startFlag = 0;
int i; int i;
DornierStatus sStatus;
assert(self); assert(self);
pDorn = (pDornier)self->pPrivate; pDorn = (pDornier)self->pPrivate;
@ -222,18 +223,17 @@ static int takeControl(pDornier pDorn){
make sure that a status was read before we do anything here, make sure that a status was read before we do anything here,
otherwise we may be in deep trouble otherwise we may be in deep trouble
*/ */
if(pDorn->noStatus == 1){ if(pDorn->statusMode == STATSEND){
for(i = 0; i < 3; i++){ iRet = requestDornierStatus(pDorn);
DornierText(self,pText,131); if(iRet == 0){
if(pDorn->noStatus == 0){
break;
}
}
if(pDorn->noStatus == 1){
pDorn->iLastError = NOSTATUS;
return 0; return 0;
} }
} }
iRet = readAndInterpretStatus(pDorn,&sStatus);
if(iRet == 0){
return 0;
}
pDorn->lastStatus = sStatus;
/* /*
less then STARTSPEED, means halt in this case. less then STARTSPEED, means halt in this case.

1
makefile_linux
View File

@ -8,7 +8,6 @@
include ../$(SRC)linux_def include ../$(SRC)linux_def
HDFROOT=/usr/users/SANS2/src
CC = gcc CC = gcc
CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -I$(SRC)hardsup \ CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -I$(SRC)hardsup \