summaryrefslogtreecommitdiff
path: root/usrp/host/lib/usrp_basic_libusb1.cc
diff options
context:
space:
mode:
authorttsou2009-09-14 00:08:02 -0400
committerttsou2009-09-16 17:08:52 -0400
commit0f03f1c1d460d865aeff91b9538266b0b210a357 (patch)
tree12d6281362c71538c6be8a1adc52774021e2af2f /usrp/host/lib/usrp_basic_libusb1.cc
parent2c30dff7d519987a0f239f29f09e340d203c0148 (diff)
downloadgnuradio-0f03f1c1d460d865aeff91b9538266b0b210a357.tar.gz
gnuradio-0f03f1c1d460d865aeff91b9538266b0b210a357.tar.bz2
gnuradio-0f03f1c1d460d865aeff91b9538266b0b210a357.zip
Combined additiona usrp_prims code
Diffstat (limited to 'usrp/host/lib/usrp_basic_libusb1.cc')
-rw-r--r--usrp/host/lib/usrp_basic_libusb1.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/usrp/host/lib/usrp_basic_libusb1.cc b/usrp/host/lib/usrp_basic_libusb1.cc
index b1e3a5e3e..64cff6078 100644
--- a/usrp/host/lib/usrp_basic_libusb1.cc
+++ b/usrp/host/lib/usrp_basic_libusb1.cc
@@ -44,13 +44,6 @@ using namespace ad9862;
#define NELEM(x) (sizeof (x) / sizeof (x[0]))
-// These set the buffer size used for each end point using the fast
-// usb interface. The kernel ends up locking down this much memory.
-
-static const int FUSB_BUFFER_SIZE = fusb_sysconfig::default_buffer_size();
-static const int FUSB_BLOCK_SIZE = fusb_sysconfig::max_block_size();
-static const int FUSB_NBLOCKS = FUSB_BUFFER_SIZE / FUSB_BLOCK_SIZE;
-
static const double POLLING_INTERVAL = 0.1; // seconds
@@ -103,7 +96,6 @@ usrp_basic::usrp_basic (int which_board,
*/
memset (d_fpga_shadows, 0, sizeof (d_fpga_shadows));
-// d_ctx = usrp_one_time_init(true);
usrp_one_time_init (&d_ctx);
if (!usrp_load_standard_bits (which_board, false, fpga_filename, firmware_filename, d_ctx))
@@ -144,9 +136,8 @@ usrp_basic::~usrp_basic ()
if (d_udh)
libusb_close (d_udh);
- // Each object should be running in it's own context. If running in default
- // context then leave the instance open as it may be shared. This might
- // occur in mixed libusb-0.12 and libusb-1.0 environments.
+ // Each object _should_ be running in its own context. If running in default
+ // context then leave the instance open as it may be shared.
if (d_ctx != NULL)
libusb_exit (d_ctx);