Changeset 4405

Timestamp:

02/07/07 11:10:46

Author:

jcorgan

Message:

Applied changeset r4153 on trunk to release branch.

Files:

• gnuradio/branches/releases/3.0/usrp/host/lib/fusb_win32.cc (modified) (2 diffs)

gnuradio/branches/releases/3.0/usrp/host/lib/fusb_win32.cc

@@ -169 +169 @@
-        usb_submit_async(d_context[d_curr],
-                         &d_buffer[d_curr*d_block_size], d_block_size);
-
-
-
-
-       assert(d_output_short == 0)
-
-
-d_curr = (d_curr+1)%d_nblocks
-buf = &d_buffer[d_curr*d_block_size];
-
-if (d_outstanding_write != d_nblocks
-
-
-    retval = usb_reap_async(d_context[d_curr], USB_TIMEOUT)
-
-
-
-    return retval
-  }
-}
-
-
-
-d_output_short = d_block_size - bytes_to_write;
-
-
+
+
+
+
+    buf = &d_buffer[d_curr*d_block_size]
+
+
+    d_outstanding_write++
+  } else {
+
+    if (retval < 0
+
+
+         return retval
+
+
+
+int ncopy = std::min(bytes_to_write, d_block_size)
+memcpy(buf, (void *) &(((char*)buffer)[a]), ncopy);
+  bytes_to_write -= ncopy;
+
+
+
+  if (d_output_short == 0)
+
+
-
-  return retval < 0 ? retval : nbytes;
@@ -225 +225 @@
-        usb_submit_async(d_context[d_curr],
-                         &d_buffer[d_curr*d_block_size], d_block_size);
-
-
-
-
-       assert(d_input_leftover == 0)
-}
-
-
-d_curr = (d_curr+1)%d_nblocks;
-
-
-
-if (retval < 0)
-     fprintf(stderr, "%s: usb_reap_async: %s\n",
-                     __FUNCTION__, usb_strerror())
-
-
-
-d_input_leftover = d_block_size - bytes_to_read;
-
-
+
+
+
+
+    d_curr = (d_curr+1)%d_nblocks
+  buf = &d_buffer[d_curr*d_block_size];
+
+
+  if (retval < 0)
+
+
+
+  int ncopy = std::min(bytes_to_read, d_block_size);
+  memcpy((void *) &(((char*)buffer)[a]), buf, ncopy);
+  bytes_to_read -= ncopy
+
+
+
+  if (d_input_leftover == 0)
+
+
-
-  return retval < 0 ? retval : nbytes;