Changeset 5168

Show
Ignore:
Timestamp:
10/02/07 10:55:00 (6 years ago)
Author:
jgaeddert
Message:

trying to get new packetizers to compile

Location:
experimental/components/Packetizer/trunk/Packetizer-metadata/src
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • experimental/components/Packetizer/trunk/Packetizer-metadata/src/Depacketizer.cpp

    r4832 r5168  
    33Copyright 2006 Virginia Polytechnic Institute and State University 
    44 
    5 This file is part of the OSSIE DepacketizerSimpleBPSK. 
    6  
    7 OSSIE DepacketizerSimpleBPSK is free software; you can redistribute it and/or modify 
     5This file is part of the OSSIE Depacketizer. 
     6 
     7OSSIE Depacketizer is free software; you can redistribute it and/or modify 
    88it under the terms of the GNU General Public License as published by 
    99the Free Software Foundation; either version 2 of the License, or 
    1010(at your option) any later version. 
    1111 
    12 OSSIE DepacketizerSimpleBPSK is distributed in the hope that it will be useful, 
     12OSSIE Depacketizer is distributed in the hope that it will be useful, 
    1313but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1616 
    1717You should have received a copy of the GNU General Public License 
    18 along with OSSIE DepacketizerSimpleBPSK; if not, write to the Free Software 
     18along with OSSIE Depacketizer; if not, write to the Free Software 
    1919Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2020 
    … …  
    2525#include <iostream> 
    2626#include <fstream> 
    27 #include "DepacketizerSimpleBPSK.h" 
     27#include "Depacketizer.h" 
    2828 
    2929#undef LOGGING 
    … …  
    3636#define BIT1 1 
    3737 
    38 DepacketizerSimpleBPSK_i::DepacketizerSimpleBPSK_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
     38Depacketizer_i::Depacketizer_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
    3939{ 
    4040    dataIn = new standardInterfaces_i::realChar_p("bitsIn"); 
    … …  
    5252} 
    5353 
    54 DepacketizerSimpleBPSK_i::~DepacketizerSimpleBPSK_i(void) 
     54Depacketizer_i::~Depacketizer_i(void) 
    5555{    
    5656    delete dataIn; 
    … …  
    5858} 
    5959 
    60 void DepacketizerSimpleBPSK_i::run( void * data ) 
    61 { 
    62     ((DepacketizerSimpleBPSK_i*) data)->run_loop(); 
    63 } 
    64  
    65 CORBA::Object_ptr DepacketizerSimpleBPSK_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort) 
    66 { 
    67     DEBUG(3, DepacketizerSimpleBPSK, "getPort() invoked with : " << portName) 
     60void Depacketizer_i::run( void * data ) 
     61{ 
     62    ((Depacketizer_i*) data)->run_loop(); 
     63} 
     64 
     65CORBA::Object_ptr Depacketizer_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort) 
     66{ 
     67    DEBUG(3, Depacketizer, "getPort() invoked with : " << portName) 
    6868     
    6969    CORBA::Object_var p; 
    … …  
    8383} 
    8484 
    85 void DepacketizerSimpleBPSK_i::start() throw (CORBA::SystemException, CF::Resource::StartError) 
    86 { 
    87     DEBUG(3, DepacketizerSimpleBPSK, "start() invoked") 
    88 } 
    89  
    90 void DepacketizerSimpleBPSK_i::stop() throw (CORBA::SystemException, CF::Resource::StopError)  
     85void Depacketizer_i::start() throw (CORBA::SystemException, CF::Resource::StartError) 
     86{ 
     87    DEBUG(3, Depacketizer, "start() invoked") 
     88} 
     89 
     90void Depacketizer_i::stop() throw (CORBA::SystemException, CF::Resource::StopError)  
    9191{   
    92     DEBUG(3, DepacketizerSimpleBPSK, "stop() invoked") 
    93 } 
    94  
    95 void DepacketizerSimpleBPSK_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError) 
    96 { 
    97     DEBUG(3, DepacketizerSimpleBPSK, "releaseObject() invoked") 
     92    DEBUG(3, Depacketizer, "stop() invoked") 
     93} 
     94 
     95void Depacketizer_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError) 
     96{ 
     97    DEBUG(3, Depacketizer, "releaseObject() invoked") 
    9898     
    9999    component_running->signal(); 
    100100} 
    101101 
    102 void DepacketizerSimpleBPSK_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) 
    103 { 
    104     DEBUG(3, DepacketizerSimpleBPSK, "initialize() invoked") 
    105 } 
    106  
    107 void DepacketizerSimpleBPSK_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) 
    108 { 
    109     DEBUG(3, DepacketizerSimpleBPSK, "configure() invoked") 
    110      
    111     DEBUG(3, DepacketizerSimpleBPSK, "props length : " << props.length()) 
    112 } 
    113  
    114  
    115 void DepacketizerSimpleBPSK_i::run_loop() 
    116 { 
    117     DEBUG(3, DepacketizerSimpleBPSK, "run_loop() thread started") 
     102void Depacketizer_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) 
     103{ 
     104    DEBUG(3, Depacketizer, "initialize() invoked") 
     105} 
     106 
     107void Depacketizer_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) 
     108{ 
     109    DEBUG(3, Depacketizer, "configure() invoked") 
     110     
     111    DEBUG(3, Depacketizer, "props length : " << props.length()) 
     112} 
     113 
     114 
     115void Depacketizer_i::run_loop() 
     116{ 
     117    DEBUG(3, Depacketizer, "run_loop() thread started") 
    118118 
    119119#ifdef LOGGING 
    … …  
    136136        dataIn->getData(bits_in, metadata); 
    137137        N = bits_in->length(); 
    138         DEBUG(7, DepacketizerSimpleBPSK, "got " << N << " samples") 
     138        DEBUG(7, Depacketizer, "got " << N << " samples") 
    139139             
    140140#ifdef LOGGING 
    … …  
    155155                if ( abs(rxy) > pnSyncCodeThreshold ) { 
    156156                    invertBits = ( rxy < 0 ) ? true : false; 
    157                     DEBUG(5, DepacketizerSimpleBPSK, "SYNC CODE FOUND, inversion: " << invertBits) 
    158                     DEBUG(5, DepacketizerSimpleBPSK, "  sync rxy = " << rxy) 
     157                    DEBUG(5, Depacketizer, "SYNC CODE FOUND, inversion: " << invertBits) 
     158                    DEBUG(5, Depacketizer, "  sync rxy = " << rxy) 
    159159                    operationalMode = EXTRACT_CONTROL_CODES; 
    160160                    inputBuffer.Release(); 
    … …  
    167167 
    168168                if ( numBitsExtracted == PN_CONTROL_CODE_LENGTH ) { 
    169                     DEBUG(5, DepacketizerSimpleBPSK, "Extracting control code " << numControlCodesExtracted) 
     169                    DEBUG(5, Depacketizer, "Extracting control code " << numControlCodesExtracted) 
    170170                    rxy = CorrelateSequence( pnCtrlCode, PN_CONTROL_CODE_LENGTH ); 
    171171                    controlSequence[numControlCodesExtracted] = invertBits ? -rxy : rxy; 
    172                     DEBUG(5, DepacketizerSimpleBPSK, "  rxy = " << controlSequence[numControlCodesExtracted]) 
     172                    DEBUG(5, Depacketizer, "  rxy = " << controlSequence[numControlCodesExtracted]) 
    173173                    numControlCodesExtracted++; 
    174174                    numBitsExtracted = 0; 
    … …  
    176176 
    177177                    if ( numControlCodesExtracted == NUM_CONTROL_CODES ) { 
    178                         DEBUG(5, DepacketizerSimpleBPSK, "CONTROL CODES EXTRACTED"); 
     178                        DEBUG(5, Depacketizer, "CONTROL CODES EXTRACTED"); 
    179179                        DecodeControlSequence(); 
    180                         DEBUG(5, DepacketizerSimpleBPSK, "Packet ID: " << controlOutput) 
     180                        DEBUG(5, Depacketizer, "Packet ID: " << controlOutput) 
    181181 
    182182                        // Set mode to extract data block 
    … …  
    192192 
    193193                if ( numBitsExtracted == DATA_BLOCK_LENGTH ) { 
    194                     DEBUG(1, DepacketizerSimpleBPSK, "DATA BLOCK EXTRACTED!"); 
     194                    DEBUG(1, Depacketizer, "DATA BLOCK EXTRACTED!"); 
    195195                     
    196                     DEBUG(1, DepacketizerSimpleBPSK, "pushing " << data_block_out.length() << " data samples") 
     196                    DEBUG(1, Depacketizer, "pushing " << data_block_out.length() << " data samples") 
    197197                    metadata->packet_id = (unsigned int) controlOutput; 
    198198                    dataOut->pushPacket( data_block_out, *metadata ); 
    … …  
    214214 
    215215    } 
    216     DEBUG(3, DepacketizerSimpleBPSK, "run_loop() has ended") 
     216    DEBUG(3, Depacketizer, "run_loop() has ended") 
    217217#ifdef LOGGING 
    218218    output_bits_log.close(); 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/src/Depacketizer.h

    r4831 r5168  
    33Copyright 2006 Virginia Polytechnic Institute and State University 
    44 
    5 This file is part of the OSSIE DepacketizerSimpleBPSK. 
     5This file is part of the OSSIE Depacketizer. 
    66 
    7 OSSIE DepacketizerSimpleBPSK is free software; you can redistribute it and/or modify 
     7OSSIE Depacketizer is free software; you can redistribute it and/or modify 
    88it under the terms of the GNU General Public License as published by 
    99the Free Software Foundation; either version 2 of the License, or 
    1010(at your option) any later version. 
    1111 
    12 OSSIE DepacketizerSimpleBPSK is distributed in the hope that it will be useful, 
     12OSSIE Depacketizer is distributed in the hope that it will be useful, 
    1313but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1616 
    1717You should have received a copy of the GNU General Public License 
    18 along with OSSIE DepacketizerSimpleBPSK; if not, write to the Free Software 
     18along with OSSIE Depacketizer; if not, write to the Free Software 
    1919Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2020 
    … …  
    3535#include "standardinterfaces/realChar_p.h" 
    3636 
    37 #include "DepacketizerDSP.h" 
     37#include "PacketizerDSP.h" 
    3838 
    39 class DepacketizerSimpleBPSK_i : public virtual Resource_impl, public DepacketizerDSP 
     39class Depacketizer_i : public virtual Resource_impl, public PacketizerDSP 
    4040{ 
    41     public: 
    42         DepacketizerSimpleBPSK_i(const char *uuid, omni_condition *sem); 
    43         ~DepacketizerSimpleBPSK_i(void); 
     41  public: 
     42    Depacketizer_i(const char *uuid, omni_condition *sem); 
     43    ~Depacketizer_i(void); 
    4444 
    45         void start() throw (CF::Resource::StartError, CORBA::SystemException); 
    46         void stop() throw (CF::Resource::StopError, CORBA::SystemException); 
    47         void static run( void * data ); 
     45    void start() throw (CF::Resource::StartError, CORBA::SystemException); 
     46    void stop() throw (CF::Resource::StopError, CORBA::SystemException); 
     47    void static run( void * data ); 
    4848 
    49         CORBA::Object_ptr getPort( const char* portName ) throw (CF::PortSupplier::UnknownPort, CORBA::SystemException); 
     49    CORBA::Object_ptr getPort( const char* portName ) throw (CF::PortSupplier::UnknownPort, CORBA::SystemException); 
    5050 
    51         void releaseObject() throw (CF::LifeCycle::ReleaseError, CORBA::SystemException); 
     51    void releaseObject() throw (CF::LifeCycle::ReleaseError, CORBA::SystemException); 
    5252 
    53         void initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException); 
    54         void configure(const CF::Properties&) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration); 
     53    void initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException); 
     54    void configure(const CF::Properties&) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration); 
    5555 
    5656 
    57     private: 
    58         DepacketizerSimpleBPSK_i(); 
    59         DepacketizerSimpleBPSK_i(DepacketizerSimpleBPSK_i&); 
     57  private: 
     58    Depacketizer_i(); 
     59    Depacketizer_i(Depacketizer_i&); 
    6060 
    61         void run_loop(); 
    62     
    63         omni_condition *component_running;  // for component shutdown 
    64         omni_thread *processing_thread;     // for component writer function 
    65         omni_mutex accessPrivateData;       // for asynchronous configure() invocation 
    66          
    67         CORBA::Long simple_0_value; 
    68         CORBA::Long simple_1_value; 
    69         CORBA::Long simple_2_value; 
     61    void run_loop(); 
    7062 
    71          
    72         //list components provides and uses ports 
    73         standardInterfaces_i::realChar_p *dataIn; 
    74         standardInterfaces_i::realChar_u *dataOut; 
    75         standardInterfaces::MetaData *metadata; 
     63    omni_condition *component_running;  // for component shutdown 
     64    omni_thread *processing_thread;     // for component writer function 
     65    omni_mutex accessPrivateData;       // for asynchronous configure() invocation 
     66     
     67    CORBA::Long simple_0_value; 
     68    CORBA::Long simple_1_value; 
     69    CORBA::Long simple_2_value; 
    7670 
    77         // ----- algorithm methods ----- 
     71     
     72    //list components provides and uses ports 
     73    standardInterfaces_i::realChar_p *dataIn; 
     74    standardInterfaces_i::realChar_u *dataOut; 
     75    standardInterfaces::MetaData *metadata; 
    7876 
    79         unsigned int numControlCodesExtracted; 
    80         unsigned int numBitsExtracted; 
    81         int pnSyncCodeThreshold;        ///< 
    82         bool invertBits;                ///< negative correlation indicator 
     77    // ----- algorithm methods ----- 
    8378 
    84         /// Operational mode 
    85         enum { 
    86             EXTRACT_PN_SYNC_CODE, 
    87             EXTRACT_CONTROL_CODES, 
    88             EXTRACT_DATA_BLOCK 
    89         } operationalMode; 
     79    unsigned int numControlCodesExtracted; 
     80    unsigned int numBitsExtracted; 
     81    int pnSyncCodeThreshold;        ///< 
     82    bool invertBits;                ///< negative correlation indicator 
     83 
     84    /// Operational mode 
     85    enum { 
     86        EXTRACT_PN_SYNC_CODE, 
     87        EXTRACT_CONTROL_CODES, 
     88        EXTRACT_DATA_BLOCK 
     89    } operationalMode; 
    9090 
    9191 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/src/Packetizer.cpp

    r4836 r5168  
    33Copyright 2006 Virginia Polytechnic Institute and State University 
    44 
    5 This file is part of the OSSIE PacketizerSimpleBPSK. 
     5This file is part of the OSSIE Packetizer. 
    66 
    7 OSSIE PacketizerSimpleBPSK is free software; you can redistribute it and/or modify 
     7OSSIE Packetizer is free software; you can redistribute it and/or modify 
    88it under the terms of the GNU General Public License as published by 
    99the Free Software Foundation; either version 2 of the License, or 
    1010(at your option) any later version. 
    1111 
    12 OSSIE PacketizerSimpleBPSK is distributed in the hope that it will be useful, 
     12OSSIE Packetizer is distributed in the hope that it will be useful, 
    1313but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1616 
    1717You should have received a copy of the GNU General Public License 
    18 along with OSSIE PacketizerSimpleBPSK; if not, write to the Free Software 
     18along with OSSIE Packetizer; if not, write to the Free Software 
    1919Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2020 
    … …  
    2424#include <string> 
    2525#include <iostream> 
    26 #include "PacketizerSimpleBPSK.h" 
     26#include "Packetizer.h" 
    2727 
    28 PacketizerSimpleBPSK_i::PacketizerSimpleBPSK_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
     28Packetizer_i::Packetizer_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
    2929{ 
    3030    dataIn = new standardInterfaces_i::realChar_p("bitsIn"); 
    … …  
    4040 
    4141 
    42 PacketizerSimpleBPSK_i::~PacketizerSimpleBPSK_i(void) 
     42Packetizer_i::~Packetizer_i(void) 
    4343{    
    4444    delete dataIn; 
    … …  
    4646} 
    4747 
    48 void PacketizerSimpleBPSK_i::Run( void * data ) 
     48void Packetizer_i::Run( void * data ) 
    4949{ 
    50     ((PacketizerSimpleBPSK_i*) data)->RunLoop(); 
     50    ((Packetizer_i*) data)->RunLoop(); 
    5151} 
    5252 
    53 CORBA::Object_ptr PacketizerSimpleBPSK_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort) 
     53CORBA::Object_ptr Packetizer_i::getPort( const char* portName ) throw (CORBA::SystemException, CF::PortSupplier::UnknownPort) 
    5454{ 
    55     DEBUG(3, PacketizerSimpleBPSK, "PacketizerSimpleBPSK_i getPort called with : " << portName) 
     55    DEBUG(3, Packetizer, "Packetizer_i getPort called with : " << portName) 
    5656     
    5757    CORBA::Object_var p; 
    … …  
    7373} 
    7474 
    75 void PacketizerSimpleBPSK_i::start() throw (CORBA::SystemException, CF::Resource::StartError) 
     75void Packetizer_i::start() throw (CORBA::SystemException, CF::Resource::StartError) 
    7676{ 
    77     DEBUG(3, PacketizerSimpleBPSK, "start invoked") 
     77    DEBUG(3, Packetizer, "start invoked") 
    7878} 
    7979 
    80 void PacketizerSimpleBPSK_i::stop() throw (CORBA::SystemException, CF::Resource::StopError)  
     80void Packetizer_i::stop() throw (CORBA::SystemException, CF::Resource::StopError)  
    8181{   
    82     DEBUG(3, PacketizerSimpleBPSK, "stop invoked") 
     82    DEBUG(3, Packetizer, "stop invoked") 
    8383} 
    8484 
    85 void PacketizerSimpleBPSK_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError) 
     85void Packetizer_i::releaseObject() throw (CORBA::SystemException, CF::LifeCycle::ReleaseError) 
    8686{ 
    87     DEBUG(3, PacketizerSimpleBPSK, "releaseObject invoked") 
     87    DEBUG(3, Packetizer, "releaseObject invoked") 
    8888     
    8989    component_running->signal(); 
    9090} 
    9191 
    92 void PacketizerSimpleBPSK_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) 
     92void Packetizer_i::initialize() throw (CF::LifeCycle::InitializeError, CORBA::SystemException) 
    9393{ 
    94     DEBUG(3, PacketizerSimpleBPSK, "initialize invoked") 
     94    DEBUG(3, Packetizer, "initialize invoked") 
    9595} 
    9696 
    97 void PacketizerSimpleBPSK_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) 
     97void Packetizer_i::configure(const CF::Properties& props) throw (CORBA::SystemException, CF::PropertySet::InvalidConfiguration, CF::PropertySet::PartialConfiguration) 
    9898{ 
    99     DEBUG(3, PacketizerSimpleBPSK, "configure invoked") 
     99    DEBUG(3, Packetizer, "configure invoked") 
    100100     
    101     DEBUG(3, PacketizerSimpleBPSK, "props length : " << props.length()) 
     101    DEBUG(3, Packetizer, "props length : " << props.length()) 
    102102} 
    103103 
    104104// Writes control block data to output sequence 
    105 void PacketizerSimpleBPSK_i::WriteControlBlock( PortTypes::CharSequence &bitsOut ) 
     105void Packetizer_i::WriteControlBlock( PortTypes::CharSequence &bitsOut ) 
    106106{ 
    107107    char * c; 
    … …  
    115115} 
    116116 
    117 void PacketizerSimpleBPSK_i::RunLoop() 
     117void Packetizer_i::RunLoop() 
    118118{ 
    119     DEBUG(3, PacketizerSimpleBPSK, "RunLoop thread started") 
     119    DEBUG(3, Packetizer, "RunLoop thread started") 
    120120 
    121121    PortTypes::CharSequence bits_out; 
    … …  
    134134        dataIn->getData(data_bits_in, metadata); 
    135135        N = data_bits_in->length(); 
    136         DEBUG(5, PacketizerSimpleBPSK, "got " << N << " data samples") 
     136        DEBUG(5, Packetizer, "got " << N << " data samples") 
    137137        if ( N != 400 ) 
    138             std::cout << "WARNING: PacketizerSimpleBPSK did not get exactly 400 data bits" << std::endl; 
     138            std::cout << "WARNING: Packetizer did not get exactly 400 data bits" << std::endl; 
    139139        ///\todo: do not assume input data block size is always 400 
    140140         
    141         DEBUG(7, PacketizerSimpleBPSK, "copying control data") 
     141        DEBUG(7, Packetizer, "copying control data") 
    142142        ConfigureControl( metadata->packet_id ); 
    143143        WriteControlBlock( bits_out ); 
    144144 
    145         DEBUG(7, PacketizerSimpleBPSK, "copying data block") 
     145        DEBUG(7, Packetizer, "copying data block") 
    146146        for (unsigned int i=0; i<400; i++) 
    147147            bits_out[i_data+i] = (*data_bits_in)[i]; 
    148148 
    149         DEBUG(5, PacketizerSimpleBPSK, "pushing data " << N << " samples...") 
     149        DEBUG(5, Packetizer, "pushing data " << N << " samples...") 
    150150        dataOut->pushPacket( bits_out, *metadata ); 
    151151 
    … …  
    154154    } 
    155155 
    156     DEBUG(5, PacketizerSimpleBPSK, "process exiting") 
     156    DEBUG(5, Packetizer, "process exiting") 
    157157    processing_thread->exit(); 
    158158} 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/src/Packetizer.h

    r4996 r5168  
    33Copyright 2006 Virginia Polytechnic Institute and State University 
    44 
    5 This file is part of the OSSIE PacketizerSimpleBPSK. 
     5This file is part of the OSSIE Packetizer. 
    66 
    7 OSSIE PacketizerSimpleBPSK is free software; you can redistribute it and/or modify 
     7OSSIE Packetizer is free software; you can redistribute it and/or modify 
    88it under the terms of the GNU General Public License as published by 
    99the Free Software Foundation; either version 2 of the License, or 
    1010(at your option) any later version. 
    1111 
    12 OSSIE PacketizerSimpleBPSK is distributed in the hope that it will be useful, 
     12OSSIE Packetizer is distributed in the hope that it will be useful, 
    1313but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1414MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    … …  
    1616 
    1717You should have received a copy of the GNU General Public License 
    18 along with OSSIE PacketizerSimpleBPSK; if not, write to the Free Software 
     18along with OSSIE Packetizer; if not, write to the Free Software 
    1919Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
    2020 
    … …  
    3636#include "PacketizerDSP.h" 
    3737 
    38 class PacketizerSimpleBPSK_i : public virtual Resource_impl, public PacketizerDSP 
     38class Packetizer_i : public virtual Resource_impl, public PacketizerDSP 
    3939{ 
    4040  public: 
    4141    /// Initializing constructor 
    42     PacketizerSimpleBPSK_i(const char *uuid, omni_condition *sem); 
     42    Packetizer_i(const char *uuid, omni_condition *sem); 
    4343 
    4444    /// Destructor 
    45     ~PacketizerSimpleBPSK_i(void); 
     45    ~Packetizer_i(void); 
    4646 
    4747    /// 
    … …  
    7474  private: 
    7575    /// Disallow default constructor 
    76     PacketizerSimpleBPSK_i(); 
     76    Packetizer_i(); 
    7777 
    7878    /// Disallow copy constructor 
    79     PacketizerSimpleBPSK_i(PacketizerSimpleBPSK_i&); 
     79    Packetizer_i(Packetizer_i&); 
    8080 
    8181    /// Main signal processing loop 

  • experimental/components/Packetizer/trunk/Packetizer-metadata/src/PacketizerDSP.h

    r4830 r5168  
    5252}; 
    5353 
     54/// Packet type 
     55enum PacketType { 
     56    LOW_LATENCY,    ///< 
     57    RELIABLE_DATA   ///< 
     58}; 
     59 
    5460/** \brief 
    5561 * 
    … …  
    6672  protected: 
    6773    // Physical layer definitions 
    68     char * pn_sync_code;        ///< packet synchronization code 
     74    char * pnSyncCode;          ///< packet synchronization code 
    6975    char * pn_eom_code;         ///< packet eom sync code 
    7076 
    … …  
    8086 
    8187    // Transport layer definitions 
    82     enum packet_type;           ///< packet type identifier 
     88    PacketType packet_type;     ///< packet type identifier 
    8389    unsigned long packet_id;    ///< packet identifier 
    8490    unsigned long port_id;      ///< port identifier 
    … …  
    8793    // ... 
    8894 
     95    /// Array of control code pointers 
     96    char ** controlBlock; 
     97     
    8998    /// Sets pointers in controlBlock to appropriate control codes 
    9099    void ConfigureControl( unsigned char id );