Show
Ignore:
Timestamp:
08/17/07 12:13:44 (7 years ago)
Author:
jgaeddert
Message:

minor support for metadata in USRP branch

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • platform/USRP/branches/USRP-metadata/src/USRP.h

    r4522 r4747  
    7676    USRP_RX_Control_i();  // No default constructor 
    7777    USRP_RX_Control_i(const USRP_RX_Control_i &); // No copying 
     78 
     79    /// return pointer to daughterboard 
     80    void get_db_reference(unsigned long channel, db_base *& db); 
    7881  
    7982    USRP_i *usrp; 
     
    127130    ~TX_data_i(); 
    128131 
    129     void pushPacket(const PortTypes::ShortSequence &I, const PortTypes::ShortSequence &Q); 
     132    void pushPacket( 
     133            const PortTypes::ShortSequence &I, 
     134            const PortTypes::ShortSequence &Q, 
     135            const standardInterfaces::MetaData &packet_data); 
    130136 
    131137 private: 
     
    142148 
    143149// Main USRP device definition 
    144 void rx_data_process(void *data); 
    145150 
    146151class USRP_i : public virtual Device_impl 
     
    150155    friend class USRP_TX_Control_i; 
    151156 
    152     friend void rx_data_process(void *); 
    153  
    154157  public: 
    155158    USRP_i(char *id, char *label, char *profile); 
     159 
     160    /// Destructor 
     161    ~USRP_i(); 
    156162 
    157163    static void do_rx_data_process(void *u) {((USRP_i *)u)->rx_data_process(); }; 
     
    179185    USRP_i(const USRP_i&);  // No copying 
    180186 
    181     // RX data processing thread 
    182     //    static void rx_data_process(void * data); ///\todo verify statis is the online way 
    183  
    184187    /// Prints warning about unsupported USRP daughter boards 
    185188    void PrintDaughterboardWarning(const char * db_name); 
     
    191194    standardInterfaces_i::complexShort_u* rx_data_1_port; 
    192195    standardInterfaces_i::complexShort_u* rx_data_2_port; 
     196    standardInterfaces::MetaData* rx_metadata_1; 
     197    standardInterfaces::MetaData* rx_metadata_2; 
    193198 
    194199    standardInterfaces_i::complexShort_p* tx_data_port; 
     200    standardInterfaces::MetaData* tx_metadata; 
    195201 
    196202    // usrp variables 
     
    213219    omni_thread *tx_thread; 
    214220 
     221    /// Main RX processing thread 
    215222    void rx_data_process(); 
     223 
     224    /// Main TX processing thread 
    216225    void tx_data_process(); 
    217226