Merge pull request #115 from GSI-CS-CO/compatibility_with_v2

Compatibility with v2

Makefile.am

@@ -275,6 +275,9 @@ libsaft_proxy_include_HEADERS = \
 	src/LM32Cluster_Proxy.hpp                                  \
 	src/TimingReceiver_Proxy.hpp                                \
 	src/CommonFunctions.hpp                                     \
+	src/Error.h                                                 \
+	src/Time.h                                                  \
+	src/SignalGroup.h                                           \
 	src/interfaces/saftbus.h                                    \
 	src/interfaces/saftlib.h                                    \
 	src/interfaces/SAFTd.h                                      \
@@ -312,7 +315,15 @@ libsaft_proxy_include_HEADERS = \
 	src/interfaces/iOutputActionSink.h                          \
 	src/interfaces/OutputCondition.h                            \
 	src/interfaces/iCondition.h                                 \
-	src/interfaces/iOutputCondition.h
+	src/interfaces/iOutputCondition.h                           \
+	src/interfaces/FunctionGeneratorFirmware.h                  \
+	src/interfaces/iFunctionGeneratorFirmware.h                 \
+	src/interfaces/FunctionGenerator.h                          \
+	src/interfaces/iFunctionGenerator.h                         \
+	src/interfaces/MasterFunctionGenerator.h                    \
+	src/interfaces/iMasterFunctionGenerator.h                   \
+	src/interfaces/BurstGenerator.h                             \
+	src/interfaces/iBurstGenerator.h    
 
 
 if GIT_TREE
@@ -359,7 +370,8 @@ libfg_firmware_proxy_includedir = $(includedir)/fg-firmware
 libfg_firmware_proxy_include_HEADERS =        \
 	src/FunctionGenerator_Proxy.hpp          \
 	src/MasterFunctionGenerator_Proxy.hpp     \
-	src/FunctionGeneratorFirmware_Proxy.hpp   
+	src/FunctionGeneratorFirmware_Proxy.hpp    
+
 
 
 
@@ -383,9 +395,10 @@ libbg_firmware_proxy_la_LIBADD  =  $(SIGCPP_LIBS) libsaftbus.la
 libbg_firmware_proxy_la_SOURCES =   \
 	src/BurstGenerator_Proxy.cpp                   
 
-libbg_firmware_proxy_includedir = $(includedir)/bg
+libbg_firmware_proxy_includedir = $(includedir)/bg-firmware
 libbg_firmware_proxy_include_HEADERS = \
-	src/BurstGenerator_Proxy.hpp                
+	src/BurstGenerator_Proxy.hpp          
+
 
 
 

src/Error.h

@@ -0,0 +1,7 @@
+#ifndef ERROR_COMPATIBILITY_H_
+#define ERROR_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/FunctionGeneratorFirmware.hpp

@@ -46,18 +46,8 @@ class FunctionGeneratorFirmware : public Owned, public TimingReceiverAddon
 
     FunctionGeneratorFirmware(saftbus::Container *container, SAFTd *saft_daemon, TimingReceiver *timing_receiver);
     ~FunctionGeneratorFirmware();
-    // typedef FunctionGeneratorFirmware_Service ServiceType;
-    // struct ConstructorType {
-    //   std::string objectPath;
-    //   TimingReceiver  *tr;
-    //   Device &device;
-    //   etherbone::sdb_msi_device  sdb_msi_base;
-    //   sdb_device                 mailbox;
-    //   std::map< std::string, std::shared_ptr<Owned> > &fgs_owned;
-    //   std::map< std::string, std::shared_ptr<Owned> > &master_fgs_owned;
-    // };
-    // static std::shared_ptr<FunctionGeneratorFirmware> create(const ConstructorType& args);
-
+
+    // @saftbus-export
     uint32_t getVersion() const;
 
     /// @brief Scan bus for fg channels. 

src/SignalGroup.h

@@ -0,0 +1,7 @@
+#ifndef SIGNALGROUP_COMPATIBILITY_H_
+#define SIGNALGROUP_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/Time.h

@@ -0,0 +1,8 @@
+#ifndef TIME_COMPATIBILITY_H_
+#define TIME_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <Time.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/interfaces/BurstGenerator.h

@@ -0,0 +1,8 @@
+#ifndef BURSTGENERATOR_COMPATIBILITY_H_
+#define BURSTGENERATOR_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <bg-firmware/BurstGenerator_Proxy.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/interfaces/FunctionGenerator.h

@@ -0,0 +1,8 @@
+#ifndef FUNCTIONGENERATOR_COMPATIBILITY_H_
+#define FUNCTIONGENERATOR_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <fg-firmware/FunctionGenerator_Proxy.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/interfaces/FunctionGeneratorFirmware.h

@@ -0,0 +1,8 @@
+#ifndef FUNCTIONGENERATORFIRMWARE_COMPATIBILITY_H_
+#define FUNCTIONGENERATORFIRMWARE_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <fg-firmware/FunctionGeneratorFirmware_Proxy.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/interfaces/MasterFunctionGenerator.h

@@ -0,0 +1,8 @@
+#ifndef MASTERFUNCTIONGENERATOR_COMPATIBILITY_H_
+#define MASTERFUNCTIONGENERATOR_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <fg-firmware/MasterFunctionGenerator_Proxy.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/interfaces/iBurstGenerator.h

@@ -0,0 +1,8 @@
+#ifndef IBURSTGENERATOR_COMPATIBILITY_H_
+#define IBURSTGENERATOR_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <bg-firmware/BurstGenerator_Proxy.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/interfaces/iFunctionGenerator.h

@@ -0,0 +1,8 @@
+#ifndef IFUNCTIONGENERATOR_COMPATIBILITY_H_
+#define IFUNCTIONGENERATOR_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <fg-firmware/FunctionGenerator_Proxy.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/interfaces/iFunctionGeneratorFirmware.h

@@ -0,0 +1,8 @@
+#ifndef IFUNCTIONGENERATORFIRMWARE_COMPATIBILITY_H_
+#define IFUNCTIONGENERATORFIRMWARE_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <fg-firmware/FunctionGeneratorFirmware_Proxy.hpp>
+#include <CommonFunctions.hpp>
+
+#endif

src/interfaces/iMasterFunctionGenerator.h

@@ -0,0 +1,8 @@
+#ifndef IMASTERFUNCTIONGENERATOR_COMPATIBILITY_H_
+#define IMASTERFUNCTIONGENERATOR_COMPATIBILITY_H_
+
+#include <saftbus/error.hpp>
+#include <fg-firmware/MasterFunctionGenerator_Proxy.hpp>
+#include <CommonFunctions.hpp>
+
+#endif