Changeset 8634

Show
Ignore:
Timestamp:
01/30/09 20:19:14 (4 years ago)
Author:
ttsou
Message:

removed double lock

Location:
ossiedev/branches/ttsou/dist/platform/USRP/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • ossiedev/branches/ttsou/dist/platform/USRP/src/USRP.cpp

    r8606 r8634  
    189189 
    190190    usrp_rx->stop(); 
    191     rx_active = 0; 
     191    rx_active = false; 
    192192    rx_thread->exit(); 
    193193} 

  • ossiedev/branches/ttsou/dist/platform/USRP/src/port_impl.cpp

    r8609 r8634  
    160160    } 
    161161 
    162     if (!usrp->tx_active) 
     162    if (!usrp->tx_active) { 
    163163        usrp->usrp_tx->start(); 
    164  
    165     usrp->tx_thread = new omni_thread(USRP_i::do_tx_data_process, ((void *)usrp)); 
    166     usrp->tx_thread->start(); 
     164        usrp->tx_thread = new omni_thread(USRP_i::do_tx_data_process, ((void *)usrp)); 
     165        usrp->tx_thread->start(); 
     166    } 
    167167} 
    168168 
    … …  
    180180 
    181181    usrp->tx_active = false; 
    182  
    183     if (usrp->tx_active) 
    184         usrp->usrp_tx->stop(); 
     182   
     183    // Previously never called  
     184    //usrp->usrp_tx->stop(); 
    185185} 
    186186 
    … …  
    188188{ 
    189189    DEBUG(3, USRP, "USRP TX setting " << values.length() << " values, value[0].id " << values[0].id) 
    190  
    191     omni_mutex_lock l(usrp->tx_control_access); 
    192190 
    193191    for (unsigned int i =0; i < values.length(); ++i) {