Changeset 6065

Show
Ignore:
Timestamp:
07/26/07 08:17:08
Author:
jcorgan
Message:

Applied changeset r5253 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/releases/3.0/usrp/host/lib/fusb.h

    r3601 r6065  
    120120 
    121121  /*! 
    122    * \brief returns max block size hard limit 
     122   * \brief Returns max block size in bytes (hard limit). 
    123123   */ 
    124124  static int max_block_size (); 
    125125 
    126126  /*! 
    127    * \brief returns the default buffer size 
     127   * \brief Returns default block size in bytes. 
     128   */ 
     129  static int default_block_size (); 
     130 
     131  /*! 
     132   * \brief Returns the default buffer size in bytes. 
    128133   */ 
    129134  static int default_buffer_size (); 

  • gnuradio/branches/releases/3.0/usrp/host/lib/fusb_sysconfig_darwin.cc

    r3601 r6065  
    2525 
    2626static const int MAX_BLOCK_SIZE = 32 * 1024;            // hard limit 
    27 static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);     // 2 MB (was 8 MB) 
     27static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);     // 2 MB 
    2828 
    2929fusb_devhandle * 
    …… 
    3838} 
    3939 
     40int fusb_sysconfig::default_block_size () 
     41{ 
     42  return fusb_sysconfig::max_block_size (); 
     43} 
     44 
    4045int fusb_sysconfig::default_buffer_size () 
    4146{ 

  • gnuradio/branches/releases/3.0/usrp/host/lib/fusb_sysconfig_generic.cc

    r3601 r6065  
    2525 
    2626static const int MAX_BLOCK_SIZE = 16 * 1024;            // hard limit 
    27 static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);     // 2 MB (was 8 MB) 
     27static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);     // 2 MB 
    2828 
    2929fusb_devhandle * 
    …… 
    3838} 
    3939 
     40int fusb_sysconfig::default_block_size () 
     41{ 
     42  return fusb_sysconfig::max_block_size (); 
     43} 
     44 
    4045int fusb_sysconfig::default_buffer_size () 
    4146{ 

  • gnuradio/branches/releases/3.0/usrp/host/lib/fusb_sysconfig_linux.cc

    r3601 r6065  
    2424#include <fusb_linux.h> 
    2525 
    26 static const int MAX_BLOCK_SIZE = 16 * 1024;            // hard limit 
    27 static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);     // 2 MB (was 8 MB) 
     26static const int MAX_BLOCK_SIZE     =  16 * 1024;       // hard limit 
     27static const int DEFAULT_BLOCK_SIZE =   4 * 1024;       // fewer kernel memory problems 
     28static const int FUSB_BUFFER_SIZE   =   1 * (1L << 20); // 1MB 
    2829 
    2930fusb_devhandle * 
    …… 
    3839} 
    3940 
     41int fusb_sysconfig::default_block_size () 
     42{ 
     43  return DEFAULT_BLOCK_SIZE; 
     44} 
     45 
    4046int fusb_sysconfig::default_buffer_size () 
    4147{ 

  • gnuradio/branches/releases/3.0/usrp/host/lib/fusb_sysconfig_ra_wb.cc

    r3601 r6065  
    4242} 
    4343 
     44int fusb_sysconfig::default_block_size () 
     45{ 
     46  return fusb_sysconfig::max_block_size (); 
     47} 
     48 
    4449int fusb_sysconfig::default_buffer_size () 
    4550{ 

  • gnuradio/branches/releases/3.0/usrp/host/lib/fusb_sysconfig_win32.cc

    r3601 r6065  
    2525 
    2626static const int MAX_BLOCK_SIZE = 64 * 1024;            // Windows kernel hard limit 
    27 static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);     // 2 MB (was 8 MB) 
     27static const int FUSB_BUFFER_SIZE = 2 * (1L << 20);     // 2 MB 
    2828         
    2929fusb_devhandle * 
    …… 
    3838} 
    3939 
     40int fusb_sysconfig::default_block_size () 
     41{ 
     42  return fusb_sysconfig::max_block_size (); 
     43} 
     44 
    4045int fusb_sysconfig::default_buffer_size () 
    4146{ 

  • gnuradio/branches/releases/3.0/usrp/host/lib/usrp_basic.cc

    r3601 r6065  
    476476   
    477477  if (fusb_block_size == 0) 
    478     fusb_block_size = FUSB_BLOCK_SIZE; 
     478    fusb_block_size = fusb_sysconfig::default_block_size(); 
    479479 
    480480  if (fusb_nblocks == 0)