Changeset 9517

Timestamp:

08/19/09 22:15:31 (4 years ago)

Author:

ttsou

Message:

hopeful simutaneous tx-rx using separate libusb_contexts

Location:

ossiedev/branches/ttsou/gnuradio/usrp/host/lib

Files:

• fusb_libusb1.cc (modified) (7 diffs)
• usrp_basic.cc (modified) (3 diffs)
• usrp_prims.cc (modified) (4 diffs)

ossiedev/branches/ttsou/gnuradio/usrp/host/lib/fusb_libusb1.cc

@@ -125 +125 @@
 // ------------------------------------------------------------------------
 
-fusb_devhandle_libusb1::fusb_devhandle_libusb1 (libusb_device_handle *udh)
-  : fusb_devhandle (udh), d_teardown (false)
+fusb_devhandle_libusb1::fusb_devhandle_libusb1 (libusb_device_handle *udh,
+                                                libusb_context *ctx)
+  : fusb_devhandle (udh), d_ctx (ctx), d_teardown (false)
 {
   // that's it 
@@ -259 +260 @@
 }
 
+
+bool
+fusb_devhandle_libusb1::_reap (bool ok_to_block_p)
+{
+  int ret;
+  if ((ret = libusb_handle_events(ctx)) < 0)
+    fprintf (stderr, "fusb::_reap libusb_handle_events()\n");
+   
+}
+
 void
 fusb_devhandle_libusb1::_wait_for_completion ()
@@ -268 +279 @@
   tv.tv_usec =  0;
 
-  // The regular libusb_handle_events sets a hardcoded timeout of 2
-  // seconds. Most of these calls should be changed to appropriate block / non-
-  // blocking version using libusb_handle_events_timeout. This was just a test
-  // usage. 
-
-  while (!d_pending_rqsts.empty ()) {
-    if ((ret = libusb_handle_events_timeout(NULL, &tv)) < 0) {
-      fprintf (stderr, "fusb: libusb_handle_events error %d\n", ret);
-      break;
-    }
-  }
+  while (!d_pending_rqsts.empty ()) 
+    if (!_reap(true)) 
+      break; 
 
 }
@@ -391 +394 @@
 
   d_devhandle->_cancel_pending_rqsts (this);
-
-  // Do work, reap transfers, etc. 
-  if (libusb_handle_events(NULL) < 0) { 
-    perror ("fusb::libusb_handle_events");
-    return false;
-  }
+  d_devhandle->_reap (false);
 
   while (1) {
@@ -406 +404 @@
       break;
 
-    if (libusb_handle_events(NULL) < 0) {
-      perror ("fusb::libusb_handle_events");
-      return false;
-    }
+    if (!d_devhandle->_reap(true))
+      break;
   }
 
@@ -516 +512 @@
     }
 
-    // Do work, reap transfers, etc. 
-    libusb_handle_events(NULL);
+    if (!d_devhandle->_reap (true))
+      return 0;
   }
 }
@@ -605 +601 @@
 
     while ((lut = completed_list_get ()) == 0 ) {
-      if (libusb_handle_events(NULL) < 0) 
-        fprintf (stderr, "fusb: libusb_handle_events\n");
-    }
+      if (!d_devhandle->_reap(true))
+        return false; 
 
     if (lut->status != LIBUSB_TRANSFER_COMPLETED) {

ossiedev/branches/ttsou/gnuradio/usrp/host/lib/usrp_basic.cc

@@ -109 +109 @@
                         const std::string fpga_filename,
                         const std::string firmware_filename)
-  : d_udh (0),
+  : d_udh (0), d_ctx (0),
     d_usb_data_rate (16000000), // SWAG, see below
     d_bytes_per_poll ((int) (POLLING_INTERVAL * d_usb_data_rate)),
@@ -126 +126 @@
   memset (d_fpga_shadows, 0, sizeof (d_fpga_shadows));
 
-  usrp_one_time_init ();
+  usrp_one_time_init (d_ctx);
 
   if (!usrp_load_standard_bits (which_board, false, fpga_filename, firmware_filename))
     throw std::runtime_error ("usrp_basic/usrp_load_standard_bits");
 
-  struct libusb_device *dev = usrp_find_device (which_board);
+  struct libusb_device *dev = usrp_find_device (d_ctx, which_board);
   if (dev == 0){
     fprintf (stderr, "usrp_basic: can't find usrp[%d]\n", which_board);
@@ -181 +181 @@
   // exits nicely. 
 
-  //libusb_exit (NULL);
+  // Trying to keep this enabled with contexts
+
+  libusb_exit (d_ctx);
 }
 

ossiedev/branches/ttsou/gnuradio/usrp/host/lib/usrp_prims.cc

@@ -105 +105 @@
 
 void
-usrp_one_time_init ()
+usrp_one_time_init (libusb_context *ctx)
 {
   static bool first = true;
@@ -111 +111 @@
   if (first){
     first = false;
-    libusb_init (NULL);                 // usb library init
+    libusb_init (&ctx);                 // usb library init
   }
 }
@@ -205 +205 @@
 
 struct libusb_device *
-usrp_find_device (int nth, bool fx2_ok_p)
+usrp_find_device (int nth, bool fx2_ok_p, libusb_context *ctx)
 {
   libusb_device **list;
@@ -212 +212 @@
   int    n_found = 0;
 
-  usrp_one_time_init ();
+  // Why is this init necessary? It throws off context use of libusb
+  //usrp_one_time_init ();
  
-  size_t cnt = libusb_get_device_list(NULL, &list);
+  size_t cnt = libusb_get_device_list(ctx, &list);
   size_t i = 0;