From 37f2ed0cece7985505605f793fd8a3445d679474 Mon Sep 17 00:00:00 2001 From: Michael Reese Date: Fri, 24 Nov 2023 09:35:35 +0100 Subject: [PATCH 1/2] add missing saftbus-export tag --- src/FunctionGeneratorFirmware.hpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/FunctionGeneratorFirmware.hpp b/src/FunctionGeneratorFirmware.hpp index f123f32b..8d76f5f9 100644 --- a/src/FunctionGeneratorFirmware.hpp +++ b/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 > &fgs_owned; - // std::map< std::string, std::shared_ptr > &master_fgs_owned; - // }; - // static std::shared_ptr create(const ConstructorType& args); - + + // @saftbus-export uint32_t getVersion() const; /// @brief Scan bus for fg channels. From a901702f84ec0b4e194a77c0db8a1da835b96b7d Mon Sep 17 00:00:00 2001 From: Michael Reese Date: Fri, 24 Nov 2023 10:22:30 +0100 Subject: [PATCH 2/2] add a bunch of missing compatibility header files --- Makefile.am | 21 +++++++++++++++++---- src/Error.h | 7 +++++++ src/SignalGroup.h | 7 +++++++ src/Time.h | 8 ++++++++ src/interfaces/BurstGenerator.h | 8 ++++++++ src/interfaces/FunctionGenerator.h | 8 ++++++++ src/interfaces/FunctionGeneratorFirmware.h | 8 ++++++++ src/interfaces/MasterFunctionGenerator.h | 8 ++++++++ src/interfaces/iBurstGenerator.h | 8 ++++++++ src/interfaces/iFunctionGenerator.h | 8 ++++++++ src/interfaces/iFunctionGeneratorFirmware.h | 8 ++++++++ src/interfaces/iMasterFunctionGenerator.h | 8 ++++++++ 12 files changed, 103 insertions(+), 4 deletions(-) create mode 100644 src/Error.h create mode 100644 src/SignalGroup.h create mode 100644 src/Time.h create mode 100644 src/interfaces/BurstGenerator.h create mode 100644 src/interfaces/FunctionGenerator.h create mode 100644 src/interfaces/FunctionGeneratorFirmware.h create mode 100644 src/interfaces/MasterFunctionGenerator.h create mode 100644 src/interfaces/iBurstGenerator.h create mode 100644 src/interfaces/iFunctionGenerator.h create mode 100644 src/interfaces/iFunctionGeneratorFirmware.h create mode 100644 src/interfaces/iMasterFunctionGenerator.h diff --git a/Makefile.am b/Makefile.am index eb1ee5aa..073b2ff0 100644 --- a/Makefile.am +++ b/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 + diff --git a/src/Error.h b/src/Error.h new file mode 100644 index 00000000..fb43098e --- /dev/null +++ b/src/Error.h @@ -0,0 +1,7 @@ +#ifndef ERROR_COMPATIBILITY_H_ +#define ERROR_COMPATIBILITY_H_ + +#include +#include + +#endif diff --git a/src/SignalGroup.h b/src/SignalGroup.h new file mode 100644 index 00000000..b1fe7e25 --- /dev/null +++ b/src/SignalGroup.h @@ -0,0 +1,7 @@ +#ifndef SIGNALGROUP_COMPATIBILITY_H_ +#define SIGNALGROUP_COMPATIBILITY_H_ + +#include +#include + +#endif diff --git a/src/Time.h b/src/Time.h new file mode 100644 index 00000000..db63f4b2 --- /dev/null +++ b/src/Time.h @@ -0,0 +1,8 @@ +#ifndef TIME_COMPATIBILITY_H_ +#define TIME_COMPATIBILITY_H_ + +#include +#include +#include + +#endif diff --git a/src/interfaces/BurstGenerator.h b/src/interfaces/BurstGenerator.h new file mode 100644 index 00000000..959b9dc3 --- /dev/null +++ b/src/interfaces/BurstGenerator.h @@ -0,0 +1,8 @@ +#ifndef BURSTGENERATOR_COMPATIBILITY_H_ +#define BURSTGENERATOR_COMPATIBILITY_H_ + +#include +#include +#include + +#endif diff --git a/src/interfaces/FunctionGenerator.h b/src/interfaces/FunctionGenerator.h new file mode 100644 index 00000000..d2275a91 --- /dev/null +++ b/src/interfaces/FunctionGenerator.h @@ -0,0 +1,8 @@ +#ifndef FUNCTIONGENERATOR_COMPATIBILITY_H_ +#define FUNCTIONGENERATOR_COMPATIBILITY_H_ + +#include +#include +#include + +#endif diff --git a/src/interfaces/FunctionGeneratorFirmware.h b/src/interfaces/FunctionGeneratorFirmware.h new file mode 100644 index 00000000..0004d991 --- /dev/null +++ b/src/interfaces/FunctionGeneratorFirmware.h @@ -0,0 +1,8 @@ +#ifndef FUNCTIONGENERATORFIRMWARE_COMPATIBILITY_H_ +#define FUNCTIONGENERATORFIRMWARE_COMPATIBILITY_H_ + +#include +#include +#include + +#endif diff --git a/src/interfaces/MasterFunctionGenerator.h b/src/interfaces/MasterFunctionGenerator.h new file mode 100644 index 00000000..651ec920 --- /dev/null +++ b/src/interfaces/MasterFunctionGenerator.h @@ -0,0 +1,8 @@ +#ifndef MASTERFUNCTIONGENERATOR_COMPATIBILITY_H_ +#define MASTERFUNCTIONGENERATOR_COMPATIBILITY_H_ + +#include +#include +#include + +#endif diff --git a/src/interfaces/iBurstGenerator.h b/src/interfaces/iBurstGenerator.h new file mode 100644 index 00000000..e68d79a2 --- /dev/null +++ b/src/interfaces/iBurstGenerator.h @@ -0,0 +1,8 @@ +#ifndef IBURSTGENERATOR_COMPATIBILITY_H_ +#define IBURSTGENERATOR_COMPATIBILITY_H_ + +#include +#include +#include + +#endif diff --git a/src/interfaces/iFunctionGenerator.h b/src/interfaces/iFunctionGenerator.h new file mode 100644 index 00000000..a8d8dd1e --- /dev/null +++ b/src/interfaces/iFunctionGenerator.h @@ -0,0 +1,8 @@ +#ifndef IFUNCTIONGENERATOR_COMPATIBILITY_H_ +#define IFUNCTIONGENERATOR_COMPATIBILITY_H_ + +#include +#include +#include + +#endif diff --git a/src/interfaces/iFunctionGeneratorFirmware.h b/src/interfaces/iFunctionGeneratorFirmware.h new file mode 100644 index 00000000..456e6bf0 --- /dev/null +++ b/src/interfaces/iFunctionGeneratorFirmware.h @@ -0,0 +1,8 @@ +#ifndef IFUNCTIONGENERATORFIRMWARE_COMPATIBILITY_H_ +#define IFUNCTIONGENERATORFIRMWARE_COMPATIBILITY_H_ + +#include +#include +#include + +#endif diff --git a/src/interfaces/iMasterFunctionGenerator.h b/src/interfaces/iMasterFunctionGenerator.h new file mode 100644 index 00000000..10db7743 --- /dev/null +++ b/src/interfaces/iMasterFunctionGenerator.h @@ -0,0 +1,8 @@ +#ifndef IMASTERFUNCTIONGENERATOR_COMPATIBILITY_H_ +#define IMASTERFUNCTIONGENERATOR_COMPATIBILITY_H_ + +#include +#include +#include + +#endif