Changeset 8342

Show
Ignore:
Timestamp:
05/09/08 01:04:20
Author:
jcorgan
Message:

Applied fusb portion of changeset r8295 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/releases/3.1/usrp/host/lib/legacy/fusb_linux.cc

    r6044 r8342  
    387387  if (!d_started) 
    388388    return true; 
    389    
    390   d_devhandle->_cancel_pending_rqsts (this); 
    391   d_devhandle->_reap (false); 
    392  
    393  
    394   usbdevfs_urb *urb; 
    395   while ((urb = completed_list_get ()) != 0) 
    396     free_list_add (urb); 
    397389 
    398390  if (d_write_work_in_progress){ 
    …… 
    408400  } 
    409401 
    410   if (d_free_list.size () != (unsigned) d_nblocks) 
    411     fprintf (stderr, "d_free_list.size () = %d, d_nblocks = %d\n", 
    412              d_free_list.size (), d_nblocks); 
    413      
    414   assert (d_free_list.size () == (unsigned) d_nblocks); 
     402  d_devhandle->_cancel_pending_rqsts (this); 
     403  d_devhandle->_reap (false); 
     404 
     405  while (1){ 
     406    usbdevfs_urb *urb; 
     407    while ((urb = completed_list_get ()) != 0) 
     408      free_list_add (urb); 
     409 
     410    if (d_free_list.size () == (unsigned) d_nblocks) 
     411      break; 
     412 
     413    d_devhandle->_reap(true); 
     414  } 
    415415 
    416416  d_started = false;