From f1eb0a8effdaba2031a7c34a174d71aa9706a89d Mon Sep 17 00:00:00 2001
From: cvs <cvs>
Date: Wed, 10 Dec 2003 15:32:43 +0000
Subject: [PATCH] - Funny things with header files...

---
 dornier2.c     | 20 ++++++++++----------
 makefile_linux |  1 -
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dornier2.c b/dornier2.c
index e4c1d1d..b2876c8 100644
--- a/dornier2.c
+++ b/dornier2.c
@@ -214,6 +214,7 @@ static int takeControl(pDornier pDorn){
       pDornier pDorn = NULL;
       int startFlag = 0;
       int i;
+      DornierStatus sStatus;
 
       assert(self);
       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,
        otherwise we may be in deep trouble
       */
-      if(pDorn->noStatus == 1){
-	for(i = 0; i < 3; i++){
-          DornierText(self,pText,131);
-	  if(pDorn->noStatus == 0){
-	    break;
-	  }
-        }
-        if(pDorn->noStatus == 1){
-	  pDorn->iLastError = NOSTATUS;
+      if(pDorn->statusMode == STATSEND){
+	iRet = requestDornierStatus(pDorn);
+	if(iRet == 0){
 	  return 0;
-        }
+	}
       }
+      iRet = readAndInterpretStatus(pDorn,&sStatus);
+      if(iRet == 0){
+	return 0;
+      }
+      pDorn->lastStatus = sStatus;
 
       /* 
 	 less then STARTSPEED, means halt in this case.
diff --git a/makefile_linux b/makefile_linux
index 925c06a..538f6b7 100644
--- a/makefile_linux
+++ b/makefile_linux
@@ -8,7 +8,6 @@
 
 include ../$(SRC)linux_def
 
-HDFROOT=/usr/users/SANS2/src
 
 CC       = gcc
 CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -I$(SRC)hardsup \