Changeset 4704

Show
Ignore:
Timestamp:
08/14/07 14:37:26 (6 years ago)
Author:
jgaeddert
Message:

replacing control port in packetizer to use metadata

Location:
experimental/components/PacketizerSimpleBPSK/branches/PacketizerSimpleBPSK-metadata
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • experimental/components/PacketizerSimpleBPSK/branches/PacketizerSimpleBPSK-metadata/src/PacketizerSimpleBPSK.cpp

    r4113 r4704  
    2828PacketizerSimpleBPSK_i::PacketizerSimpleBPSK_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
    2929{ 
    30     dataIn_0 = new standardInterfaces_i::realChar_p("bitsIn"); 
    31     dataIn_1 = new standardInterfaces_i::realChar_p("controlIn"); 
    32     dataOut_0 = new standardInterfaces_i::realChar_u("bitsOut"); 
     30    dataIn = new standardInterfaces_i::realChar_p("bitsIn"); 
     31    dataOut = new standardInterfaces_i::realChar_u("bitsOut"); 
    3332 
    3433    //Create the thread for the writer's processing function  
    … …  
    4342PacketizerSimpleBPSK_i::~PacketizerSimpleBPSK_i(void) 
    4443{    
    45     delete dataIn_0; 
    46     delete dataIn_1; 
    47     delete dataOut_0; 
     44    delete dataIn; 
     45    delete dataOut; 
    4846} 
    4947 
    … …  
    5957    CORBA::Object_var p; 
    6058 
    61     p = dataIn_0->getPort(portName); 
     59    p = dataIn->getPort(portName); 
    6260 
    6361    if (!CORBA::is_nil(p)) 
    6462        return p._retn(); 
    6563 
    66     p = dataIn_1->getPort(portName); 
     64    p = dataOut->getPort(portName); 
    6765 
    6866    if (!CORBA::is_nil(p)) 
    … …  
    7068        return p._retn(); 
    7169    } 
    72  
    73     p = dataOut_0->getPort(portName); 
    74  
    75     if (!CORBA::is_nil(p)) 
    76         return p._retn(); 
    7770 
    7871    // Port not found; throw exception 
    … …  
    133126        bits_out[i] = pnSyncCode[i]; 
    134127 
    135     unsigned int N, M; 
     128    unsigned int N; 
    136129    unsigned int i_data = PN_SYNC_CODE_LENGTH + (PN_CONTROL_CODE_LENGTH*NUM_CONTROL_CODES); 
    137130 
    138131    PortTypes::CharSequence * data_bits_in(NULL); 
    139     PortTypes::CharSequence * control_bits_in(NULL); 
    140132    while( true ) 
    141133    { 
    142         dataIn_0->getData(data_bits_in); 
     134        dataIn->getData(data_bits_in, metadata); 
    143135        N = data_bits_in->length(); 
    144136        DEBUG(5, PacketizerSimpleBPSK, "got " << N << " data samples") 
    … …  
    147139        ///\todo: do not assume input data block size is always 400 
    148140         
    149         dataIn_1->getData(control_bits_in); 
    150         M = control_bits_in->length(); 
    151         DEBUG(5, PacketizerSimpleBPSK, "got " << M << " control samples") 
    152         if ( M != 1 ) 
    153             std::cout << "WARNING: PacketizerSimpleBPSK did not get exactly 1 control sample" << std::endl; 
    154         ///\todo: do not assume input control block size is always 1 
    155          
    156141        DEBUG(7, PacketizerSimpleBPSK, "copying control data") 
    157         ConfigureControl( (*control_bits_in)[0] ); 
     142        ConfigureControl( metadata->packet_id ); 
    158143        WriteControlBlock( bits_out ); 
    159144 
    … …  
    163148 
    164149        DEBUG(5, PacketizerSimpleBPSK, "pushing data " << N << " samples...") 
    165         dataOut_0->pushPacket( bits_out ); 
     150        dataOut->pushPacket( bits_out, *metadata ); 
    166151 
    167         dataIn_0->bufferEmptied(); 
    168         dataIn_1->bufferEmptied(); 
     152        dataIn->bufferEmptied(); 
    169153 
    170154    } 

  • experimental/components/PacketizerSimpleBPSK/branches/PacketizerSimpleBPSK-metadata/src/PacketizerSimpleBPSK.h

    r4106 r4704  
    8888         
    8989    //list components provides and uses ports 
    90     standardInterfaces_i::realChar_p *dataIn_0;  // data block 
    91     standardInterfaces_i::realChar_p *dataIn_1;  // control block 
    92     standardInterfaces_i::realChar_u *dataOut_0; // output packet 
     90    standardInterfaces_i::realChar_p *dataIn;  // data block 
     91    standardInterfaces_i::realChar_u *dataOut; // output packet 
     92    standardInterfaces::MetaData *metadata; 
    9393 
    9494    /// Writes control block data to output sequence 

  • experimental/components/PacketizerSimpleBPSK/branches/PacketizerSimpleBPSK-metadata/xml/PacketizerSimpleBPSK.scd.xml

    r4100 r4704  
    1515        <ports> 
    1616            <provides providesname="bitsIn" repid="IDL:standardInterfaces/realChar:1.0"> 
    17                 <porttype type="data"/> 
    18             </provides> 
    19             <provides providesname="controlIn" repid="IDL:standardInterfaces/realChar:1.0"> 
    2017                <porttype type="data"/> 
    2118            </provides>