- Added makefiles for linux

hardsup/makefile_linux

@@ -6,10 +6,10 @@
 # Markus Zolliker, March 2003
 #--------------------------------------------------------------------------
 # the following line only for fortified version
-DFORTIFY=-DFORTIFY
+#DFORTIFY=-DFORTIFY
 #==========================================================================
 
 CC       = gcc
-CFLAGS   = -g -DLINUX $(DFORTIFY) -I$(SRC). -I$(SRC).. -I../src
+CFLAGS   = -g -DLINUX $(DFORTIFY) -I$(SRC). -I.. -I../..
 
 include $(SRC)make_gen

makefile_linux

@@ -0,0 +1,20 @@
+#---------------------------------------------------------------------------
+# Makefile for SICS
+# machine-dependent part for Redhat Linux with AFS at PSI
+#
+# Mark Koennecke 1996-2001
+# Markus Zolliker, March 2003
+#==========================================================================
+# the following lines only for fortified version
+#DFORTIFY=-DFORTIFY
+#FORTIFYOBJ=strdup.o fortify.o
+#==========================================================================
+
+CC       = gcc
+CFLAGS = -I$(HDFROOT)/include -DHDF4 -DHDF5 $(NI) -Ihardsup \
+       -I../ -fwritable-strings -DCYGNUS -DNONINTF -g $(DFORTIFY)
+
+HDFROOT=/afs/psi.ch/project/sinq/linux
+EXTRA=nintf.o
+
+include make_gen

sinqhmdriv.i

@@ -1,5 +1,5 @@
 
-#line 63 "sinqhmdriv.w"
+#line 64 "sinqhmdriv.w"
 
 /*--------------------------------------------------------------------------
                          S I N Q H M 
@@ -24,18 +24,19 @@
                                     HistMode eHistMode;
                                     int iBinWidth;
                                     OverFlowMode eFlow;
+                                    int extraDetector;
                                    } SinqHMDriv;
 
-#line 76 "sinqhmdriv.w"
+#line 77 "sinqhmdriv.w"
 
 /*-------------------------------------------------------------------------*/
 
-#line 58 "sinqhmdriv.w"
+#line 59 "sinqhmdriv.w"
 
    pHistDriver CreateSINQDriver(pStringDict pOption);
    int isSINQHMDriv(pHistDriver test);
 
-#line 78 "sinqhmdriv.w"
+#line 79 "sinqhmdriv.w"
 
 
 #endif

sinqhmdriv.w

@@ -28,6 +28,7 @@ already reflected by the driver private data structure:
 				    HistMode eHistMode;
 				    int iBinWidth;
                                     OverFlowMode eFlow;
+			            int extraDetector;
                                    } SinqHMDriv;
 @}
 

swmotor.c

@@ -11,18 +11,48 @@
 #include <assert.h>
 #include <stdio.h>
 #include <tcl.h>
-#include "fortify.h"
+#include <fortify.h>
-#include "sics.h"
+#include <sics.h>
-#include "SCinter.h"
+#include <SCinter.h>
-#include "splitter.h"
+#include <splitter.h>
 #include "hardsup/sinq_prototypes.h"
 #include "hardsup/rs232c_def.h"
 #include "hardsup/el734_def.h"
 #include "hardsup/el734fix.h"
-#include "modriv.h"
+#include <modriv.h>
 #include "swmotor.h"
 #include "swmotor.i"
 
+  typedef struct __MoDriv {
+                           /* general motor driver interface 
+                              fields. REQUIRED!
+                           */
+                           float fUpper; /* upper limit */
+                           float fLower; /* lower limit */
+                           char *name;
+                           int   (*GetPosition)(void *self,float *fPos);
+                           int   (*RunTo)(void *self, float fNewVal);
+                           int   (*GetStatus)(void *self);
+                           void  (*GetError)(void *self, int *iCode, char *buffer, int iBufLen);
+                           int   (*TryAndFixIt)(void *self,int iError, float fNew);
+                           int   (*Halt)(void *self);
+                           int   (*GetDriverPar)(void *self, char *name, 
+                                  float *value);
+                           int    (*SetDriverPar)(void *self,SConnection *pCon,
+                                   char *name, float newValue);
+                           void   (*ListDriverPar)(void *self, char *motorName,
+                                  SConnection *pCon);
+                           void   (*KillPrivate)(void *self);
+                           
+                           
+                           /* EL-734 specific fields */
+                           int iPort;
+                           char *hostname;
+                           int iChannel;
+                           int iMotor;
+                           void *EL734struct;
+                           int iMSR;
+                          } EL734Driv;
 /*========================================================================
  We start of by implementing the interface functions for the various 
  interfaces this module has to implement.

tecs/makefile_linux

@@ -14,7 +14,7 @@ SICS=$(SRC)..
 
 CC       = gcc
 FC       = g77
-CFLAGS   = -DLINUX -g $(DFORTIFY)
+CFLAGS   = -DLINUX -g $(DFORTIFY) -I../..
 FFLAGS   = -u -fvxt -g
 ARFLAGS  = cr
 
@@ -26,7 +26,7 @@ PGPLOT   =/afs/psi.ch/user/z/zolliker/pgplot/
 PGLIB    =$(PGPLOT)/libpgplot.a -L/usr/X11R6/lib -lX11
 
 # -- library for ASYNSRV
-HARDSUPLIB=$(SICST)/hardsup/libhlib.a
+HARDSUPLIB=../hardsup/libhlib.a
 
 # -- readline library
 RDLIB    =-lreadline -ltermcap