diff --git a/MAC/APL/PIC/RSPDriver/Makefile.am b/MAC/APL/PIC/RSPDriver/Makefile.am
index 8ba57be76666e0e0a1da1879778aed872fbcc3c9..ef619fd2058019e3bdf962d8f000e87b27dde7d1 100644
--- a/MAC/APL/PIC/RSPDriver/Makefile.am
+++ b/MAC/APL/PIC/RSPDriver/Makefile.am
@@ -13,7 +13,6 @@ DISTCHECK_CONFIGURE_FLAGS=\
--with-common=$(prefix)\
--with-suite=$(prefix)\
--with-gcftm=$(prefix)\
- --with-gcfcommon=$(prefix) \
--with-rsp_protocol=$(prefix)
include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PIC/RSPDriver/configure.in b/MAC/APL/PIC/RSPDriver/configure.in
index 881b0a1760d876953473e014e6db8b8f9b427bd4..d59bfd9d94bd19597c42bbd3d7c1984e80710b69 100644
--- a/MAC/APL/PIC/RSPDriver/configure.in
+++ b/MAC/APL/PIC/RSPDriver/configure.in
@@ -90,8 +90,8 @@ AC_STRUCT_TM
lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
lofar_INTERNAL(MAC/Test/Suite, suite, , 1, Suite/test.h,,)
lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1, GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.h,,)
+lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/MACServiceInfo.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
lofar_INTERNAL(MAC/APL/PIC/RSP_Protocol, RSP_Protocol, ,1, APL/RSP_Protocol/RSP_Protocol.ph,,)
lofar_EXTERNAL(BLITZ,1,blitz/blitz.h,,,,'gnu3:-Wno-unused gnu3:-ftemplate-depth-30',,-lm)
diff --git a/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc b/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
index d0a74c51a5f0e75a9a67eb090bee216d509f5794..d7dc68415a619438da872d260150edf9f62d1939 100644
--- a/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
+++ b/MAC/APL/PIC/RSPDriver/src/RSPDriver.cc
@@ -25,7 +25,7 @@
#include <Common/LofarLogger.h>
#include <Common/LofarLocators.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <APL/RTCCommon/PSAccess.h>
#include <APL/RTCCommon/daemonize.h>
@@ -137,7 +137,6 @@
using namespace blitz;
using namespace std;
using namespace LOFAR;
-using namespace GCFCommon;
using namespace RSP;
using namespace RTC;
diff --git a/MAC/APL/PIC/RSPDriver/src/RawEvent.h b/MAC/APL/PIC/RSPDriver/src/RawEvent.h
index 8cc2cf27146692e3833637695ff58b209d55af44..4a4af8755c0492e7166d70be7cd118a7c430cf0b 100644
--- a/MAC/APL/PIC/RSPDriver/src/RawEvent.h
+++ b/MAC/APL/PIC/RSPDriver/src/RawEvent.h
@@ -33,7 +33,7 @@ namespace EPA_Protocol
class RawEvent
{
public:
- static LOFAR::GCF::TM::GCFEvent::TResult dispatch(LOFAR::GCF::TM::GCFTask& task,
+ static LOFAR::MACIO::GCFEvent::TResult dispatch(LOFAR::GCF::TM::GCFTask& task,
LOFAR::GCF::TM::GCFPortInterface& port);
};
};
diff --git a/MAC/APL/PIC/RSPDriver/src/rspctl.cc b/MAC/APL/PIC/RSPDriver/src/rspctl.cc
index b5b3fe808742009aaff8c4d2336c630d1a4caf8a..cb614b2e16891539193f3e9cd05da14048252fba 100644
--- a/MAC/APL/PIC/RSPDriver/src/rspctl.cc
+++ b/MAC/APL/PIC/RSPDriver/src/rspctl.cc
@@ -26,7 +26,7 @@
#include <Common/LofarLogger.h>
#include <Common/lofar_bitset.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <APL/RSP_Protocol/RSP_Protocol.ph>
#include <APL/RSP_Protocol/EPA_Protocol.ph>
@@ -56,7 +56,6 @@
using namespace std;
using namespace blitz;
using namespace LOFAR;
-using namespace GCFCommon;
using namespace EPA_Protocol;
using namespace RSP_Protocol;
using namespace rspctl;
@@ -301,6 +300,7 @@ GCFEvent::TResult WeightsCommand::ack(GCFEvent& e)
return status;
break;
}
+ return status;
}
@@ -2076,9 +2076,9 @@ RSPCtl::RSPCtl(string name, int argc, char** argv)
// exit(EXIT_FAILURE);
// }
- GCF::TM::registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_STRINGS);
+ registerProtocol(RSP_PROTOCOL, RSP_PROTOCOL_STRINGS);
#ifdef ENABLE_RSPFE
- GCF::TM::registerProtocol(RSPFE_PROTOCOL, RSPFE_PROTOCOL_STRINGS);
+ registerProtocol(RSPFE_PROTOCOL, RSPFE_PROTOCOL_STRINGS);
#endif
string instanceID;
diff --git a/MAC/APL/PIC/RSPDriver/test/RSPTest.cc b/MAC/APL/PIC/RSPDriver/test/RSPTest.cc
index df3028f63a643d57fc07f3fc06e57ca9e82785be..fe28dce196459301fe78c47fa735c170721d0af7 100644
--- a/MAC/APL/PIC/RSPDriver/test/RSPTest.cc
+++ b/MAC/APL/PIC/RSPDriver/test/RSPTest.cc
@@ -24,7 +24,7 @@
#include <lofar_config.h>
#include <Common/LofarLogger.h>
-#include <GCF/GCF_ServiceInfo.h>
+#include <MACIO/MACServiceInfo.h>
#include <APL/RSP_Protocol/RSP_Protocol.ph>
#include <APL/RSP_Protocol/EPA_Protocol.ph>
diff --git a/MAC/APL/PIC/RSPDriver/test/RSPTest.h b/MAC/APL/PIC/RSPDriver/test/RSPTest.h
index a1c928c09deee4760ab429c99fb2bab9a7cefb0b..db8b78c47a8d5ad35fd854e111c624c7b5ebb7e0 100644
--- a/MAC/APL/PIC/RSPDriver/test/RSPTest.h
+++ b/MAC/APL/PIC/RSPDriver/test/RSPTest.h
@@ -26,11 +26,14 @@
#define RSPTEST_H_
#include <Suite/test.h>
+#include <MACIO/GCF_Event.h>
#include <GCF/TM/GCF_Control.h>
#include <GCF/TM/GCF_ETHRawPort.h>
-namespace RSP_Test
-{
+using LOFAR::MACIO::GCFEvent;
+
+namespace LOFAR {
+ namespace RSP_Test {
class RSPTest : public GCFTask, public Test
{
public:
@@ -49,8 +52,8 @@ namespace RSP_Test
* The initial and final state.
*/
/*@{*/
- GCFEvent::TResult initial(GCFEvent& e, GCFPortInterface &p);
- GCFEvent::TResult final(GCFEvent& e, GCFPortInterface &p);
+ MACIO::GCFEvent::TResult initial(GCFEvent& e, GCFPortInterface &p);
+ MACIO::GCFEvent::TResult final(GCFEvent& e, GCFPortInterface &p);
/*@}*/
/**
@@ -85,6 +88,7 @@ namespace RSP_Test
GCFPort m_server;
};
-};
+ }; // namespace RSP_Test
+}; // namespace LOFAR
#endif /* RSPTEST_H_ */
diff --git a/MAC/APL/PIC/RSP_Protocol/Makefile.am b/MAC/APL/PIC/RSP_Protocol/Makefile.am
index 192ae537d5094cd88eab06506adcfb3a794c2984..56aae2af675e045e51ad0a0e56ef00668043176f 100644
--- a/MAC/APL/PIC/RSP_Protocol/Makefile.am
+++ b/MAC/APL/PIC/RSP_Protocol/Makefile.am
@@ -6,7 +6,6 @@ pkgext_DATA = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
DISTCHECK_CONFIGURE_FLAGS=\
--with-common=$(prefix) \
- --with-gcfcommon=$(prefix) \
--with-gcftm=$(prefix) \
--with-rtccommon=$(prefix)
diff --git a/MAC/APL/PIC/RSP_Protocol/configure.in b/MAC/APL/PIC/RSP_Protocol/configure.in
index 5a62988a41d660b71dfcb7bc19047acd1b414d20..99ba25b2654445e488c34f3560a1f7cf1a5e7b4f 100644
--- a/MAC/APL/PIC/RSP_Protocol/configure.in
+++ b/MAC/APL/PIC/RSP_Protocol/configure.in
@@ -53,9 +53,9 @@ dnl
lofar_GENERAL
lofar_BLITZ
dnl lofar_MPI
-lofar_INTERNAL(LCS/Common, common, , 1, Common/LofarTypes.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Control.h,,)
-lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/Marshalling.h,,)
+lofar_INTERNAL(LCS/Common, Common, , 1, Common/LofarTypes.h,,)
+lofar_INTERNAL(MAC/MACIO, MACIO, , 1, MACIO/GCF_Event.h,,)
+lofar_INTERNAL(MAC/APL/RTCCommon, RTCCommon, , 1, APL/RTCCommon/MarshallBlitz.h,,)
dnl
dnl Output Makefiles
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h
index 874dd9a9df3956efd2c12032c5fbd88fe95201da..fbcfc7092c611af2e1affff06fc14f1a145d7b45 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h
@@ -25,7 +25,7 @@
#ifndef VERSIONS_H_
#define VERSIONS_H_
-#include <APL/RTCCommon/Marshalling.h>
+#include <APL/RTCCommon/MarshallBlitz.h>
#include <APL/RSP_Protocol/EPA_Protocol.ph>
#include <complex>
diff --git a/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc b/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc
index 4935cd2c74dbf0ebc61ca3993d7f0b268525addb..1953560721e66242dccd3f6a7aa1675f777b7c2a 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc
@@ -24,7 +24,7 @@
#include <Common/LofarLogger.h>
#include <APL/RSP_Protocol/AllRegisterState.h>
-#include <APL/RTCCommon/Marshalling.h>
+#include <APL/RTCCommon/MarshallBlitz.h>
using namespace std;
using namespace blitz;
diff --git a/MAC/APL/PIC/RSP_Protocol/src/EPA_Protocol.prot b/MAC/APL/PIC/RSP_Protocol/src/EPA_Protocol.prot
index 59b9e1a1be21a673a6b379e5bfc57da3cf19cd49..bd062b0abf514c749f23d8132e14a838a8080273 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/EPA_Protocol.prot
+++ b/MAC/APL/PIC/RSP_Protocol/src/EPA_Protocol.prot
@@ -5,7 +5,7 @@ autogen definitions protocol;
description = "Protocol for the EPA Demonstrator Board";
prefix = "EPA"; // for the signal names
-id = "(LOFAR::GCF::TM::F_APL_PROTOCOL+11)";
+id = "(LOFAR::MACIO::F_APL_PROTOCOL+11)";
// specify extra include files
// e.g.
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Makefile.am b/MAC/APL/PIC/RSP_Protocol/src/Makefile.am
index 2c668544a882600a32f68d13a5535182fcd51b38..633ae4f2e3b498388a353a77ee415e0f5a7f571f 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/Makefile.am
+++ b/MAC/APL/PIC/RSP_Protocol/src/Makefile.am
@@ -5,11 +5,11 @@ AM_CPPFLAGS = \
AUTOGEN = autogen
SUFFIXES = .ph
%.cc: %.prot
- $(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
+ $(AUTOGEN) --writable -L $(datadir)/MACIO $<
cp $*.ph $(top_builddir)/include/APL/RSP_Protocol
%.ph: %.prot
- $(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
+ $(AUTOGEN) --writable -L $(datadir)/MACIO $<
cp $*.ph $(top_builddir)/include/APL/RSP_Protocol
EXTRA_DIST = \
diff --git a/MAC/APL/PIC/RSP_Protocol/src/RSPFE_Protocol.prot b/MAC/APL/PIC/RSP_Protocol/src/RSPFE_Protocol.prot
index 13947707f2b7e0ab2b2162f02119dc41625b251e..245f7fc223a961d52a5b35ee2660c56b18919aef 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/RSPFE_Protocol.prot
+++ b/MAC/APL/PIC/RSP_Protocol/src/RSPFE_Protocol.prot
@@ -5,7 +5,7 @@ autogen definitions protocol;
description = "Protocol for the RSP driver interface";
prefix = "RSPFE"; // for the signal names
-id = "(LOFAR::GCF::TM::F_APL_PROTOCOL+14)";
+id = "(LOFAR::MACIO::F_APL_PROTOCOL+14)";
// specify extra include files
diff --git a/MAC/APL/PIC/RSP_Protocol/src/RSP_Protocol.prot b/MAC/APL/PIC/RSP_Protocol/src/RSP_Protocol.prot
index 8f07d2740a45782647cf0befa9df0c186c4f5e0d..eddde48b55f8c3cc8369065d665cf9fd8d5672bc 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/RSP_Protocol.prot
+++ b/MAC/APL/PIC/RSP_Protocol/src/RSP_Protocol.prot
@@ -5,7 +5,7 @@ autogen definitions protocol;
description = "Protocol for the RSP driver interface";
prefix = "RSP"; // for the signal names
-id = "(LOFAR::GCF::TM::F_APL_PROTOCOL+12)";
+id = "(LOFAR::MACIO::F_APL_PROTOCOL+12)";
// specify extra include files
// e.g.