Index: /ossiedev/trunk/system/standardInterfaces/python/generatepythonbindings.py =================================================================== --- /ossiedev/trunk/system/standardInterfaces/python/generatepythonbindings.py (revision 7998) +++ /ossiedev/trunk/system/standardInterfaces/python/generatepythonbindings.py (revision 8032) @@ -16,5 +16,4 @@ 'complexLong.idl', 'Radio_Control.idl', - 'RadioMetaData.idl', 'FM_Control.idl', 'soundControl.idl', @@ -24,6 +23,5 @@ for f in idl_files: - cmd = 'omniidl -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfaces -Wbextern=PortTypes:ossie.cf -Wbextern=cf:ossie.cf ../' + f - #cmd = 'omniidl -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfaces -Wbinline ../' + f + cmd = 'omniidl -bpython -I/usr/local/include -Wbpackage=ossie.standardinterfaces -Wbinline ../' + f print cmd os.system(cmd) Index: /ossiedev/trunk/system/standardInterfaces/Doxyfile =================================================================== --- /ossiedev/trunk/system/standardInterfaces/Doxyfile (revision 7998) +++ /ossiedev/trunk/system/standardInterfaces/Doxyfile (revision 8032) @@ -472,5 +472,5 @@ # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = standardIdl.pp.idl RadioMetaData.osi.idl +EXCLUDE = standardIdl.pp.idl # The EXCLUDE_SYMLINKS tag can be used select whether or not files or @@ -512,5 +512,5 @@ # the \image command). -IMAGE_PATH = img +IMAGE_PATH = # The INPUT_FILTER tag can be used to specify a program that doxygen should @@ -783,5 +783,5 @@ # higher quality PDF documentation. -USE_PDFLATEX = YES +USE_PDFLATEX = NO # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. Index: /ossiedev/trunk/system/standardInterfaces/documentation.txt =================================================================== --- /ossiedev/trunk/system/standardInterfaces/documentation.txt (revision 7998) +++ /ossiedev/trunk/system/standardInterfaces/documentation.txt (revision 8032) @@ -24,90 +24,4 @@ \section description Basic description -The StandardInterfaces library assists in rapid component development by -providing a list of common interfaces for radio development. The interfaces -are written in the Interface Description Language (IDL), and the port -implementations are implemented in C++. Python bindings are also available. - -\subsection cppexample C++ Code Example - -\code -// MyComponent.h - -#include "standardinterfaces/complexShort_u.h" -#include "standardinterfaces/realChar_p.h" - -class MyComponent_i : public virtual Resource_impl -{ - public: - // ... - - private: - // list components provides and uses ports - standardInterfaces_i::realChar_p *bitsInPort; - standardInterfaces_i::complexShort_u *symbolsOutPort; - standardInterfaces::MetaData *metadata; -}; -\endcode - -And here is an example of the resulting source file - -\code -// MyComponent.cpp - -// Constructor -MyComponent_i::MyComponent_i() { - // Create the ports - bitsInPort = new standardInterfaces_i::realChar_p("bitsIn"); - symbolsOutPort = new standardInterfaces_i::complexShort_u("symbolsOut"); -} - -// Worker method -void MyComponent_i::ProcessData() -{ - PortTypes::CharSequence * bits_in; - PortTypes::ShortSequence I_out, Q_out; - - while (continue_processing) { - // Get data from port - bitsInPort->getData(bits_in, metadata); - - // Process data here... - unsigned int N = bits_in->length(); - I_out.length(N); - Q_out.length(N); - for (unsigned int i=0; ibufferEmptied(); - - // Push output data - symbolsOutPort->(I_out, Q_out, *metadata); -} -\endcode - -Note that the MetaData object is optional. If the component does not use the -MetaData interface the components would invoke the pushPacket() and getData() -methods without the last argument. The figure below depicts the flow of data -through the ports between components. - -\image latex example_complexShortMetaData.eps "complexShort interface with MetaData" width=0.9\textwidth -\image html example_complexShortMetaData.png "complexShort interface with MetaData" - -\section radiometadata Radio Meta Data -The table below describes the meta data associated with each CORBA packet. - - - - - - - - - - -
NameDescriptionType/Range
mod_scheme Scheme used to modulate the data UNKNOWN, PSK, DPSK, PAM, FSK, QAM
M Number of symbols in mod_scheme constellation unsigned long int
sampling_frequency Frequency (Hz) at which the data are sampled float
carrier_frequency Frequency (Hz) for which the signal is modulated float
signal_bandwidth Bandwidth (Hz) of the signal float
signal_strength Nominal strength of signal (dB) float
eom End-of-message flag boolean
\section installation Installation Index: /ossiedev/trunk/system/standardInterfaces/realChar_p.cpp =================================================================== --- /ossiedev/trunk/system/standardInterfaces/realChar_p.cpp (revision 7998) +++ /ossiedev/trunk/system/standardInterfaces/realChar_p.cpp (revision 8032) @@ -22,5 +22,5 @@ #include -#include + #include @@ -33,8 +33,4 @@ PortTypes::CharSequence a; I_buf.assign(bufferLength, a); - - // Initialize MetaData - InitializeMetaData( metadata ); - metadata_buf.assign(bufferLength, metadata); ready_for_input = new omni_semaphore(bufferLength); @@ -60,16 +56,4 @@ } -void standardInterfaces_i::realChar_p::getData( - PortTypes::CharSequence* &I, - standardInterfaces::MetaData* &packet_data -) -{ - data_ready->wait(); - - I = &I_buf[rdPtr]; - packet_data = &metadata_buf[rdPtr]; - rdPtr = ++rdPtr % bufferLength; -} - void standardInterfaces_i::realChar_p::getData(PortTypes::CharSequence* &I) { @@ -90,35 +74,11 @@ } -void realChar::providesPort::pushPacket( - const PortTypes::CharSequence &I) +void realChar::providesPort::pushPacket(const PortTypes::CharSequence &I) { base->ready_for_input->wait(); base->I_buf[base->wrPtr] = I; - - // Create blank metadata object and add it to the buffer - standardInterfaces::MetaData metadata; - InitializeMetaData( metadata ); - (base->metadata_buf)[base->wrPtr] = metadata; - base->wrPtr= ++base->wrPtr % base->bufferLength; base->data_ready->post(); } - -void realChar::providesPort::pushPacketMetaData( - const PortTypes::CharSequence &I, - const standardInterfaces::MetaData &packet_data) -{ - base->ready_for_input->wait(); - - base->I_buf[base->wrPtr] = I; - - // Deep copy meta data to complexShort_p base and add it to the buffer - base->metadata = packet_data; - (base->metadata_buf)[base->wrPtr] = packet_data; - - base->wrPtr= ++base->wrPtr % base->bufferLength; - - base->data_ready->post(); -} Index: /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/realChar_p.h =================================================================== --- /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/realChar_p.h (revision 7993) +++ /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/realChar_p.h (revision 8032) @@ -28,5 +28,4 @@ #include -#include "standardinterfaces/RadioMetaData_impl.h" namespace realChar { @@ -44,11 +43,5 @@ CORBA::Object_ptr getPort(const char* portName); - void getData( - PortTypes::CharSequence* &I); - - void getData( - PortTypes::CharSequence* &I, - standardInterfaces::MetaData* &packet_data); - + void getData(PortTypes::CharSequence* &I); void bufferEmptied(); @@ -68,12 +61,8 @@ unsigned int wrPtr; std::vector I_buf; - std::vector metadata_buf; // Semaphores for synchronization omni_semaphore *data_ready; // Ready to process data omni_semaphore *ready_for_input; // Ready to receive more data - - // packet meta data - standardInterfaces::MetaData metadata; }; @@ -90,8 +79,4 @@ void pushPacket(const PortTypes::CharSequence &I); - void pushPacketMetaData( - const PortTypes::CharSequence &I, - const standardInterfaces::MetaData &packet_data); - private: standardInterfaces_i::realChar_p* base; Index: /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/realChar_u.h =================================================================== --- /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/realChar_u.h (revision 7993) +++ /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/realChar_u.h (revision 8032) @@ -37,5 +37,4 @@ #include -#include "standardinterfaces/RadioMetaData_impl.h" // Forward declaration @@ -60,8 +59,4 @@ void pushPacket(const PortTypes::CharSequence &I); - void pushPacket( - const PortTypes::CharSequence &I, - const standardInterfaces::MetaData &packet_data); - private: realChar_u(); @@ -75,7 +70,4 @@ std::vector dest_ports; omni_mutex port_mutex; - - /// Data to be pushed for each packet - standardInterfaces::MetaData metadata; }; Index: /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/complexShort_p.h =================================================================== --- /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/complexShort_p.h (revision 7993) +++ /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/complexShort_p.h (revision 8032) @@ -28,5 +28,4 @@ #include -#include "standardinterfaces/RadioMetaData_impl.h" namespace complexShort { @@ -45,13 +44,5 @@ CORBA::Object_ptr getPort(const char* portName); - void getData( - PortTypes::ShortSequence* &I, - PortTypes::ShortSequence* &Q); - - void getData( - PortTypes::ShortSequence* &I, - PortTypes::ShortSequence* &Q, - standardInterfaces::MetaData* &packet_data); - + void getData(PortTypes::ShortSequence* &I, PortTypes::ShortSequence* &Q); void bufferEmptied(); @@ -72,12 +63,8 @@ std::vector I_buf; std::vector Q_buf; - std::vector metadata_buf; // Semaphores for synchronization omni_semaphore *data_ready; // Ready to process data omni_semaphore *ready_for_input; // Ready to receive more data - - // packet meta data - standardInterfaces::MetaData metadata; }; @@ -92,12 +79,5 @@ ~providesPort(); - void pushPacket( - const PortTypes::ShortSequence &I, - const PortTypes::ShortSequence &Q); - - void pushPacketMetaData( - const PortTypes::ShortSequence &I, - const PortTypes::ShortSequence &Q, - const standardInterfaces::MetaData &packet_data); + void pushPacket(const PortTypes::ShortSequence &I, const PortTypes::ShortSequence &Q); private: Index: /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/.ignore =================================================================== --- /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/.ignore (revision 7993) +++ /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/.ignore (revision 8032) @@ -10,6 +10,4 @@ complexFloat.h Radio_Control.h -RadioMetaData.h -soundControl.h stereoSound.h realLong.h Index: /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/complexShort_u.h =================================================================== --- /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/complexShort_u.h (revision 7993) +++ /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/complexShort_u.h (revision 8032) @@ -37,5 +37,4 @@ #include -#include "standardinterfaces/RadioMetaData_impl.h" // Forward declaration @@ -58,12 +57,5 @@ CORBA::Object_ptr getPort(const char* portName); - void pushPacket( - const PortTypes::ShortSequence &I, - const PortTypes::ShortSequence &Q); - - void pushPacket( - const PortTypes::ShortSequence &I, - const PortTypes::ShortSequence &Q, - const standardInterfaces::MetaData &packet_data); + void pushPacket(const PortTypes::ShortSequence &I, const PortTypes::ShortSequence &Q); private: @@ -78,7 +70,4 @@ std::vector dest_ports; omni_mutex port_mutex; - - /// Data to be pushed for each packet - standardInterfaces::MetaData metadata; }; Index: /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/Makefile.am =================================================================== --- /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/Makefile.am (revision 7993) +++ /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/Makefile.am (revision 8032) @@ -12,6 +12,4 @@ complexDouble_u.h complexDouble_p.h \ Radio_Control_u.h Radio_Control_p.h \ - RadioMetaData_impl.h \ - RadioMetaData_u.h RadioMetaData_p.h \ Resource_u.h Index: /siedev/trunk/system/standardInterfaces/include/standardinterfaces/RadioMetaData_p.h =================================================================== --- /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/RadioMetaData_p.h (revision 7985) +++ (revision ) @@ -1,90 +1,0 @@ -/**************************************************************************** - -Copyright 2006, Virginia Polytechnic Institute and State University - -This file is part of the OSSIE Core Framework. - -OSSIE Core Framework is free software; you can redistribute it and/or modify -it under the terms of the Lesser GNU General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -OSSIE Core Framework 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 -Lesser GNU General Public License for more details. - -You should have received a copy of the Lesser GNU General Public License -along with OSSIE Core Framework; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -****************************************************************************/ - -#ifndef RADIOMETADATA_P_H -#define RADIOMETADATA_P_H - -#include -#include - -#include -#include "standardinterfaces/RadioMetaData_impl.h" - -namespace RadioMetaData { - class providesPort; -} - -namespace standardInterfaces_i { - class RadioMetaData_p { - friend class RadioMetaData::providesPort; - - public: - RadioMetaData_p(const char* portName, unsigned int bufLen = 5); - RadioMetaData_p(const char* portName, const char* domainName, unsigned int bufLen = 5); - ~RadioMetaData_p(); - - CORBA::Object_ptr getPort(const char* portName); - - void getMetaData(standardInterfaces::MetaData* &packet_data); - - void bufferEmptied() { ready_for_input->post(); }; - - private: - RadioMetaData_p(); - RadioMetaData_p(const RadioMetaData_p &); - - std::string portName; - - // Provides port - RadioMetaData::providesPort *data_servant; - standardInterfaces::RadioMetaData_var data_servant_var; - - // Buffer storage - unsigned int bufferLength; - unsigned int rdPtr; - unsigned int wrPtr; - std::vector metadata_buf; - - // Semaphores for synchronization - omni_semaphore *data_ready; // Ready to process data - omni_semaphore *ready_for_input; // Ready to receive more data - - }; - -} - -namespace RadioMetaData { - - class providesPort : public POA_standardInterfaces::RadioMetaData { - public: - providesPort(standardInterfaces_i::RadioMetaData_p* _base); - ~providesPort(); - - void pushMetaData(const standardInterfaces::MetaData &packet_data); - - private: - standardInterfaces_i::RadioMetaData_p* base; - }; -} - - -#endif Index: /siedev/trunk/system/standardInterfaces/include/standardinterfaces/RadioMetaData_impl.h =================================================================== --- /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/RadioMetaData_impl.h (revision 7987) +++ (revision ) @@ -1,41 +1,0 @@ -/**************************************************************************** - -Copyright 2006, Virginia Polytechnic Institute and State University - -This file is part of the OSSIE Core Framework. - -OSSIE Core Framework is free software; you can redistribute it and/or modify -it under the terms of the Lesser GNU General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -OSSIE Core Framework 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 -Lesser GNU General Public License for more details. - -You should have received a copy of the Lesser GNU General Public License -along with OSSIE Core Framework; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -****************************************************************************/ - -#ifndef __RADIOMETADATA_IMPL_H__ -#define __RADIOMETADATA_IMPL_H__ - -#include -#include - -#include "standardinterfaces/RadioMetaData.h" - -namespace standardInterfaces { - -/// \brief Initialize a MetaData CORBA object -void InitializeMetaData( MetaData &m ); - -/// \brief Print MetaData information to screen -void PrintMetaData( MetaData &m ); - -} - -#endif Index: /siedev/trunk/system/standardInterfaces/include/standardinterfaces/RadioMetaData_u.h =================================================================== --- /ossiedev/trunk/system/standardInterfaces/include/standardinterfaces/RadioMetaData_u.h (revision 7986) +++ (revision ) @@ -1,114 +1,0 @@ -/**************************************************************************** - -Copyright 2006, Virginia Polytechnic Institute and State University - -This file is part of the OSSIE Core Framework. - -OSSIE Core Framework is free software; you can redistribute it and/or modify -it under the terms of the Lesser GNU General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -OSSIE Core Framework 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 -Lesser GNU General Public License for more details. - -You should have received a copy of the Lesser GNU General Public License -along with OSSIE Core Framework; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -****************************************************************************/ - -#ifndef RADIOMETADATA_U_H -#define RADIOMETADATA_U_H - -#include -#include - -#ifdef HAVE_OMNIORB4 -#include "omniORB4/CORBA.h" -#endif - -#include - -#include -#include - -#include "standardinterfaces/RadioMetaData.h" - -// Forward declaration -namespace RadioMetaData { - - class usesPort; - class ConnectionInfo; -} - -namespace standardInterfaces_i { - - class RadioMetaData_u { - friend class RadioMetaData::usesPort; - - public: - RadioMetaData_u(const char* portName); - RadioMetaData_u(const char* portName, const char* domainName); - ~RadioMetaData_u(); - - CORBA::Object_ptr getPort(const char* portName); - - void pushMetaData(const standardInterfaces::MetaData &packet_data); - - private: - /// Disallow default constructor - RadioMetaData_u(); - - /// Disallow copy constructor - RadioMetaData_u(const RadioMetaData_u &); - - std::string portName; - - // Uses port - RadioMetaData::usesPort *data_servant; - CF::Port_var data_servant_var; - std::vector dest_ports; - omni_mutex port_mutex; - - }; - -} - -namespace RadioMetaData { - - class usesPort : public virtual POA_CF::Port { - public: - usesPort(standardInterfaces_i::RadioMetaData_u *_base); - ~usesPort(); - - void connectPort(CORBA::Object_ptr connection, const char* connectionID); - void disconnectPort(const char* connectionID); - - private: - standardInterfaces_i::RadioMetaData_u *base; - }; - - - class ConnectionInfo - { - public: - ConnectionInfo(standardInterfaces::RadioMetaData_ptr _port, const char* _ID) : port_obj( _port), identifier(_ID) { }; - ConnectionInfo(const ConnectionInfo & c) { port_obj = c.port_obj; identifier = c.identifier;}; - - void setPort(standardInterfaces::RadioMetaData_ptr _port) {port_obj = _port; }; - const char *getID() {return identifier.c_str(); }; - - standardInterfaces::RadioMetaData_var port_obj; - - private: - ConnectionInfo(); // No default constructor - - std::string identifier; - }; - -} - -#endif Index: /ossiedev/trunk/system/standardInterfaces/realChar_u.cpp =================================================================== --- /ossiedev/trunk/system/standardInterfaces/realChar_u.cpp (revision 7998) +++ /ossiedev/trunk/system/standardInterfaces/realChar_u.cpp (revision 8032) @@ -34,7 +34,5 @@ data_servant = new realChar::usesPort(this); data_servant_var = data_servant->_this(); - - // initialize meta data - InitializeMetaData( metadata ); + } @@ -52,7 +50,4 @@ orb.bind_object_to_name((CORBA::Object_ptr) data_servant_var, objName.c_str()); - - // initialize meta data - InitializeMetaData( metadata ); } @@ -70,25 +65,11 @@ } -void standardInterfaces_i::realChar_u::pushPacket( - const PortTypes::CharSequence &I, - const standardInterfaces::MetaData &packet_data) -{ - // update packet meta data - metadata = packet_data; - - omni_mutex_lock l(port_mutex); - for (unsigned int i = 0; i < dest_ports.size(); ++i) { - dest_ports[i].port_obj->pushPacketMetaData(I,metadata); - } -} - void standardInterfaces_i::realChar_u::pushPacket(const PortTypes::CharSequence &I) { omni_mutex_lock l(port_mutex); for (unsigned int i = 0; i < dest_ports.size(); ++i) { - dest_ports[i].port_obj->pushPacket(I); + dest_ports[i].port_obj->pushPacket(I); } } - realChar::usesPort::usesPort(standardInterfaces_i::realChar_u *_base) : base(_base) Index: /ossiedev/trunk/system/standardInterfaces/complexShort_p.cpp =================================================================== --- /ossiedev/trunk/system/standardInterfaces/complexShort_p.cpp (revision 7998) +++ /ossiedev/trunk/system/standardInterfaces/complexShort_p.cpp (revision 8032) @@ -33,17 +33,10 @@ data_servant_var = data_servant->_this(); - // Initialize short sequence buffers with default PortTypes::ShortSequence a; I_buf.assign(bufferLength, a); Q_buf.assign(bufferLength, a); - // Initialize MetaData - InitializeMetaData( metadata ); - metadata_buf.assign(bufferLength, metadata); - ready_for_input = new omni_semaphore(bufferLength); data_ready = new omni_semaphore(0); - - } @@ -58,8 +51,4 @@ I_buf.assign(bufferLength, a); Q_buf.assign(bufferLength, a); - - // Initialize MetaData - InitializeMetaData( metadata ); - metadata_buf.assign(bufferLength, metadata); ready_for_input = new omni_semaphore(bufferLength); @@ -93,18 +82,4 @@ -void standardInterfaces_i::complexShort_p::getData( - PortTypes::ShortSequence* &I, - PortTypes::ShortSequence* &Q, - standardInterfaces::MetaData* &packet_data) -{ - data_ready->wait(); - - I = &I_buf[rdPtr]; - Q = &Q_buf[rdPtr]; - packet_data = &metadata_buf[rdPtr]; - rdPtr = (++rdPtr) % bufferLength; -} - - void standardInterfaces_i::complexShort_p::getData(PortTypes::ShortSequence* &I, PortTypes::ShortSequence* &Q) { @@ -126,7 +101,5 @@ } -void complexShort::providesPort::pushPacket( - const PortTypes::ShortSequence &I, - const PortTypes::ShortSequence &Q) +void complexShort::providesPort::pushPacket(const PortTypes::ShortSequence &I, const PortTypes::ShortSequence &Q) { base->ready_for_input->wait(); @@ -134,31 +107,7 @@ (base->I_buf)[base->wrPtr] = I; (base->Q_buf)[base->wrPtr] = Q; - - // Create blank metadata object and add it to buffer - standardInterfaces::MetaData metadata; - InitializeMetaData( metadata ); - (base->metadata_buf)[base->wrPtr] = metadata; - base->wrPtr = (++(base->wrPtr)) % base->bufferLength; base->data_ready->post(); + } - -void complexShort::providesPort::pushPacketMetaData( - const PortTypes::ShortSequence &I, - const PortTypes::ShortSequence &Q, - const standardInterfaces::MetaData &packet_data) -{ - base->ready_for_input->wait(); - - (base->I_buf)[base->wrPtr] = I; - (base->Q_buf)[base->wrPtr] = Q; - - // Deep copy meta data to complexShort_p base and add it to the buffer - base->metadata = packet_data; - (base->metadata_buf)[base->wrPtr] = packet_data; - - base->wrPtr = (++(base->wrPtr)) % base->bufferLength; - - base->data_ready->post(); -} Index: /ossiedev/trunk/system/standardInterfaces/realChar.idl =================================================================== --- /ossiedev/trunk/system/standardInterfaces/realChar.idl (revision 7993) +++ /ossiedev/trunk/system/standardInterfaces/realChar.idl (revision 8032) @@ -24,5 +24,4 @@ #include "ossie/PortTypes.idl" -#include "RadioMetaData.idl" module standardInterfaces { @@ -30,8 +29,4 @@ interface realChar { void pushPacket(in PortTypes::CharSequence I); - - void pushPacketMetaData( - in PortTypes::CharSequence I, - in MetaData packet_data); }; }; Index: /ossiedev/trunk/system/standardInterfaces/complexShort_u.cpp =================================================================== --- /ossiedev/trunk/system/standardInterfaces/complexShort_u.cpp (revision 7998) +++ /ossiedev/trunk/system/standardInterfaces/complexShort_u.cpp (revision 8032) @@ -34,7 +34,5 @@ data_servant = new complexShort::usesPort(this); data_servant_var = data_servant->_this(); - - // initialize meta data - InitializeMetaData( metadata ); + } @@ -52,7 +50,4 @@ orb.bind_object_to_name((CORBA::Object_ptr) data_servant_var, objName.c_str()); - - // initialize meta data - InitializeMetaData( metadata ); } @@ -70,22 +65,5 @@ } - -void standardInterfaces_i::complexShort_u::pushPacket( - const PortTypes::ShortSequence &I, - const PortTypes::ShortSequence &Q, - const standardInterfaces::MetaData &packet_data) -{ - // update packet meta data - metadata = packet_data; - - omni_mutex_lock l(port_mutex); - for (unsigned int i = 0; i < dest_ports.size(); ++i) { - dest_ports[i].port_obj->pushPacketMetaData(I, Q, metadata); - } -} - -void standardInterfaces_i::complexShort_u::pushPacket( - const PortTypes::ShortSequence &I, - const PortTypes::ShortSequence &Q) +void standardInterfaces_i::complexShort_u::pushPacket(const PortTypes::ShortSequence &I, const PortTypes::ShortSequence &Q) { omni_mutex_lock l(port_mutex); Index: /ossiedev/trunk/system/standardInterfaces/complexShort.idl =================================================================== --- /ossiedev/trunk/system/standardInterfaces/complexShort.idl (revision 7998) +++ /ossiedev/trunk/system/standardInterfaces/complexShort.idl (revision 8032) @@ -24,17 +24,9 @@ #include "ossie/PortTypes.idl" -#include "RadioMetaData.idl" module standardInterfaces { interface complexShort { - void pushPacket( - in PortTypes::ShortSequence I, - in PortTypes::ShortSequence Q); - - void pushPacketMetaData( - in PortTypes::ShortSequence I, - in PortTypes::ShortSequence Q, - in MetaData packet_data); + void pushPacket(in PortTypes::ShortSequence I, in PortTypes::ShortSequence Q); }; Index: /ossiedev/trunk/system/standardInterfaces/genDocs.py =================================================================== --- /ossiedev/trunk/system/standardInterfaces/genDocs.py (revision 7998) +++ /ossiedev/trunk/system/standardInterfaces/genDocs.py (revision 8032) @@ -3,28 +3,6 @@ import os -def convertEPStoPNG(imgfilename): - '''converts .eps file to .png''' - # Try using command-line "convert" - epsfilename = imgfilename - pngfilename = os.path.splitext(imgfilename)[0] + '.png' - if os.system('convert ' + epsfilename + ' -resize 70% ' + pngfilename) != 0: - print "could not convert " + epsfilename + " using ImageMagick" - return False - return True - -def convertDirectoryEPStoPNG(imgdir): - '''converts .eps files to .png for a given directory''' - for i in os.listdir(imgdir): - imgfile = os.path.splitext(i) - if imgfile[1].lower() == ".eps": - print "converting " + imgdir + i + "..." - if convertEPStoPNG(imgdir + i) != True: - print "error" - if __name__ == "__main__": print "generating documentation..." - - # convert all .eps files in directory to .png - convertDirectoryEPStoPNG('img/') # run doxygen on default Doxyfile Index: /ossiedev/trunk/system/standardInterfaces/Makefile.am =================================================================== --- /ossiedev/trunk/system/standardInterfaces/Makefile.am (revision 8016) +++ /ossiedev/trunk/system/standardInterfaces/Makefile.am (revision 8032) @@ -24,6 +24,5 @@ soundControlSK.cpp \ stereoSoundSK.cpp \ - Radio_ControlSK.cpp \ - RadioMetaDataSK.cpp + Radio_ControlSK.cpp nodist_pkginclude_HEADERS = \ @@ -39,7 +38,6 @@ complexLong.h \ FM_Control.h \ - soundControl.h \ + soundControl.h \ stereoSound.h \ - RadioMetaData.h \ Radio_Control.h @@ -63,6 +61,5 @@ soundControl.idl \ stereoSound.idl \ - sampleRateConvertorControl.idl \ - RadioMetaData.idl + sampleRateConvertorControl.idl pkgconfigdir = $(libdir)/pkgconfig @@ -84,6 +81,4 @@ complexLong_u.cpp complexLong_p.cpp \ Radio_Control_u.cpp Radio_Control_p.cpp \ - RadioMetaData.cpp \ - RadioMetaData_u.cpp RadioMetaData_p.cpp \ Resource_u.cpp @@ -99,6 +94,5 @@ complexCharSK.cpp \ complexLongSK.cpp \ - Radio_ControlSK.cpp \ - RadioMetaDataSK.cpp + Radio_ControlSK.cpp libstandardInterfaces_la_LDFLAGS = -version-info 0:6:0 @@ -116,5 +110,4 @@ complexLong.h complexLongSK.cpp \ Radio_Control.h Radio_ControlSK.cpp \ - RadioMetaData.h RadioMetaDataSK.cpp \ standardIdl.pp.idl Index: /siedev/trunk/system/standardInterfaces/RadioMetaData.cpp =================================================================== --- /ossiedev/trunk/system/standardInterfaces/RadioMetaData.cpp (revision 7992) +++ (revision ) @@ -1,86 +1,0 @@ -/**************************************************************************** - -Copyright 2006, Virginia Polytechnic Institute and State University - -This file is part of the OSSIE Core Framework. - -OSSIE Core Framework is free software; you can redistribute it and/or modify -it under the terms of the Lesser GNU General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -OSSIE Core Framework 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 -Lesser GNU General Public License for more details. - -You should have received a copy of the Lesser GNU General Public License -along with OSSIE Core Framework; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -****************************************************************************/ - -#include - -#include - -#include "standardinterfaces/RadioMetaData_impl.h" -#include "ossie/debug.h" - -namespace standardInterfaces { - -void InitializeMetaData( MetaData &m ) { - // initialize meta data - m.modulation_scheme.scheme = standardInterfaces::ModulationScheme::UNKNOWN; - m.modulation_scheme.M = 0; - m.packet_id = 0; - m.sampling_frequency = 0; - m.carrier_frequency = 0; - m.signal_bandwidth = 0; - m.signal_strength = 0; - m.eom = false; - m.src_id = 0; - m.dst_id = 0; - m.app_id = 0; - m.port_id = 0; - m.packet_type = 0; -} - -void PrintMetaData( MetaData &m ) { - switch (m.modulation_scheme.scheme) { - case standardInterfaces::ModulationScheme::UNKNOWN: - std::cout << " Modulation scheme: UNKNOWN" << std::endl; - break; - case standardInterfaces::ModulationScheme::PSK: - std::cout << " Modulation scheme: PSK" << std::endl; - break; - case standardInterfaces::ModulationScheme::DPSK: - std::cout << " Modulation scheme: Differential PSK" << std::endl; - break; - case standardInterfaces::ModulationScheme::FSK: - std::cout << " Modulation scheme: FSK" << std::endl; - break; - case standardInterfaces::ModulationScheme::QAM: - std::cout << " Modulation scheme: QAM" << std::endl; - break; - case standardInterfaces::ModulationScheme::PAM: - std::cout << " Modulation scheme: PAM" << std::endl; - break; - } - - std::cout << " Modulation depth: " << m.modulation_scheme.M << std::endl; - std::cout << " packet id: " << m.packet_id << std::endl; - std::cout << " sampling frequency: " << m.sampling_frequency << std::endl; - std::cout << " carrier frequency: " << m.carrier_frequency << std::endl; - std::cout << " signal bandwidth: " << m.signal_bandwidth << std::endl; - std::cout << " signal strength: " << m.signal_strength << std::endl; - std::cout << " end-of-message flag: " << m.eom << std::endl; - std::cout << " source id: " << m.src_id << std::endl; - std::cout << " destination id: " << m.dst_id << std::endl; - std::cout << " application id: " << m.app_id << std::endl; - std::cout << " port id: " << m.port_id << std::endl; - std::cout << " packet type: " << m.packet_type << std::endl; - -} - -} Index: /siedev/trunk/system/standardInterfaces/RadioMetaData.osi.idl =================================================================== --- /ossiedev/trunk/system/standardInterfaces/RadioMetaData.osi.idl (revision 7989) +++ (revision ) @@ -1,99 +1,0 @@ -/**************************************************************************** - -Copyright 2007 Virginia Polytechnic Institute and State University - -This file is part of the OSSIE Standard Interfaces. - -OSSIE Standard Interfaces are 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. - -OSSIE Standard Interfaces 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 OSSIE Standard Interfaces; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -****************************************************************************/ - - -#include "ossie/PortTypes.idl" - -module standardInterfaces { - - /// Modulation scheme - struct ModulationScheme { - enum mod_scheme { - UNKNOWN, ///< Unknown modulation scheme - PSK, ///< Phase shift keying - DPSK, ///< Differential PSK - PAM, ///< Pulse amplitude modulation - FSK, ///< Frequency shift keying - QAM ///< Quadrature amplitude modulation - } scheme; - unsigned long M; ///< Number of symbols in constellation - }; - - /// \brief Physical layer control - struct Physical { - float sampling_frequency; ///< Sampling frequency (Hz) - float carrier_frequency; ///< Carrier frequency (Hz) - float signal_bandwidth; ///< Real-time signal bandwidth (Hz) - float signal_strength; ///< Signal strength (dB) - ModulationScheme modulation; ///< Modulation scheme for this packet - // pulse shape characteristics - }; - - /// \brief Media Access Control sub-layer - /// Frame structure - struct MediaAccessControl { - unsigned long num_packets; - }; - - /// \brief Logical Link Control sub-layer - /// Packet reception coherence (ACK/NAK), error correction coding, - /// multiplexed protocols, etc. - struct LogicalLinkControl { - // ... - }; - - /// \brief Network layer control - struct Network { - unsigned long source_id; ///< Calling platform address - unsigned long destination_id; ///< Called platform address - unsigned long packet_id; ///< Packet identifier - unsigned long port_id; ///< Destination port identifier - }; - - /// \brief Transport layer - /// TCP, UDP, etc. - struct Transport { - // ... - }; - - /// \brief Meta data for packets - struct MetaData { - Physical phy; - MediaAccessControl mac; - LogicalLinkControl llc; - Network nwk; - Transport tpt; - }; - - /// \brief RadioMetaData interface - /// - /// Because interfaces such as complexShort already push meta data with each - /// packet, adding this interface to a components for describing its data is - /// not necessary. This interface is intended for debugging, configuring - /// properties, and sending control information about received packets. - interface RadioMetaData { - oneway void pushMetaData(in MetaData packet_data); - }; - -}; - Index: /siedev/trunk/system/standardInterfaces/RadioMetaData_p.cpp =================================================================== --- /ossiedev/trunk/system/standardInterfaces/RadioMetaData_p.cpp (revision 7990) +++ (revision ) @@ -1,112 +1,0 @@ -/**************************************************************************** - -Copyright 2006, Virginia Polytechnic Institute and State University - -This file is part of the OSSIE Core Framework. - -OSSIE Core Framework is free software; you can redistribute it and/or modify -it under the terms of the Lesser GNU General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -OSSIE Core Framework 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 -Lesser GNU General Public License for more details. - -You should have received a copy of the Lesser GNU General Public License -along with OSSIE Core Framework; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -****************************************************************************/ - -#include - -#include - -#include - -standardInterfaces_i::RadioMetaData_p::RadioMetaData_p(const char* _name, unsigned int bufLen) : portName(_name), bufferLength(bufLen), rdPtr(0), wrPtr(0) -{ - - data_servant = new RadioMetaData::providesPort(this); - data_servant_var = data_servant->_this(); - - // Initialize MetaData - standardInterfaces::MetaData metadata; - InitializeMetaData( metadata ); - metadata_buf.assign(bufferLength, metadata); - - ready_for_input = new omni_semaphore(bufferLength); - data_ready = new omni_semaphore(0); - - -} - -standardInterfaces_i::RadioMetaData_p::RadioMetaData_p(const char* _name, const char* _domain, unsigned int bufLen) : portName(_name), bufferLength(bufLen), rdPtr(0), wrPtr(0) -{ - ossieSupport::ORB orb; - - data_servant = new RadioMetaData::providesPort(this); - data_servant_var = data_servant->_this(); - - // Initialize MetaData - standardInterfaces::MetaData metadata; - InitializeMetaData( metadata ); - metadata_buf.assign(bufferLength, metadata); - - ready_for_input = new omni_semaphore(bufferLength); - data_ready = new omni_semaphore(0); - - std::string objName; - objName = _domain; - objName += "/"; - objName += _name; - - orb.bind_object_to_name((CORBA::Object_ptr) data_servant_var, objName.c_str()); -} - -standardInterfaces_i::RadioMetaData_p::~RadioMetaData_p() -{ - -} - -CORBA::Object_ptr standardInterfaces_i::RadioMetaData_p::getPort(const char* _portName) -{ - if (portName == _portName) - return CORBA::Object::_duplicate(data_servant_var); - else - return CORBA::Object::_nil(); -} - -void standardInterfaces_i::RadioMetaData_p::getMetaData( - standardInterfaces::MetaData* &packet_data) -{ - data_ready->wait(); - - packet_data = &metadata_buf[rdPtr]; - rdPtr = (++rdPtr) % bufferLength; -} - -RadioMetaData::providesPort::providesPort(standardInterfaces_i::RadioMetaData_p* _base) : base(_base) -{ - -} - -RadioMetaData::providesPort::~providesPort() -{ - -} - -void RadioMetaData::providesPort::pushMetaData( - const standardInterfaces::MetaData &packet_data) -{ - base->ready_for_input->wait(); - - // Deep copy meta data to RadioMetaData_p base and add it to the buffer - (base->metadata_buf)[base->wrPtr] = packet_data; - - base->wrPtr = (++(base->wrPtr)) % base->bufferLength; - - base->data_ready->post(); -} Index: /siedev/trunk/system/standardInterfaces/RadioMetaData_u.cpp =================================================================== --- /ossiedev/trunk/system/standardInterfaces/RadioMetaData_u.cpp (revision 7991) +++ (revision ) @@ -1,118 +1,0 @@ -/**************************************************************************** - -Copyright 2006, Virginia Polytechnic Institute and State University - -This file is part of the OSSIE Core Framework. - -OSSIE Core Framework is free software; you can redistribute it and/or modify -it under the terms of the Lesser GNU General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -OSSIE Core Framework 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 -Lesser GNU General Public License for more details. - -You should have received a copy of the Lesser GNU General Public License -along with OSSIE Core Framework; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -****************************************************************************/ - -#include - -#include - -#include "standardinterfaces/RadioMetaData_u.h" -#include "ossie/debug.h" - -standardInterfaces_i::RadioMetaData_u::RadioMetaData_u(const char* _portName) -{ - portName = _portName; - - data_servant = new RadioMetaData::usesPort(this); - data_servant_var = data_servant->_this(); - -} - -standardInterfaces_i::RadioMetaData_u::RadioMetaData_u(const char* _name, const char* _domain) : portName(_name) -{ - ossieSupport::ORB orb; - - data_servant = new RadioMetaData::usesPort(this); - data_servant_var = data_servant->_this(); - - std::string objName; - objName = _domain; - objName += "/"; - objName += _name; - - orb.bind_object_to_name((CORBA::Object_ptr) data_servant_var, objName.c_str()); -} - -standardInterfaces_i::RadioMetaData_u::~RadioMetaData_u() -{ - -} - -CORBA::Object_ptr standardInterfaces_i::RadioMetaData_u::getPort(const char* _portName) -{ - if (portName == _portName) - return CORBA::Object::_duplicate(data_servant_var); - else - return CORBA::Object::_nil(); -} - - -void standardInterfaces_i::RadioMetaData_u::pushMetaData( - const standardInterfaces::MetaData &packet_data) -{ - omni_mutex_lock l(port_mutex); - for (unsigned int i = 0; i < dest_ports.size(); ++i) { - dest_ports[i].port_obj->pushMetaData(packet_data); - } -} - -RadioMetaData::usesPort::usesPort(standardInterfaces_i::RadioMetaData_u *_base) : base(_base) -{ -} - -RadioMetaData::usesPort::~usesPort() -{ -} - -void RadioMetaData::usesPort::connectPort(CORBA::Object_ptr connection, const char* connectionID) -{ - standardInterfaces::RadioMetaData_ptr p = standardInterfaces::RadioMetaData::_narrow(connection); - if (CORBA::is_nil(p)) { - std::cout << "Print port is not RadioMetaData" << std::endl; - return; - } - - omni_mutex_lock l(base->port_mutex); - for (unsigned int i = 0; i < base->dest_ports.size(); ++i) { - if (strcmp(base->dest_ports[i].getID(), connectionID) == 0) { - base->dest_ports[i].setPort(p); - return; - } - } - - RadioMetaData::ConnectionInfo c(p, connectionID); - base->dest_ports.push_back(c); - -} - -void RadioMetaData::usesPort::disconnectPort(const char* connectionID) -{ - omni_mutex_lock l(base->port_mutex); - for (unsigned int i = 0; i < base->dest_ports.size(); ++i) { - if (strcmp(base->dest_ports[i].getID(), connectionID) == 0) { - base->dest_ports.erase(base->dest_ports.begin() + i); - return; - } - } - - DEBUG(5, StandardInterfaces, "Attempted to disconnect non-existent connection: " << connectionID); - -} Index: /siedev/trunk/system/standardInterfaces/RadioMetaData.idl =================================================================== --- /ossiedev/trunk/system/standardInterfaces/RadioMetaData.idl (revision 7988) +++ (revision ) @@ -1,74 +1,0 @@ -/**************************************************************************** - -Copyright 2007 Virginia Polytechnic Institute and State University - -This file is part of the OSSIE Standard Interfaces. - -OSSIE Standard Interfaces are 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. - -OSSIE Standard Interfaces 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 OSSIE Standard Interfaces; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -****************************************************************************/ - - -#include "ossie/PortTypes.idl" - -module standardInterfaces { - - /// Modulation scheme - struct ModulationScheme { - enum mod_scheme { - UNKNOWN, ///< Unknown modulation scheme - PSK, ///< Phase shift keying - DPSK, ///< Differential PSK - PAM, ///< Pulse amplitude modulation - FSK, ///< Frequency shift keying - QAM ///< Quadrature amplitude modulation - } scheme; - unsigned long M; ///< Number of symbols in constellation - }; - - /// \brief Meta data for packets - struct MetaData { - - /// Modulation scheme used for this packet - ModulationScheme modulation_scheme; - - unsigned long packet_id; ///< Generic packet id number - float sampling_frequency; ///< Sampling frequency (Hz) - float carrier_frequency; ///< Carrier frequency (Hz) - float signal_bandwidth; ///< Real-time signal bandwidth (Hz) - float signal_strength; ///< Signal strength (dB) - boolean eom; ///< End-of-message flag/marker - - unsigned long src_id; ///< Source identifier - unsigned long dst_id; ///< Destination identifier - unsigned long app_id; ///< Application identifier - unsigned long port_id; ///< Port identifier - - unsigned long packet_type; ///< Type of packet to use - }; - - /// \brief RadioMetaData interface - /// - /// Because interfaces such as complexShort already push meta data with each - /// packet, adding this interface to a components for describing its data is - /// not necessary. This interface is intended for debugging, configuring - /// properties, and sending control information about received packets. - interface RadioMetaData { - oneway void pushMetaData(in MetaData packet_data); - }; - -}; -