Changeset 8180

Show
Ignore:
Timestamp:
08/18/08 18:14:56 (5 years ago)
Author:
shereef
Message:

simd is now under the namespace standardInterfacesMD

Location:
ossiedev/trunk
Files:
41 modified

Legend:

Unmodified
Added
Removed

  • ossiedev/trunk/components/AutomaticGainControl-metadata/src/AutomaticGainControl_metadata.cpp

    r8028 r8180  
    3030    : Resource_impl(uuid), component_running(condition)  
    3131{ 
    32     dataOut_0 = new standardInterfaces_i::complexShort_u("data_out"); 
    33     dataIn_0 = new standardInterfaces_i::complexShort_p("data_in"); 
     32    dataOut_0 = new standardInterfacesMD_i::complexShort_u("data_out"); 
     33    dataIn_0 = new standardInterfacesMD_i::complexShort_p("data_in"); 
    3434 
    3535    // set initial values 

  • ossiedev/trunk/components/AutomaticGainControl-metadata/src/AutomaticGainControl_metadata.h

    r8090 r8180  
    9292         
    9393        /// output data port, \ref port_data_out "data_out" 
    94         standardInterfaces_i::complexShort_u *dataOut_0; 
     94        standardInterfacesMD_i::complexShort_u *dataOut_0; 
    9595 
    9696        /// input data port, \ref port_data_in "data_in" 
    97         standardInterfaces_i::complexShort_p *dataIn_0; 
     97        standardInterfacesMD_i::complexShort_p *dataIn_0; 
    9898 
    9999        /// \brief MetaData object 
    100100        /// AGC updates the following properties 
    101101        ///   - signal_strength 
    102         standardInterfaces::MetaData *metadata; 
     102        standardInterfacesMD::MetaData *metadata; 
    103103 
    104104        // ----- algorithm variables ----- 

  • ossiedev/trunk/components/AutomaticGainControl-metadata/src/main.cpp

    r8028 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/CIREN_CE/CIREN_CE.cpp

    r7694 r8180  
    3030{ 
    3131    // Create the ports 
    32     portAppDataOut = new standardInterfaces_i::realChar_u("app_data_out"); 
    33     portPacketDataOut = new standardInterfaces_i::realChar_u("packet_data_out"); 
    34     portControlDataOut = new standardInterfaces_i::realChar_u("control_data_out"); 
    35     portAppDataIn = new standardInterfaces_i::realChar_p("app_data_in"); 
    36     portPacketDataIn = new standardInterfaces_i::realChar_p("packet_data_in"); 
    37     portControlDataIn = new standardInterfaces_i::realChar_p("control_data_in"); 
     32    portAppDataOut = new standardInterfacesMD_i::realChar_u("app_data_out"); 
     33    portPacketDataOut = new standardInterfacesMD_i::realChar_u("packet_data_out"); 
     34    portControlDataOut = new standardInterfacesMD_i::realChar_u("control_data_out"); 
     35    portAppDataIn = new standardInterfacesMD_i::realChar_p("app_data_in"); 
     36    portPacketDataIn = new standardInterfacesMD_i::realChar_p("packet_data_in"); 
     37    portControlDataIn = new standardInterfacesMD_i::realChar_p("control_data_in"); 
    3838 
    3939    // Initialize CORBA variables 
    … …  
    4545 
    4646    // Initialize TX control metadata object 
    47     standardInterfaces::InitializeMetaData(tx_control_metadata); 
     47    standardInterfacesMD::InitializeMetaData(tx_control_metadata); 
    4848    tx_control_metadata.modulation_scheme.scheme = 
    49         standardInterfaces::ModulationScheme::PSK; 
     49        standardInterfacesMD::ModulationScheme::PSK; 
    5050    tx_control_metadata.modulation_scheme.M = 2; 
    5151    tx_control_metadata.eom = true; 
    … …  
    5353    tx_control_metadata.src_id = 0; 
    5454 
    55     standardInterfaces::InitializeMetaData(tx_control_metadata_5); 
     55    standardInterfacesMD::InitializeMetaData(tx_control_metadata_5); 
    5656    tx_control_metadata_5.modulation_scheme.scheme = 
    57         standardInterfaces::ModulationScheme::PSK; 
     57        standardInterfacesMD::ModulationScheme::PSK; 
    5858    tx_control_metadata_5.modulation_scheme.M = 4; 
    5959    tx_control_metadata_5.eom = true; 
    … …  
    6161    tx_control_metadata_5.src_id = 0; 
    6262 
    63     standardInterfaces::InitializeMetaData(tx_control_metadata_6); 
     63    standardInterfacesMD::InitializeMetaData(tx_control_metadata_6); 
    6464    tx_control_metadata_6.modulation_scheme.scheme = 
    65         standardInterfaces::ModulationScheme::PSK; 
     65        standardInterfacesMD::ModulationScheme::PSK; 
    6666    tx_control_metadata_6.modulation_scheme.M = 4; 
    6767    tx_control_metadata_6.eom = true; 
    … …  
    267267 
    268268            tx_metadata->modulation_scheme.scheme = 
    269                 standardInterfaces::ModulationScheme::QAM; 
     269                standardInterfacesMD::ModulationScheme::QAM; 
    270270            tx_metadata->modulation_scheme.M = 16; 
    271271 
    … …  
    305305            tx_metadata->packet_id = audio_packet_counter; 
    306306            tx_metadata->modulation_scheme.scheme = 
    307                 standardInterfaces::ModulationScheme::PSK; 
     307                standardInterfacesMD::ModulationScheme::PSK; 
    308308            tx_metadata->modulation_scheme.M = 4; 
    309309            text_packet_counter++; 
    … …  
    505505            // end-of-frame control: BPSK 
    506506            tx_control_metadata.modulation_scheme.scheme = 
    507                 standardInterfaces::ModulationScheme::PSK; 
     507                standardInterfacesMD::ModulationScheme::PSK; 
    508508            tx_control_metadata.modulation_scheme.M = 2; 
    509509        } else { 
    510510            // special control frame: QPSK 
    511511            tx_control_metadata.modulation_scheme.scheme = 
    512                 standardInterfaces::ModulationScheme::PSK; 
     512                standardInterfacesMD::ModulationScheme::PSK; 
    513513            tx_control_metadata.modulation_scheme.M = 4; 
    514514        } 

  • ossiedev/trunk/components/CIREN_CE/CIREN_CE.h

    r8090 r8180  
    103103         
    104104    // Ports 
    105     standardInterfaces_i::realChar_u *portAppDataOut; 
    106     standardInterfaces_i::realChar_u *portPacketDataOut; 
    107     standardInterfaces_i::realChar_u *portControlDataOut; 
    108     standardInterfaces_i::realChar_p *portAppDataIn; 
    109     standardInterfaces_i::realChar_p *portPacketDataIn; 
    110     standardInterfaces_i::realChar_p *portControlDataIn; 
     105    standardInterfacesMD_i::realChar_u *portAppDataOut; 
     106    standardInterfacesMD_i::realChar_u *portPacketDataOut; 
     107    standardInterfacesMD_i::realChar_u *portControlDataOut; 
     108    standardInterfacesMD_i::realChar_p *portAppDataIn; 
     109    standardInterfacesMD_i::realChar_p *portPacketDataIn; 
     110    standardInterfacesMD_i::realChar_p *portControlDataIn; 
    111111 
    112112    // Metadata objects 
    113     standardInterfaces::MetaData *tx_metadata; 
    114     standardInterfaces::MetaData *rx_metadata; 
    115     standardInterfaces::MetaData tx_control_metadata;   ///< for end-of-frame control 
    116     standardInterfaces::MetaData tx_control_metadata_5; ///< for special control frame 
    117     standardInterfaces::MetaData tx_control_metadata_6; ///< for special beacon frame 
    118     standardInterfaces::MetaData *rx_control_metadata; 
     113    standardInterfacesMD::MetaData *tx_metadata; 
     114    standardInterfacesMD::MetaData *rx_metadata; 
     115    standardInterfacesMD::MetaData tx_control_metadata;   ///< for end-of-frame control 
     116    standardInterfacesMD::MetaData tx_control_metadata_5; ///< for special control frame 
     117    standardInterfacesMD::MetaData tx_control_metadata_6; ///< for special beacon frame 
     118    standardInterfacesMD::MetaData *rx_control_metadata; 
    119119 
    120120    // CORBA sequence objects 

  • ossiedev/trunk/components/CIREN_CE/main.cpp

    r5679 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/CIREN_SM/CIREN_SM.cpp

    r5696 r8180  
    6262 
    6363    // Create the ports 
    64     portTxDataOut = new standardInterfaces_i::complexShort_u("tx_data_out"); 
    65     portRxDataOut = new standardInterfaces_i::complexShort_u("rx_data_out"); 
    66     portControlDataOut = new standardInterfaces_i::realChar_u("control_data_out"); 
    67     portTxDataIn = new standardInterfaces_i::complexShort_p("tx_data_in"); 
    68     portRxDataIn = new standardInterfaces_i::complexShort_p("rx_data_in"); 
    69     portControlDataIn = new standardInterfaces_i::realChar_p("control_data_in"); 
     64    portTxDataOut = new standardInterfacesMD_i::complexShort_u("tx_data_out"); 
     65    portRxDataOut = new standardInterfacesMD_i::complexShort_u("rx_data_out"); 
     66    portControlDataOut = new standardInterfacesMD_i::realChar_u("control_data_out"); 
     67    portTxDataIn = new standardInterfacesMD_i::complexShort_p("tx_data_in"); 
     68    portRxDataIn = new standardInterfacesMD_i::complexShort_p("rx_data_in"); 
     69    portControlDataIn = new standardInterfacesMD_i::realChar_p("control_data_in"); 
    7070    TXControl = new standardInterfaces_i::TX_Control_u("TX_Control"); 
    7171    RXControl = new standardInterfaces_i::RX_Control_u("RX_Control"); 
    … …  
    8585    tx_beacon[0] = 0; 
    8686    beacon_data_out.length(512); 
    87     standardInterfaces::InitializeMetaData(beacon_metadata); 
     87    standardInterfacesMD::InitializeMetaData(beacon_metadata); 
    8888    beacon_metadata.packet_id = 5; 
    8989 
    … …  
    583583        rx_metadata->sampling_frequency = 64e6f / rx_decim; 
    584584 
    585         //standardInterfaces::PrintMetaData(*tx_metadata); 
     585        //standardInterfacesMD::PrintMetaData(*tx_metadata); 
    586586 
    587587        // process data here 

  • ossiedev/trunk/components/CIREN_SM/CIREN_SM.h

    r8090 r8180  
    218218         
    219219    // Ports 
    220     standardInterfaces_i::complexShort_u *portTxDataOut; 
    221     standardInterfaces_i::complexShort_u *portRxDataOut; 
    222     standardInterfaces_i::realChar_u     *portControlDataOut; 
    223     standardInterfaces_i::complexShort_p *portTxDataIn; 
    224     standardInterfaces_i::complexShort_p *portRxDataIn; 
    225     standardInterfaces_i::realChar_p     *portControlDataIn; 
     220    standardInterfacesMD_i::complexShort_u *portTxDataOut; 
     221    standardInterfacesMD_i::complexShort_u *portRxDataOut; 
     222    standardInterfacesMD_i::realChar_u     *portControlDataOut; 
     223    standardInterfacesMD_i::complexShort_p *portTxDataIn; 
     224    standardInterfacesMD_i::complexShort_p *portRxDataIn; 
     225    standardInterfacesMD_i::realChar_p     *portControlDataIn; 
    226226 
    227227    // Metadata objects 
    228     standardInterfaces::MetaData *tx_metadata; 
    229     standardInterfaces::MetaData *rx_metadata; 
    230     standardInterfaces::MetaData *control_metadata; 
    231     standardInterfaces::MetaData beacon_metadata; 
     228    standardInterfacesMD::MetaData *tx_metadata; 
     229    standardInterfacesMD::MetaData *rx_metadata; 
     230    standardInterfacesMD::MetaData *control_metadata; 
     231    standardInterfacesMD::MetaData beacon_metadata; 
    232232 
    233233    // CORBA sequence objects 

  • ossiedev/trunk/components/CIREN_SM/main.cpp

    r5677 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/DigitalModem-metadata/src/DigitalDemodulator_metadata.cpp

    r8031 r8180  
    2929    Resource_impl(uuid), component_running(condition) 
    3030{ 
    31     dataIn_0 = new standardInterfaces_i::complexShort_p("SymbolsIn"); 
    32     dataOut_0 = new standardInterfaces_i::realChar_u("DataBitsOut"); 
     31    dataIn_0 = new standardInterfacesMD_i::complexShort_p("SymbolsIn"); 
     32    dataOut_0 = new standardInterfacesMD_i::realChar_u("DataBitsOut"); 
    3333 
    3434    //Create the thread for the writer's processing function  
    … …  
    147147{ 
    148148    switch (packet_data->modulation_scheme.scheme) { 
    149     case standardInterfaces::ModulationScheme::UNKNOWN: 
     149    case standardInterfacesMD::ModulationScheme::UNKNOWN: 
    150150        // Meta data has not been configured; do not change from default modulation scheme 
    151151        return; 
    152     case standardInterfaces::ModulationScheme::PSK: 
     152    case standardInterfacesMD::ModulationScheme::PSK: 
    153153        switch (packet_data->modulation_scheme.M) { 
    154154        case 2: 
    … …  
    169169        } 
    170170        break; 
    171     case standardInterfaces::ModulationScheme::QAM: 
     171    case standardInterfacesMD::ModulationScheme::QAM: 
    172172        switch (packet_data->modulation_scheme.M) { 
    173173        case 4: 
    … …  
    184184        } 
    185185        break; 
    186     case standardInterfaces::ModulationScheme::PAM: 
     186    case standardInterfacesMD::ModulationScheme::PAM: 
    187187        switch (packet_data->modulation_scheme.M) { 
    188188        case 4: 
    … …  
    220220        if ( ossieDebugLevel > 5 ) { 
    221221            std::cout << "DigitalDemodulator-metadata got data" << std::endl; 
    222             standardInterfaces::PrintMetaData( *packet_data ); 
     222            standardInterfacesMD::PrintMetaData( *packet_data ); 
    223223        } 
    224224 

  • ossiedev/trunk/components/DigitalModem-metadata/src/DigitalDemodulator_metadata.h

    r8090 r8180  
    9191     
    9292    // list components provides and uses ports 
    93     standardInterfaces_i::complexShort_p *dataIn_0; 
    94     standardInterfaces_i::realChar_u *dataOut_0; 
     93    standardInterfacesMD_i::complexShort_p *dataIn_0; 
     94    standardInterfacesMD_i::realChar_u *dataOut_0; 
    9595 
    96     standardInterfaces::MetaData *packet_data; 
     96    standardInterfacesMD::MetaData *packet_data; 
    9797}; 
    9898 

  • ossiedev/trunk/components/DigitalModem-metadata/src/DigitalModulator_metadata.cpp

    r8031 r8180  
    2929    Resource_impl(uuid), component_running(condition) 
    3030{ 
    31     bitsIn = new standardInterfaces_i::realChar_p("bitsIn"); 
    32     symbolsOut = new standardInterfaces_i::complexShort_u("symbolsOut"); 
     31    bitsIn = new standardInterfacesMD_i::realChar_p("bitsIn"); 
     32    symbolsOut = new standardInterfacesMD_i::complexShort_u("symbolsOut"); 
    3333 
    3434    //Create the thread for the writer's processing function  
    … …  
    146146{ 
    147147    switch (metadata->modulation_scheme.scheme) { 
    148     case standardInterfaces::ModulationScheme::UNKNOWN: 
     148    case standardInterfacesMD::ModulationScheme::UNKNOWN: 
    149149        // Meta data has not been configured; do not change from default modulation scheme 
    150150        return; 
    151     case standardInterfaces::ModulationScheme::PSK: 
     151    case standardInterfacesMD::ModulationScheme::PSK: 
    152152        switch (metadata->modulation_scheme.M) { 
    153153        case 2: 
    … …  
    168168        } 
    169169        break; 
    170     case standardInterfaces::ModulationScheme::QAM: 
     170    case standardInterfacesMD::ModulationScheme::QAM: 
    171171        switch (metadata->modulation_scheme.M) { 
    172172        case 4: 
    … …  
    183183        } 
    184184        break; 
    185     case standardInterfaces::ModulationScheme::PAM: 
     185    case standardInterfacesMD::ModulationScheme::PAM: 
    186186        switch (metadata->modulation_scheme.M) { 
    187187        case 4: 
    … …  
    218218        if ( ossieDebugLevel > 5 ) { 
    219219            std::cout << "DigitalModulator_metadata-metadata got data" << std::endl; 
    220             standardInterfaces::PrintMetaData( *metadata ); 
     220            standardInterfacesMD::PrintMetaData( *metadata ); 
    221221        } 
    222222 

  • ossiedev/trunk/components/DigitalModem-metadata/src/DigitalModulator_metadata.h

    r8090 r8180  
    9191     
    9292    // list components provides and uses ports 
    93     standardInterfaces_i::realChar_p *bitsIn; 
    94     standardInterfaces_i::complexShort_u *symbolsOut; 
    95     standardInterfaces::MetaData *metadata; 
     93    standardInterfacesMD_i::realChar_p *bitsIn; 
     94    standardInterfacesMD_i::complexShort_u *symbolsOut; 
     95    standardInterfacesMD::MetaData *metadata; 
    9696 
    9797}; 

  • ossiedev/trunk/components/DigitalModem-metadata/src/main_demod.cpp

    r8031 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/DigitalModem-metadata/src/main_mod.cpp

    r8031 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/FrameAssembler-metadata/src/FrameAssembler_metadata.cpp

    r8015 r8180  
    2929    Resource_impl(uuid), component_running(condition) 
    3030{ 
    31     dataIn_0 = new standardInterfaces_i::complexShort_p("SymbolsIn"); 
    32     dataOut_0 = new standardInterfaces_i::complexShort_u("FrameSymbolsOut"); 
     31    dataIn_0 = new standardInterfacesMD_i::complexShort_p("SymbolsIn"); 
     32    dataOut_0 = new standardInterfacesMD_i::complexShort_u("FrameSymbolsOut"); 
    3333 
    3434    num_frames_sent_app_1 = 0; 
    … …  
    157157void FrameAssembler_metadata_i::ConfigureModulationSchemeOnMetaData() { 
    158158    switch (metadata->modulation_scheme.scheme) { 
    159     case standardInterfaces::ModulationScheme::PSK: 
     159    case standardInterfacesMD::ModulationScheme::PSK: 
    160160        switch (metadata->modulation_scheme.M) { 
    161161        case 2: 
    … …  
    176176        } 
    177177        break; 
    178     case standardInterfaces::ModulationScheme::QAM: 
     178    case standardInterfacesMD::ModulationScheme::QAM: 
    179179        switch (metadata->modulation_scheme.M) { 
    180180        case 4: 
    … …  
    191191        } 
    192192        break; 
    193     case standardInterfaces::ModulationScheme::PAM: 
     193    case standardInterfacesMD::ModulationScheme::PAM: 
    194194        switch (metadata->modulation_scheme.M) { 
    195195        case 4: 
    … …  
    202202        } 
    203203        break; 
    204     case standardInterfaces::ModulationScheme::UNKNOWN: 
     204    case standardInterfacesMD::ModulationScheme::UNKNOWN: 
    205205    default:; 
    206206    } 

  • ossiedev/trunk/components/FrameAssembler-metadata/src/FrameAssembler_metadata.h

    r8090 r8180  
    9191     
    9292    // list components provides and uses ports 
    93     standardInterfaces_i::complexShort_p *dataIn_0; 
    94     standardInterfaces_i::complexShort_u *dataOut_0; 
    95     standardInterfaces::MetaData *metadata; 
     93    standardInterfacesMD_i::complexShort_p *dataIn_0; 
     94    standardInterfacesMD_i::complexShort_u *dataOut_0; 
     95    standardInterfacesMD::MetaData *metadata; 
    9696 
    9797    unsigned int num_frames_sent_app_1; 

  • ossiedev/trunk/components/FrameAssembler-metadata/src/main.cpp

    r8015 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/Interpolator-metadata/Interpolator_metadata.cpp

    r8019 r8180  
    3939    previous_length = 0; 
    4040 
    41     dataIn = new standardInterfaces_i::complexShort_p("inData"); 
    42     dataOut = new standardInterfaces_i::complexShort_u("outData"); 
     41    dataIn = new standardInterfacesMD_i::complexShort_p("inData"); 
     42    dataOut = new standardInterfacesMD_i::complexShort_u("outData"); 
    4343 
    4444    // Start the run_interpolation thread 

  • ossiedev/trunk/components/Interpolator-metadata/Interpolator_metadata.h

    r8090 r8180  
    8686 
    8787    // For data in port 
    88     standardInterfaces_i::complexShort_p *dataIn; 
     88    standardInterfacesMD_i::complexShort_p *dataIn; 
    8989 
    9090    // For data out port 
    91     standardInterfaces_i::complexShort_u *dataOut; 
     91    standardInterfacesMD_i::complexShort_u *dataOut; 
    9292 
    93     standardInterfaces::MetaData *metadata; 
     93    standardInterfacesMD::MetaData *metadata; 
    9494 
    9595    // For debugging 

  • ossiedev/trunk/components/Interpolator-metadata/main.cpp

    r8019 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/Packetizer-metadata/src/Depacketizer_metadata.cpp

    r8027 r8180  
    3030    component_running(condition) 
    3131{ 
    32     dataIn = new standardInterfaces_i::realChar_p("bitsIn"); 
    33     dataOut = new standardInterfaces_i::realChar_u("bitsOut"); 
     32    dataIn = new standardInterfacesMD_i::realChar_p("bitsIn"); 
     33    dataOut = new standardInterfacesMD_i::realChar_u("bitsOut"); 
    3434 
    3535    //Create the thread for the writer's processing function  

  • ossiedev/trunk/components/Packetizer-metadata/src/Depacketizer_metadata.h

    r8090 r8180  
    7070     
    7171    //list components provides and uses ports 
    72     standardInterfaces_i::realChar_p *dataIn; 
    73     standardInterfaces_i::realChar_u *dataOut; 
    74     standardInterfaces::MetaData *metadata; 
     72    standardInterfacesMD_i::realChar_p *dataIn; 
     73    standardInterfacesMD_i::realChar_u *dataOut; 
     74    standardInterfacesMD::MetaData *metadata; 
    7575 
    7676    PacketDecoder p1; 

  • ossiedev/trunk/components/Packetizer-metadata/src/Packetizer_metadata.cpp

    r8027 r8180  
    2828Packetizer_metadata_i::Packetizer_metadata_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
    2929{ 
    30     dataIn = new standardInterfaces_i::realChar_p("bitsIn"); 
    31     dataOut = new standardInterfaces_i::realChar_u("bitsOut"); 
     30    dataIn = new standardInterfacesMD_i::realChar_p("bitsIn"); 
     31    dataOut = new standardInterfacesMD_i::realChar_u("bitsOut"); 
    3232 
    3333    //Create the thread for the writer's processing function  

  • ossiedev/trunk/components/Packetizer-metadata/src/Packetizer_metadata.h

    r8090 r8180  
    8787         
    8888    //list components provides and uses ports 
    89     standardInterfaces_i::realChar_p *dataIn;  // data block 
    90     standardInterfaces_i::realChar_u *dataOut; // output packet 
    91     standardInterfaces::MetaData *metadata; 
     89    standardInterfacesMD_i::realChar_p *dataIn;  // data block 
     90    standardInterfacesMD_i::realChar_u *dataOut; // output packet 
     91    standardInterfacesMD::MetaData *metadata; 
    9292 
    9393    PacketEncoder p1; 

  • ossiedev/trunk/components/Packetizer-metadata/src/main_depacketizer.cpp

    r8027 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/Packetizer-metadata/src/main_packetizer.cpp

    r8027 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/SymbolSyncPoly-metadata/src/FrameSynchronizer_metadata.cpp

    r8023 r8180  
    3232    Resource_impl(uuid), component_running(condition) 
    3333{ 
    34     dataIn_0 = new standardInterfaces_i::complexShort_p("IF_in"); 
    35     dataOut_0 = new standardInterfaces_i::complexShort_u("symbols_out"); 
     34    dataIn_0 = new standardInterfacesMD_i::complexShort_p("IF_in"); 
     35    dataOut_0 = new standardInterfacesMD_i::complexShort_u("symbols_out"); 
    3636 
    3737 
    … …  
    184184    switch (mod_scheme) { 
    185185    case SigProc::BPSK: 
    186         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::PSK; 
     186        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::PSK; 
    187187        metadata->modulation_scheme.M = 2; 
    188188        break; 
    189189    case SigProc::QPSK: 
    190         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::PSK; 
     190        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::PSK; 
    191191        metadata->modulation_scheme.M = 4; 
    192192        break; 
    193193    case SigProc::PSK8: 
    194         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::PSK; 
     194        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::PSK; 
    195195        metadata->modulation_scheme.M = 8; 
    196196        break; 
    197197    case SigProc::QAM16: 
    198         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::QAM; 
     198        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::QAM; 
    199199        metadata->modulation_scheme.M = 16; 
    200200        break; 
    201201    case SigProc::PAM4: 
    202         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::PAM; 
     202        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::PAM; 
    203203        metadata->modulation_scheme.M = 4; 
    204204        break; 
    205205    default: 
    206206        std::cout << "  ::::  WARNING: FrameSynchronizer_metadata: unknown modulation scheme  ::::" << std::endl; 
    207         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::UNKNOWN; 
     207        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::UNKNOWN; 
    208208        break; 
    209209    } 

  • ossiedev/trunk/components/SymbolSyncPoly-metadata/src/FrameSynchronizer_metadata.h

    r8090 r8180  
    104104     
    105105    // list components provides and uses ports 
    106     standardInterfaces_i::complexShort_p *dataIn_0; 
    107     standardInterfaces_i::complexShort_u *dataOut_0; 
    108     standardInterfaces::MetaData *metadata; 
     106    standardInterfacesMD_i::complexShort_p *dataIn_0; 
     107    standardInterfacesMD_i::complexShort_u *dataOut_0; 
     108    standardInterfacesMD::MetaData *metadata; 
    109109 
    110110    // configuration flags 

  • ossiedev/trunk/components/SymbolSyncPoly-metadata/src/MultirateSynchronizer_metadata.cpp

    r8024 r8180  
    2929    Resource_impl(uuid), component_running(condition) 
    3030{ 
    31     dataIn_0 = new standardInterfaces_i::complexShort_p("IF_in"); 
    32     dataOut_0 = new standardInterfaces_i::complexShort_u("symbols_out"); 
     31    dataIn_0 = new standardInterfacesMD_i::complexShort_p("IF_in"); 
     32    dataOut_0 = new standardInterfacesMD_i::complexShort_u("symbols_out"); 
    3333 
    3434 
    … …  
    209209    switch (mod_scheme) { 
    210210    case SigProc::BPSK: 
    211         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::PSK; 
     211        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::PSK; 
    212212        metadata->modulation_scheme.M = 2; 
    213213        break; 
    214214    case SigProc::QPSK: 
    215         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::PSK; 
     215        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::PSK; 
    216216        metadata->modulation_scheme.M = 4; 
    217217        break; 
    218218    case SigProc::PSK8: 
    219         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::PSK; 
     219        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::PSK; 
    220220        metadata->modulation_scheme.M = 8; 
    221221        break; 
    222222    case SigProc::QAM16: 
    223         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::QAM; 
     223        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::QAM; 
    224224        metadata->modulation_scheme.M = 16; 
    225225        break; 
    226226    case SigProc::PAM4: 
    227         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::PAM; 
     227        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::PAM; 
    228228        metadata->modulation_scheme.M = 4; 
    229229        break; 
    230230    default: 
    231231        std::cout << "  ::::  WARNING: FrameSynchronizer: unknown modulation scheme  ::::" << std::endl; 
    232         metadata->modulation_scheme.scheme = standardInterfaces::ModulationScheme::UNKNOWN; 
     232        metadata->modulation_scheme.scheme = standardInterfacesMD::ModulationScheme::UNKNOWN; 
    233233        break; 
    234234    } 
    … …  
    237237void MultirateSynchronizer_metadata_i::SetModulationSchemeOnMetaData() { 
    238238    switch (metadata->modulation_scheme.scheme) { 
    239     case standardInterfaces::ModulationScheme::PSK: 
     239    case standardInterfacesMD::ModulationScheme::PSK: 
    240240        switch (metadata->modulation_scheme.M) { 
    241241        case 2: 
    … …  
    256256        } 
    257257        break; 
    258     case standardInterfaces::ModulationScheme::QAM: 
     258    case standardInterfacesMD::ModulationScheme::QAM: 
    259259        switch (metadata->modulation_scheme.M) { 
    260260        case 4: 
    … …  
    271271        } 
    272272        break; 
    273     case standardInterfaces::ModulationScheme::PAM: 
     273    case standardInterfacesMD::ModulationScheme::PAM: 
    274274        switch (metadata->modulation_scheme.M) { 
    275275        case 4: 
    … …  
    282282        } 
    283283        break; 
    284     case standardInterfaces::ModulationScheme::UNKNOWN: 
     284    case standardInterfacesMD::ModulationScheme::UNKNOWN: 
    285285    default:; 
    286286    } 

  • ossiedev/trunk/components/SymbolSyncPoly-metadata/src/MultirateSynchronizer_metadata.h

    r8090 r8180  
    108108     
    109109    // list components provides and uses ports 
    110     standardInterfaces_i::complexShort_p *dataIn_0; 
    111     standardInterfaces_i::complexShort_u *dataOut_0; 
    112     standardInterfaces::MetaData *metadata; 
     110    standardInterfacesMD_i::complexShort_p *dataIn_0; 
     111    standardInterfacesMD_i::complexShort_u *dataOut_0; 
     112    standardInterfacesMD::MetaData *metadata; 
    113113 
    114114    // configuration flags 

  • ossiedev/trunk/components/SymbolSyncPoly-metadata/src/SymbolSyncPoly_metadata.cpp

    r8025 r8180  
    3131    Resource_impl(uuid), component_running(condition) 
    3232{ 
    33     dataIn_0 = new standardInterfaces_i::complexShort_p("baseband_in"); 
    34     dataOut_0 = new standardInterfaces_i::complexShort_u("symbols_out"); 
     33    dataIn_0 = new standardInterfacesMD_i::complexShort_p("baseband_in"); 
     34    dataOut_0 = new standardInterfacesMD_i::complexShort_u("symbols_out"); 
    3535 
    3636 

  • ossiedev/trunk/components/SymbolSyncPoly-metadata/src/SymbolSyncPoly_metadata.h

    r8090 r8180  
    101101     
    102102    // list components provides and uses ports 
    103     standardInterfaces_i::complexShort_p *dataIn_0; 
    104     standardInterfaces_i::complexShort_u *dataOut_0; 
    105     standardInterfaces::MetaData *metadata; 
     103    standardInterfacesMD_i::complexShort_p *dataIn_0; 
     104    standardInterfacesMD_i::complexShort_u *dataOut_0; 
     105    standardInterfacesMD::MetaData *metadata; 
    106106 
    107107    // configuration flags 

  • ossiedev/trunk/components/SymbolSyncPoly-metadata/src/main_FrameSynchronizer.cpp

    r8021 r8180  
    2828 
    2929using namespace std; 
    30 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     30using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3131 
    3232 

  • ossiedev/trunk/components/SymbolSyncPoly-metadata/src/main_MultirateSynchronizer.cpp

    r8021 r8180  
    2727 
    2828using namespace std; 
    29 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     29using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3030 
    3131 

  • ossiedev/trunk/components/SymbolSyncPoly-metadata/src/main_SymbolSyncPoly.cpp

    r8021 r8180  
    2727 
    2828using namespace std; 
    29 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     29using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3030 
    3131 

  • ossiedev/trunk/components/amplifier-metadata/amplifier_metadata.cpp

    r8003 r8180  
    2828amplifier_metadata_i::amplifier_metadata_i(const char *uuid, omni_condition *condition) : Resource_impl(uuid), component_running(condition)  
    2929{ 
    30     dataOut_0 = new standardInterfaces_i::complexShort_u("dataOut"); 
    31     dataIn_0 = new standardInterfaces_i::complexShort_p("dataIn"); 
     30    dataOut_0 = new standardInterfacesMD_i::complexShort_u("dataOut"); 
     31    dataIn_0 = new standardInterfacesMD_i::complexShort_p("dataIn"); 
    3232 
    3333 

  • ossiedev/trunk/components/amplifier-metadata/amplifier_metadata.h

    r8090 r8180  
    7373         
    7474        //list components provides and uses ports 
    75         standardInterfaces_i::complexShort_u *dataOut_0; 
    76         standardInterfaces_i::complexShort_p *dataIn_0; 
    77         standardInterfaces::MetaData *metadata; 
     75        standardInterfacesMD_i::complexShort_u *dataOut_0; 
     76        standardInterfacesMD_i::complexShort_p *dataIn_0; 
     77        standardInterfacesMD::MetaData *metadata; 
    7878         
    7979}; 

  • ossiedev/trunk/components/amplifier-metadata/main.cpp

    r8003 r8180  
    2727 
    2828using namespace std; 
    29 using namespace standardInterfaces;  // For standard OSSIE interface classes 
     29using namespace standardInterfacesMD;  // For standard OSSIE interface classes 
    3030 
    3131 

  • ossiedev/trunk/platform/USRP-metadata/src/USRP_metadata.cpp

    r8011 r8180  
    7272    // Create the ports for TX data 
    7373 
    74     tx_data_port = new standardInterfaces_i::complexShort_p("TX_Data", "DomainName1"); 
     74    tx_data_port = new standardInterfacesMD_i::complexShort_p("TX_Data", "DomainName1"); 
    7575 
    7676    // Create the ports for RX Data 
    7777 
    78     rx_data_1_port = new standardInterfaces_i::complexShort_u("RX_Data_1", "DomainName1"); 
    79     rx_data_2_port = new standardInterfaces_i::complexShort_u("RX_Data_2", "DomainName1"); 
     78    rx_data_1_port = new standardInterfacesMD_i::complexShort_u("RX_Data_1", "DomainName1"); 
     79    rx_data_2_port = new standardInterfacesMD_i::complexShort_u("RX_Data_2", "DomainName1"); 
    8080 
    8181} 

  • ossiedev/trunk/platform/USRP-metadata/src/USRP_metadata.h

    r8101 r8180  
    120120}; 
    121121 
    122 class TX_data_i : public POA_standardInterfaces::complexShortMD 
     122class TX_data_i : public POA_standardInterfacesMD::complexShortMD 
    123123 
    124124{ 
    … …  
    189189    USRP_metadata_TX_Control_i* tx_control_port; 
    190190 
    191     standardInterfaces_i::complexShort_u* rx_data_1_port; 
    192     standardInterfaces_i::complexShort_u* rx_data_2_port; 
    193  
    194     standardInterfaces_i::complexShort_p* tx_data_port; 
     191    standardInterfacesMD_i::complexShort_u* rx_data_1_port; 
     192    standardInterfacesMD_i::complexShort_u* rx_data_2_port; 
     193 
     194    standardInterfacesMD_i::complexShort_p* tx_data_port; 
    195195 
    196196    // usrp variables