diff --git a/.gitattributes b/.gitattributes
index da3925732a7b902b354c0a13932715e95a61ab13..5e1366e910b2a92e72cc79101349e5ce9f4e45e0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -401,13 +401,6 @@ MAC/GCF/LogSys/KVLogSys/src/Makefile.am -text svneol=native#application/octet-st
MAC/GCF/LogSys/Makefile.am -text svneol=native#application/octet-stream
MAC/GCF/LogSys/bootstrap -text svneol=native#application/octet-stream
MAC/GCF/LogSys/configure.in -text svneol=native#application/octet-stream
-MAC/GCF/Protocols/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/Protocols/bootstrap -text svneol=native#application/octet-stream
-MAC/GCF/Protocols/configure.in -text svneol=native#application/octet-stream
-MAC/GCF/Protocols/src/Makefile.am -text svneol=native#application/octet-stream
-MAC/GCF/Protocols/src/PA_Protocol.prot -text svneol=native#application/octet-stream
-MAC/GCF/Protocols/src/PI_Protocol.prot -text svneol=native#application/octet-stream
-MAC/GCF/Protocols/src/gcf-pi.conf.in -text svneol=native#application/octet-stream
MAC/GCF/README -text svneol=native#application/octet-stream
MAC/GCF/TM/Makefile.am -text svneol=native#application/octet-stream
MAC/GCF/TM/bootstrap -text svneol=native#application/octet-stream
diff --git a/.gitignore b/.gitignore
index 35e19306d5ad301a49c55972414916a98254de60..e3e9467bb63e6bdbc88fc5b3a0e534f0077ad8a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -311,9 +311,6 @@ MAC/GCF/LogSys/lofarconf
MAC/GCF/PVSS/Makefile.common
MAC/GCF/PVSS/autoconf_share
MAC/GCF/PVSS/lofarconf
-MAC/GCF/Protocols/Makefile.common
-MAC/GCF/Protocols/autoconf_share
-MAC/GCF/Protocols/lofarconf
MAC/GCF/RTDB/Makefile.common
MAC/GCF/RTDB/autoconf_share
MAC/GCF/RTDB/lofarconf
diff --git a/MAC/GCF/Protocols/GCFProtocols.spec.in b/MAC/GCF/Protocols/GCFProtocols.spec.in
deleted file mode 100644
index 818ae01ff31e4e4b48ab353102b733f2950354c6..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/GCFProtocols.spec.in
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- Mode:rpm-spec -*-
-# GCFProtocols.spec.in
-#
-
-##############################################################################
-#
-# Preamble
-#
-##############################################################################
-
-Summary: GCFProtocols contains a number of protocols and a configuration, which will be shared by different kind of applications.
-
-%define release @RPM_RELEASE@
-%define version @VERSION@
-%define pkgname @PACKAGE@
-%define pkgdir %{pkgname}-%{version}-%{release}
-%define prefix /opt/lofar
-%define configure_args @RPM_CONFIGURE_ARGS@
-##define build_kernel_version @BUILD_KERNEL_VERSION@
-
-Name: %{pkgname}
-Version: %{version}
-Release: %{release}
-Copyright: LGPL
-Group: Application/System
-Source: %{pkgname}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{pkgdir}-root
-URL: http://www.astron.nl
-Prefix: %{prefix}
-BuildArchitectures: i386 # Target platforms, i.e., i586
-Requires: Common >= 2.2
-Requires: GCFCommon >= 6.1
-Requires: GCFTM >= 6.1
-Requires: Transport >= 2.0
-Packager: %{packager}
-Distribution: The LOFAR project
-Vendor: ASTRON
-
-AutoReqProv: no
-
-%description
-
-GCFProtocols contains a number of protocols and a configuration, which
-will be shared by PVSS independent MAC (related) applications/libs like
-PMLlightCEP and PVSS dependend like PI and PA.
-
-##############################################################################
-#
-# prep
-#
-##############################################################################
-%prep
-echo $prefix
-
-# create the build directory, untar the source
-%setup
-
-##############################################################################
-#
-# build
-#
-##############################################################################
-%build
-./configure %{configure_args} --prefix=%{prefix} && make
-
-##############################################################################
-#
-# install
-#
-##############################################################################
-%install
-# To make things work with BUILDROOT
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
- echo
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo @ @
- echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @
- echo @ @
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo
-else
- echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
- rm -rf "$RPM_BUILD_ROOT"
-fi
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR="$RPM_BUILD_ROOT" install
-
-#uninstall
-
-##############################################################################
-#
-# verify
-#
-##############################################################################
-#verify
-
-##############################################################################
-#
-# clean
-#
-##############################################################################
-%clean
-# Call me paranoid, but I do not want to be responsible for nuking
-# someone's harddrive!
-if [ "$RPM_BUILD_ROOT" != "%{_tmppath}/%{pkgdir}-root" ]
-then
- echo
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo @ @
- echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @
- echo @ @
- echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
- echo
-else
- echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT"
- rm -rf "$RPM_BUILD_ROOT"
-fi
-
-##############################################################################
-#
-# files
-#
-##############################################################################
-
-# empty 'files' means all distributed files
-%files
-%defattr(-, root, root)
-%{prefix}
-
-# Your application file list goes here
-# %{prefix}/lib/lib*.so*
-
-# Documentation
-# doc COPYING ChangeLog README AUTHORS NEWS
-# doc doc/*
-
-# link the module to the correct path
-%post
-
-# before uninstall
-%preun
-
-# after uninstall
-%postun
-
-##############################################################################
-#
-# package devel
-#
-##############################################################################
-
-#package devel
-#Summary: Development files for %{pkgname}
-#Group: Applications/System
-#description devel
-#Development files for %{pkgname}.
-
-#files devel
-
-# Your development files go here
-# Programmers documentation goes here
-#doc doc
-
-# end of file
diff --git a/MAC/GCF/Protocols/Makefile.am b/MAC/GCF/Protocols/Makefile.am
deleted file mode 100644
index 283f7bfe0eb6705683c52cc6f1c1408d6a504b64..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-SUBDIRS=src
-
-pkgextdir = $(prefix)/config/$(PACKAGE)
-pkgext_DATA = pkgext pkgextcppflags pkgextcxxflags pkgextldflags
-
-#DISTCHECK_CONFIGURE_FLAGS=\
-# --with-common=$(prefix) # "common" is an example
-
-EXTRA_DIST = \
- Makefile.common \
- GCFProtocols.spec \
- autoconf_share/compiletool
-
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/GCF/Protocols/bootstrap b/MAC/GCF/Protocols/bootstrap
deleted file mode 100755
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/bootstrap
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/MAC/GCF/Protocols/configure.in b/MAC/GCF/Protocols/configure.in
deleted file mode 100644
index 552eedda3fd204af0955708769eabcc541d77915..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/configure.in
+++ /dev/null
@@ -1,52 +0,0 @@
-dnl
-dnl Process this file with autoconf to produce a configure script.
-dnl
-AC_INIT(src/DH_PIProtocol.h)
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(GCFProtocols, 6.1, no-define)
-
-dnl Initialize for LOFAR (may set compilers)
-lofar_INIT
-
-dnl Checks for programs.
-AC_PROG_AWK
-AC_PROG_YACC
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
-
-dnl Checks for libraries.
-
-
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(unistd.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_VPRINTF
-
-dnl
-dnl Check for LOFAR specific things
-dnl
-lofar_GENERAL
-lofar_INTERNAL(LCS/Common, Common, , 1,Common/LofarTypes.h,,)
-lofar_INTERNAL(LCS/Transport, transport, , 1, Transport/DataHolder.h,,)
-lofar_INTERNAL(MAC/GCF/GCFCommon, GCFCommon, , 1,GCF/GCF_Defines.h,,)
-lofar_INTERNAL(MAC/GCF/TM, GCFTM, , 1, GCF/TM/GCF_Event.h,,)
-
-dnl
-dnl Output Makefiles
-dnl
-AC_OUTPUT(
-src/Makefile
-Makefile
-GCFProtocols.spec
-)
diff --git a/MAC/GCF/Protocols/src/DH_PIProtocol.cc b/MAC/GCF/Protocols/src/DH_PIProtocol.cc
deleted file mode 100644
index 2855762a86e9942cad852fda5e1041e75ac44ac9..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/src/DH_PIProtocol.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-// DH_PIProtocol.cc:
-//
-// Copyright (C) 2000, 2001
-// ASTRON (Netherlands Foundation for Research in Astronomy)
-// P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-// $Id$
-
-#include <lofar_config.h>
-#include <DH_PIProtocol.h>
-
-namespace LOFAR
-{
- namespace GCF
- {
-
-DH_PIProtocol::DH_PIProtocol (const string& name)
-: DataHolder (name, "DH_PIProtocol", 1),
- _eventID (0), // pointer
- _seqNr(0) // pointer
-{
- setExtraBlob ("DynData", 1);
-}
-
-DH_PIProtocol::DH_PIProtocol(const DH_PIProtocol& that)
-: DataHolder (that),
- _eventID (that._eventID),
- _seqNr(that._seqNr)
-{}
-
-DH_PIProtocol::~DH_PIProtocol()
-{}
-
-DataHolder* DH_PIProtocol::clone() const
-{
- return new DH_PIProtocol(*this);
-}
-
-DH_PIProtocol* DH_PIProtocol::makeDataCopy() const
-{
- DH_PIProtocol* newDHPI = new DH_PIProtocol;
- newDHPI->init();
- newDHPI->setEventID (getEventID());
- newDHPI->setSeqNr (getSeqNr());
- newDHPI->pack();
-
- return (newDHPI);
-}
-
-void DH_PIProtocol::init()
-{
- // Initialize the fieldset.
- initDataFields();
- // Add the fields to the data definition.
- addField ("EventID", BlobField<uint8>(1));
- addField ("seqNr", BlobField<uint16>(1));
- // Create the data blob (which calls fillPointers).
- createDataBlock();
-}
-
-void DH_PIProtocol::fillDataPointers()
-{
- // Fill in the eventID pointer.
- _eventID = getData<uint8> ("EventID");
- // Fill in the seqNr pointer.
- _seqNr = getData<uint16> ("seqNr");
-}
-
- } // namespace GCF
-} // namespace LOFAR
diff --git a/MAC/GCF/Protocols/src/DH_PIProtocol.h b/MAC/GCF/Protocols/src/DH_PIProtocol.h
deleted file mode 100644
index b8276a9d89d08bb8e1ced9251a21383dd9324085..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/src/DH_PIProtocol.h
+++ /dev/null
@@ -1,118 +0,0 @@
-//# DH_PIProtocol.h:
-//#
-//# Copyright (C) 2004
-//# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
-//#
-//# This program is free software; you can redistribute it and/or modify
-//# it under the terms of the GNU General Public License as published by
-//# the Free Software Foundation; either version 2 of the License, or
-//# (at your option) any later version.
-//#
-//# This program is distributed in the hope that it will be useful,
-//# but WITHOUT ANY WARRANTY; without even the implied warranty of
-//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-//# GNU General Public License for more details.
-//#
-//# You should have received a copy of the GNU General Public License
-//# along with this program; if not, write to the Free Software
-//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//#
-//# $Id$
-
-#ifndef DH_PIPROTOCOL_H
-#define DH_PIPROTOCOL_H
-
-#include <set>
-#include <Transport/DataHolder.h>
-
-//
-
-namespace LOFAR
-{
- namespace GCF
- {
-
-class DH_PIProtocol: public DataHolder
-{
- public:
- typedef enum
- {
- NO_EVENTID_SET,
- REGISTER_SCOPE,
- SCOPE_REGISTERED,
- UNREGISTER_SCOPE,
- SCOPE_UNREGISTERED,
- LINK_PROPSET,
- PROPSET_LINKED,
- UNLINK_PROPSET,
- PROPSET_UNLINKED,
- VALUE_SET
- } TEventID;
-
- explicit DH_PIProtocol (const string& name = "PIClient");
-
- DH_PIProtocol(const DH_PIProtocol&);
-
- virtual ~DH_PIProtocol();
-
- DataHolder* clone() const;
- DH_PIProtocol* makeDataCopy() const;
-
- // Set the EventID data member.
- void setEventID (TEventID EventID);
- // Get the EventID data member.
- TEventID getEventID() const;
-
- // Set the seqNr data member.
- void setSeqNr (uint16 seqNr);
- // Get the seqNr data member.
- uint16 getSeqNr() const;
-
- // init protocol static fields.
- virtual void init();
-
- BlobOStream& createExtraBlob();
- BlobIStream& getExtraBlob();
- private:
- // Forbid assignment.
- DH_PIProtocol& operator= (const DH_PIProtocol&);
-
- // Fill the pointers (_eventID and _seqNr) to the data in the blob.
- virtual void fillDataPointers();
-
- private: // data member
- uint8* _eventID;
- uint16* _seqNr;
-
- private: // adminstrative members
- typedef std::set<uint16> TSeqNrSet;
- TSeqNrSet _seqNrSet;
-
-};
-
-inline void DH_PIProtocol::setEventID (DH_PIProtocol::TEventID EventID)
- { *_eventID = (uint8) EventID; }
-
-inline DH_PIProtocol::TEventID DH_PIProtocol::getEventID() const
- { return (TEventID) *_eventID; }
-
-inline void DH_PIProtocol::setSeqNr (uint16 seqNr)
- { *_seqNr = seqNr; }
-
-inline uint16 DH_PIProtocol::getSeqNr() const
- { return *_seqNr; }
-
-inline BlobOStream& DH_PIProtocol::createExtraBlob()
-{
- return DataHolder::createExtraBlob();
-}
-
-inline BlobIStream& DH_PIProtocol::getExtraBlob()
-{
- return DataHolder::getExtraBlob();
-}
- } // namespace GCF
-} // namespace LOFAR
-
-#endif
diff --git a/MAC/GCF/Protocols/src/Makefile.am b/MAC/GCF/Protocols/src/Makefile.am
deleted file mode 100644
index a3d4d2b4a362447d8f6bce69647e6ea6b7803ece..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/src/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-pkgincludedir = $(includedir)/GCF/Protocols
-pkginclude_HEADERS = \
- $(BUILT_SOURCES) \
- DH_PIProtocol.h
-
-AUTOGEN = autogen
-SUFFIXES = .ph
-%.ph: %.prot
- $(AUTOGEN) --writable -L $(datadir)/GCF/TM $<
-
-DOCHDRS = $(pkginclude_HEADERS)
-
-lib_LTLIBRARIES = libgcfpirtcprot.la libgcfpaprot.la libgcfpicepprot.la
-
-libgcfpicepprot_la_SOURCES= $(DOCHDRS) \
- DH_PIProtocol.cc
-
-libgcfpirtcprot_la_SOURCES= $(DOCHDRS) \
- PI_Protocol.cc
-
-libgcfpaprot_la_SOURCES= $(DOCHDRS) \
- PA_Protocol.cc
-
-BUILT_SOURCES = \
- PI_Protocol.ph \
- PA_Protocol.ph
-
-EXTRA_DIST = $(sysconf_DATA)
-
-sysconf_DATA= \
- PropertyInterface.conf
-
-%.conf: gcf-pi.conf.in
- cp $< $@
-
-clean-local:
- rm -f *.ph
-
-include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/GCF/Protocols/src/PA_Protocol.prot b/MAC/GCF/Protocols/src/PA_Protocol.prot
deleted file mode 100644
index 37aefdfae03b69df6e6d18530cc1b85f40f5f0e9..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/src/PA_Protocol.prot
+++ /dev/null
@@ -1,255 +0,0 @@
-//
-// Protocol definition for the PA server
-//
-autogen definitions protocol;
-
-description = "Protocol for the PA server";
-prefix = "PA"; // for the signal names
-id = "(LOFAR::GCF::TM::F_GCF_PROTOCOL + 2)";
-
-include = '<GCF/GCF_Defines.h>';
-
-prelude = << PRELUDE_END
-
-enum TPAResult
-{
- PA_NO_ERROR,
- PA_UNKNOWN_ERROR,
- PA_WRONG_STATE,
- PA_PS_GONE,
- PA_MISSING_PROPS,
- PA_PROP_SET_NOT_EXISTS,
- PA_PROP_SET_ALREADY_EXISTS,
- PA_DPTYPE_UNKNOWN,
- PA_INTERNAL_ERROR,
- PA_PI_INTERNAL_ERROR,
- PA_APC_NOT_EXISTS,
- PA_LINK_TIME_OUT,
- PA_SERVER_GONE,
-};
-
-// implements to following events:
-// From GPMController to PA
-// LOAD_PROP_SET (int seqnr, string scope);
-// PROP_SET_LOADED (int seqnr, TPAResult result);
-// UNLOAD_PROP_SET (int seqnr, string scope);
-// PROP_SET_UNLOADED (int seqnr, TPAResult result);
-// CONF_PROP_SET (int seqnr, string scope, string apcName);
-// PROP_SET_CONF (int seqnr, string apcName, TPAResult result);
-// REGISTER_SCOPE (int seqnr, string scope, string type, TPSCategory category);
-// SCOPE_REGISTERED (int seqnr, TPAResult result);
-// UNREGISTER_SCOPE (int seqnr, string scope);
-// SCOPE_UNREGISTERED (int seqnr, TPAResult result);
-
-// From PA to GPMController
-// LINK_PROP_SET (string scope);
-// PROP_SET_LINKED (string scope, TPAResult result);
-// UNLINK_PROP_SET (string scope);
-// PROP_SET_UNLINKED (string scope, TPAResult result);
-// PROP_SET_GONE (string scope);
-
-PRELUDE_END;
-//
-// An "event" has a "signal" and a "dir" (direction)
-// and zero or more "param"s.
-// "dir" can be one of "IN" or "OUT".
-// A "param" has a "name" and a "type".
-//
-event = {
- signal = LOAD_PROP_SET;
- dir = IN;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "scope";
- type = "string";
- };
-};
-
-event = {
- signal = UNLOAD_PROP_SET;
- dir = IN;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "scope";
- type = "string";
- };
-};
-
-event = {
- signal = CONF_PROP_SET;
- dir = IN;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "scope";
- type = "string";
- };
- param = {
- name = "apcName";
- type = "string";
- };
-};
-
-event = {
- signal = PROP_SET_LOADED;
- dir = OUT;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "result";
- type = "TPAResult";
- };
-};
-
-event = {
- signal = PROP_SET_UNLOADED;
- dir = OUT;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "result";
- type = "TPAResult";
- };
-};
-
-event = {
- signal = PROP_SET_CONF;
- dir = OUT;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "apcName";
- type = "string";
- };
- param = {
- name = "result";
- type = "TPAResult";
- };
-};
-
-event = {
- signal = REGISTER_SCOPE;
- dir = IN;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "scope";
- type = "string";
- };
- param = {
- name = "type";
- type = "string";
- };
- param = {
- name = "category";
- type = "LOFAR::GCF::Common::TPSCategory";
- };
-};
-
-event = {
- signal = UNREGISTER_SCOPE;
- dir = IN;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "scope";
- type = "string";
- };
-};
-
-event = {
- signal = SCOPE_REGISTERED;
- dir = OUT;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "result";
- type = "TPAResult";
- };
-};
-
-event = {
- signal = SCOPE_UNREGISTERED;
- dir = OUT;
- param = {
- name = "result";
- type = "TPAResult";
- };
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
-};
-
-event = {
- signal = LINK_PROP_SET;
- dir = OUT;
- param = {
- name = "scope";
- type = "string";
- };
-};
-
-event = {
- signal = UNLINK_PROP_SET;
- dir = OUT;
- param = {
- name = "scope";
- type = "string";
- };
-};
-
-event = {
- signal = PROP_SET_LINKED;
- dir = IN;
- param = {
- name = "scope";
- type = "string";
- };
- param = {
- name = "result";
- type = "TPAResult";
- };
-};
-
-event = {
- signal = PROP_SET_UNLINKED;
- dir = IN;
- param = {
- name = "scope";
- type = "string";
- };
- param = {
- name = "result";
- type = "TPAResult";
- };
-};
-
-event = {
- signal = PROP_SET_GONE;
- dir = OUT;
- param = {
- name = scope;
- type = string;
- };
-};
diff --git a/MAC/GCF/Protocols/src/PI_Protocol.prot b/MAC/GCF/Protocols/src/PI_Protocol.prot
deleted file mode 100644
index 6413f252ff4b7240194c8613c0a46b8808b4d2b7..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/src/PI_Protocol.prot
+++ /dev/null
@@ -1,215 +0,0 @@
-//
-// Protocol definition for the RTC-PMLlight/Property Interface(MAC/GCF)
-//
-autogen definitions protocol;
-
-description = "Protocol definition for the RTC-PMLlight/Property Interface(MAC/GCF)";
-prefix = "PI"; // for the signal names
-id = "(LOFAR::GCF::TM::F_GCF_PROTOCOL + 1)";
-// specify extra include files
-// e.g.
-//include = '<sys/time.h>';
-include = '<GCF/GCF_PValue.h>';
-include = '<GCF/GCF_Defines.h>';
-
-prelude = << PRELUDE_END
-
-enum TPIResult
-{
- PI_NO_ERROR,
- PI_UNKNOWN_ERROR,
- PI_WRONG_STATE,
- PI_PS_GONE,
- PI_MISSING_PROPS,
- PI_PROP_SET_NOT_EXISTS,
- PI_PROP_SET_ALREADY_EXISTS,
- PI_DPTYPE_UNKNOWN,
- PI_INTERNAL_ERROR,
- PI_PA_INTERNAL_ERROR,
- PI_PA_NOTCONNECTED,
- PI_PROP_NOT_VALID,
- PI_EMPTY_SCOPE,
- PI_MACTYPE_UNKNOWN,
-};
-
-class PValue : public GCF::TM::GCFTransportable
-{
- public:
- PValue() : _pValue(0), _unpacked(false) {};
- PValue(const LOFAR::GCF::Common::GCFPValue& value) : _pValue(&value), _unpacked(false) {};
-
- virtual ~PValue()
- {
- if (_unpacked) delete _pValue;
- }
-
- unsigned int pack(char* buffer)
- {
- assert(_pValue);
- return _pValue->pack(buffer);
- }
- unsigned int unpack(char* buffer)
- {
- assert(!_pValue);
- _unpacked = true;
- _pValue = LOFAR::GCF::Common::GCFPValue::unpackValue(buffer);
- return _pValue->getSize();
- }
- unsigned int getSize()
- {
- assert(_pValue);
- return _pValue->getSize();
- }
-
- const LOFAR::GCF::Common::GCFPValue* _pValue;
-
- private:
- bool _unpacked;
-};
-PRELUDE_END;
-
-// An "event" has a "signal" and a "dir" (direction)
-// and zero or more "param"s.
-// "dir" can be one of "IN" or "OUT".
-// A "param" has a "name" and a "type".
-//
-
-event = {
- signal = REGISTER_SCOPE;
- dir = IN;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "scope";
- type = "string";
- };
- param = {
- name = "type";
- type = "string";
- };
- param = {
- name = "category";
- type = "LOFAR::GCF::Common::TPSCategory";
- };
-};
-
-event = {
- signal = UNREGISTER_SCOPE;
- dir = IN;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "scope";
- type = "string";
- };
-};
-
-event = {
- signal = SCOPE_REGISTERED;
- dir = OUT;
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
- param = {
- name = "result";
- type = "TPIResult";
- };
-};
-
-event = {
- signal = SCOPE_UNREGISTERED;
- dir = OUT;
- param = {
- name = "result";
- type = "TPIResult";
- };
- param = {
- name = "seqnr";
- type = "unsigned short";
- };
-};
-
-event = {
- signal = LINK_PROP_SET;
- dir = OUT;
- param = {
- name = "scope";
- type = "string";
- };
-};
-
-event = {
- signal = UNLINK_PROP_SET;
- dir = OUT;
- param = {
- name = "scope";
- type = "string";
- };
-};
-
-event = {
- signal = PROP_SET_LINKED;
- dir = IN;
- param = {
- name = "result";
- type = "TPIResult";
- };
- param = {
- name = "scope";
- type = "string";
- };
- param = {
- name = "propList";
- type = "string";
- };
-};
-
-event = {
- signal = PROP_SET_UNLINKED;
- dir = IN;
- param = {
- name = "result";
- type = "TPIResult";
- };
- param = {
- name = "scope";
- type = "string";
- };
-};
-
-event = {
- signal = VALUE_SET;
- dir = IN;
- param = {
- name = "name";
- type = "string";
- };
- param = {
- name = "value";
- type = "PValue";
- userdefined;
- };
-};
-
-event = {
- signal = VALUE_CHANGED;
- dir = OUT;
- param = {
- name = "scopeLength";
- type = "unsigned short";
- };
- param = {
- name = "name";
- type = "string";
- };
- param = {
- name = "value";
- type = "PValue";
- userdefined;
- };
-};
\ No newline at end of file
diff --git a/MAC/GCF/Protocols/src/gcf-pi.conf.in b/MAC/GCF/Protocols/src/gcf-pi.conf.in
deleted file mode 100644
index 299b72a3c1b31a8e512fb8849aad1b3dcc82a073..0000000000000000000000000000000000000000
--- a/MAC/GCF/Protocols/src/gcf-pi.conf.in
+++ /dev/null
@@ -1,6 +0,0 @@
-mac.top.GCF-PI-RTC.client.remoteservice=GCF-PA:provider
-mac.top.GCF-PI-CEP.client.remoteservice=GCF-PA:provider
-mac.ns.GCF-PI.rtc-provider.type=TCP
-mac.ns.GCF-PI.cep-provider.type=TCP
-mac.ns.GCF-PI.cep-provider.host=lofar35
-mac.ns.GCF-PI.cep-provider.port=23002