Xavier : previous commit failed.

src/AcquireWaveformLecroy.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.2 2004-10-05 13:09:10 xavela Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.3 2004-10-05 13:11:11 xavela Exp $";
 //+=============================================================================
 //
 // file :	  AcquireWaveformLecroy.cpp
@@ -13,9 +13,13 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 //
 // $Author: xavela $
 //
-// $Revision: 1.2 $
+// $Revision: 1.3 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.2  2004/10/05 13:09:10  xavela
+// Xavier : memory allocation in read_attr_hardware() method.
+// calculation of offset of the begining of the struct, which contains the context of the waveform acquisition, in the received block data.
+//
 // Revision 1.1.1.1  2004/09/29 15:42:14  syldup
 // Initial import.
 //

src/AcquireWaveformLecroy.h

@@ -8,9 +8,13 @@
 //
 // $Author: xavela $
 //
-// $Revision: 1.2 $
+// $Revision: 1.3 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.2  2004/10/05 13:09:10  xavela
+// Xavier : memory allocation in read_attr_hardware() method.
+// calculation of offset of the begining of the struct, which contains the context of the waveform acquisition, in the received block data.
+//
 // Revision 1.1.1.1  2004/09/29 15:42:14  syldup
 // Initial import.
 //
@@ -39,7 +43,7 @@
 
 /**
  * @author	$Author: xavela $
- * @version	$Revision: 1.2 $ $
+ * @version	$Revision: 1.3 $ $
  */
 
  //	Add your own constants definitions here.

src/AcquireWaveformLecroyClass.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyClass.cpp,v 1.2 2004-10-05 13:09:10 xavela Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyClass.cpp,v 1.3 2004-10-05 13:11:11 xavela Exp $";
 
 static const char *TagName = "$Name: not supported by cvs2svn $";
 
@@ -20,9 +20,13 @@ static const char *RCSfile = "$RCSfile: AcquireWaveformLecroyClass.cpp,v $";
 //
 // $Author: xavela $
 //
-// $Revision: 1.2 $
+// $Revision: 1.3 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.2  2004/10/05 13:09:10  xavela
+// Xavier : memory allocation in read_attr_hardware() method.
+// calculation of offset of the begining of the struct, which contains the context of the waveform acquisition, in the received block data.
+//
 //
 // copyleft :     Synchrotron SOLEIL
 //                L'Orme des Merisiers

src/AcquireWaveformLecroyClass.h

@@ -12,9 +12,13 @@
 //
 // $Author: xavela $
 //
-// $Revision: 1.2 $
+// $Revision: 1.3 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.2  2004/10/05 13:09:10  xavela
+// Xavier : memory allocation in read_attr_hardware() method.
+// calculation of offset of the begining of the struct, which contains the context of the waveform acquisition, in the received block data.
+//
 //
 // copyleft :     Synchrotron SOLEIL
 //                L'Orme des Merisiers

src/ClassFactory.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/ClassFactory.cpp,v 1.1.1.1 2004-09-29 15:42:14 syldup Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/ClassFactory.cpp,v 1.2 2004-10-05 13:11:11 xavela Exp $";
 //+=============================================================================
 //
 // file :        ClassFactory.cpp
@@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 //
 // project :     TANGO Device Server
 //
-// $Author: syldup $
+// $Author: xavela $
 //
-// $Revision: 1.1.1.1 $
+// $Revision: 1.2 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.1.1.1  2004/09/29 15:42:14  syldup
+// Initial import.
+//
 //
 // copyleft :     Synchrotron SOLEIL
 //                L'Orme des Merisiers
@@ -35,8 +38,8 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 /**
  *	Create AcquireWaveformLecroyClass singleton and store it in DServer object.
  *
- * @author	$Author: syldup $
- * @version	$Revision: 1.1.1.1 $ $
+ * @author	$Author: xavela $
+ * @version	$Revision: 1.2 $ $
  */
 
 void Tango::DServer::class_factory()

src/Makefile

 #=============================================================================
+
 #
+
 # file :        Makefile.h
+
 #
+
 # description : Include for the AcquireWaveformLecroy class.
+
 #
+
 # project :     Makefile to generate a Tango server
+
 #
-# $Author: syldup $
+
+# $Author: xavela $
+
 #
-# $Revision: 1.1.1.1 $
+
+# $Revision: 1.2 $
+
 #
+
 # $Log: not supported by cvs2svn $
+# Revision 1.1.1.1  2004/09/29 15:42:14  syldup
+# Initial import.
 #
+
+#
+
 # copyleft :    European Synchrotron Radiation Facility
+
 #               BP 220, Grenoble 38043
+
 #               FRANCE
+
 #
+
 #=============================================================================
+
 #  		This file is generated by POGO
+
 #	(Program Obviously used to Generate tango Object)
+
 #
+
 #         (c) - Software Engineering Group - ESRF
+
 #=============================================================================
+
 #
 
+
+
 ifdef _solaris
+
 CC = CC
+
 BIN_DIR = solaris7_CC
+
 endif
 
+
+
 ifdef linux
+
 CC = c++
+
 AR = ar
+
 BIN_DIR = suse72
+
 endif
 
+
+
 TANGO_HOME   =  /segfs/tango
+
 INCLUDE_DIRS =  -I$(TANGO_HOME)/include/$(BIN_DIR)	-I.
+
 LIB_DIRS     =  -L $(TANGO_HOME)/lib/$(BIN_DIR)
 
+
+
 ifdef _solaris
+
 CXXFLAGS =  -mt -D_PTHREADS $(INCLUDE_DIRS)
+
 LFLAGS =  -g $(LIB_DIRS)  		\
+
 				-ltango			\
+
 				-llog4tango		\
+
 				-lomniORB4 		\
+
 				-lomniDynamic4	\
+
 				-lomnithread	\
+
 				-lpthread		\
+
 				-lposix4 -lsocket -lnsl
+
 endif
 
+
+
 ifdef linux
+
 CXXFLAGS =  -g -D_REENTRANT $(INCLUDE_DIRS)
+
 LFLAGS =  -g $(LIB_DIRS)  		\
+
 				-ltango			\
+
 				-llog4tango		\
+
 				-lomniORB4 		\
+
 				-lomniDynamic4	\
+
 				-lomnithread	\
+
 				-ldl -lpthread
+
 endif
 
 
 
 
+
+
+
+
+
 CLASS =	AcquireWaveformLecroy
 
+
+
 SVC_OBJS = 	main.o	\
+
 		ClassFactory.o	\
+
 		$(CLASS)Class.o	\
+
 		$(CLASS).o
 
+
+
 SVC_INC = 	$(CLASS)Class.h \
+
 			$(CLASS).h
 
 
+
+
+
 %.o: %.cpp $(SVC_INC)
+
 	$(CC) $(CXXFLAGS) -c $<
 
+			
+
 all: $(CLASS)
 
+
+
 $(CLASS):	$(SVC_OBJS)
+
 	$(CC) $(SVC_OBJS) -o $(CLASS) $(LFLAGS)
 
+
+
 clean:
+
 	rm -f *.o $(CLASS) core
 
+	
+
 install:
+
 	cp $(CLASS) $(TANGO_HOME)/bin/$(BIN_DIR)
+

src/main.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/main.cpp,v 1.1.1.1 2004-09-29 15:42:14 syldup Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/main.cpp,v 1.2 2004-10-05 13:11:11 xavela Exp $";
 //+=============================================================================
 //
 // file :        main.cpp
@@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
 //
 // project :     TANGO Device Server
 //
-// $Author: syldup $
+// $Author: xavela $
 //
-// $Revision: 1.1.1.1 $ $
+// $Revision: 1.2 $ $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.1.1.1  2004/09/29 15:42:14  syldup
+// Initial import.
+//
 //
 // copyleft :     Synchrotron SOLEIL
 //                L'Orme des Merisiers