[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] gr-usrp ChangeLog src/usrp.py src/usrp1.i src/u...
|
From: |
Eric Blossom |
|
Subject: |
[Commit-gnuradio] gr-usrp ChangeLog src/usrp.py src/usrp1.i src/u... |
|
Date: |
Sat, 17 Jun 2006 18:18:42 +0000 |
CVSROOT: /sources/gnuradio
Module name: gr-usrp
Changes by: Eric Blossom <eb> 06/06/17 18:18:42
Modified files:
. : ChangeLog
src : usrp.py usrp1.i usrp1_sink_base.cc
usrp1_sink_base.h usrp1_sink_c.cc
usrp1_sink_c.h usrp1_sink_s.cc usrp1_sink_s.h
usrp1_source_base.cc usrp1_source_base.h
usrp1_source_c.cc usrp1_source_c.h
usrp1_source_s.cc usrp1_source_s.h
Log message:
Added fusb_block_size and fusb_nblocks to constructor args to that
applications can adjust the amount of buffering used by the
Fast USB Interface.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/ChangeLog?cvsroot=gnuradio&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp.py?cvsroot=gnuradio&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1.i?cvsroot=gnuradio&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_sink_base.cc?cvsroot=gnuradio&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_sink_base.h?cvsroot=gnuradio&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_sink_c.cc?cvsroot=gnuradio&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_sink_c.h?cvsroot=gnuradio&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_sink_s.cc?cvsroot=gnuradio&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_sink_s.h?cvsroot=gnuradio&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_source_base.cc?cvsroot=gnuradio&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_source_base.h?cvsroot=gnuradio&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_source_c.cc?cvsroot=gnuradio&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_source_c.h?cvsroot=gnuradio&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_source_s.cc?cvsroot=gnuradio&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gr-usrp/src/usrp1_source_s.h?cvsroot=gnuradio&r1=1.3&r2=1.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnuradio/gr-usrp/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- ChangeLog 12 May 2006 00:14:24 -0000 1.59
+++ ChangeLog 17 Jun 2006 18:18:42 -0000 1.60
@@ -1,3 +1,16 @@
+2006-06-17 Eric Blossom <address@hidden>
+
+ * src/usrp.py, src/usrp1.i, src/usrp1_sink_base.cc,
src/usrp1_sink_base.h,
+ src/usrp1_sink_c.cc, src/usrp1_sink_c.h, src/usrp1_sink_s.cc,
+ src/usrp1_sink_s.h, src/usrp1_source_base.cc, src/usrp1_source_base.h,
+ src/usrp1_source_c.cc, src/usrp1_source_c.h, src/usrp1_source_s.cc,
+ src/usrp1_source_s.h: changed constructor args to add
+ fusb_block_size and fusb_nblocks so that the application can
+ adjust the amount of buffering being done. [This was an awful lot
+ of files to have to touch to make this change. There must be an
+ easier way?]
+
+
2006-05-11 Martin Dudok van Heel <nldudok1 at olifantasia dot com>
Added synchronised multi_usrp support.
This work was funded by Toby Oliver at Sensus Analytics / Path
Intelligence.
Index: src/usrp.py
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/usrp.py 12 Mar 2006 02:22:33 -0000 1.24
+++ src/usrp.py 17 Jun 2006 18:18:42 -0000 1.25
@@ -204,9 +204,11 @@
class sink_c(usrp_common):
def __init__(self, which=0, interp_rate=128, nchan=1, mux=0x98,
+ fusb_block_size=0, fusb_nblocks=0,
fpga_filename="", firmware_filename=""):
_ensure_rev2(which)
self._u = usrp1.sink_c(which, interp_rate, nchan, mux,
+ fusb_block_size, fusb_nblocks,
fpga_filename, firmware_filename)
# Add the db attribute, which contains a 2-tuple of tuples of
daughterboard classes
self.db = (db_instantiator.instantiate(self._u, 0),
@@ -220,9 +222,11 @@
class sink_s(usrp_common):
def __init__(self, which=0, interp_rate=128, nchan=1, mux=0x98,
+ fusb_block_size=0, fusb_nblocks=0,
fpga_filename="", firmware_filename=""):
_ensure_rev2(which)
self._u = usrp1.sink_s(which, interp_rate, nchan, mux,
+ fusb_block_size, fusb_nblocks,
fpga_filename, firmware_filename)
# Add the db attribute, which contains a 2-tuple of tuples of
daughterboard classes
self.db = (db_instantiator.instantiate(self._u, 0),
@@ -236,9 +240,11 @@
class source_c(usrp_common):
def __init__(self, which=0, decim_rate=64, nchan=1, mux=0x32103210, mode=0,
+ fusb_block_size=0, fusb_nblocks=0,
fpga_filename="", firmware_filename=""):
_ensure_rev2(which)
self._u = usrp1.source_c(which, decim_rate, nchan, mux, mode,
+ fusb_block_size, fusb_nblocks,
fpga_filename, firmware_filename)
# Add the db attribute, which contains a 2-tuple of tuples of
daughterboard classes
self.db = (db_instantiator.instantiate(self._u, 0),
@@ -252,9 +258,11 @@
class source_s(usrp_common):
def __init__(self, which=0, decim_rate=64, nchan=1, mux=0x32103210, mode=0,
+ fusb_block_size=0, fusb_nblocks=0,
fpga_filename="", firmware_filename=""):
_ensure_rev2(which)
self._u = usrp1.source_s(which, decim_rate, nchan, mux, mode,
+ fusb_block_size, fusb_nblocks,
fpga_filename, firmware_filename)
# Add the db attribute, which contains a 2-tuple of tuples of
daughterboard classes
self.db = (db_instantiator.instantiate(self._u, 0),
Index: src/usrp1.i
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1.i,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/usrp1.i 12 May 2006 00:14:24 -0000 1.26
+++ src/usrp1.i 17 Jun 2006 18:18:42 -0000 1.27
@@ -55,6 +55,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -269,6 +271,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -556,6 +560,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -579,6 +585,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -606,6 +614,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -629,6 +639,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
Index: src/usrp1_sink_base.cc
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_sink_base.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/usrp1_sink_base.cc 19 Feb 2006 04:07:37 -0000 1.19
+++ src/usrp1_sink_base.cc 17 Jun 2006 18:18:42 -0000 1.20
@@ -37,6 +37,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
@@ -45,9 +47,6 @@
gr_make_io_signature (0, 0, 0)),
d_nunderruns (0)
{
- int fusb_block_size = 0; // take system default
- int fusb_nblocks = 8; // use a maximum of 8
output blocks (urb's)
-
d_usrp = usrp_standard_tx::make (which_board,
interp_rate,
nchan, mux,
Index: src/usrp1_sink_base.h
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_sink_base.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/usrp1_sink_base.h 19 Feb 2006 04:07:37 -0000 1.14
+++ src/usrp1_sink_base.h 17 Jun 2006 18:18:42 -0000 1.15
@@ -44,6 +44,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
Index: src/usrp1_sink_c.cc
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_sink_c.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/usrp1_sink_c.cc 19 Feb 2006 04:07:37 -0000 1.7
+++ src/usrp1_sink_c.cc 17 Jun 2006 18:18:42 -0000 1.8
@@ -34,6 +34,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
@@ -42,6 +44,8 @@
interp_rate,
nchan,
mux,
+ fusb_block_size,
+ fusb_nblocks,
fpga_filename,
firmware_filename
));
@@ -52,12 +56,15 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
: usrp1_sink_base ("usrp1_sink_c",
gr_make_io_signature (1, 1, sizeof (gr_complex)),
which_board, interp_rate, nchan, mux,
+ fusb_block_size, fusb_nblocks,
fpga_filename, firmware_filename)
{
}
Index: src/usrp1_sink_c.h
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_sink_c.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/usrp1_sink_c.h 19 Feb 2006 04:07:37 -0000 1.7
+++ src/usrp1_sink_c.h 17 Jun 2006 18:18:42 -0000 1.8
@@ -36,6 +36,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -54,6 +56,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -63,6 +67,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
Index: src/usrp1_sink_s.cc
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_sink_s.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/usrp1_sink_s.cc 19 Feb 2006 04:07:37 -0000 1.5
+++ src/usrp1_sink_s.cc 17 Jun 2006 18:18:42 -0000 1.6
@@ -34,6 +34,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
@@ -42,6 +44,8 @@
interp_rate,
nchan,
mux,
+ fusb_block_size,
+ fusb_nblocks,
fpga_filename,
firmware_filename
));
@@ -52,12 +56,15 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
: usrp1_sink_base ("usrp1_sink_s",
gr_make_io_signature (1, 1, sizeof (short)),
which_board, interp_rate, nchan, mux,
+ fusb_block_size, fusb_nblocks,
fpga_filename, firmware_filename)
{
set_output_multiple (512 / sizeof(short)); // don't change
Index: src/usrp1_sink_s.h
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_sink_s.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/usrp1_sink_s.h 19 Feb 2006 04:07:37 -0000 1.3
+++ src/usrp1_sink_s.h 17 Jun 2006 18:18:42 -0000 1.4
@@ -36,6 +36,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -53,6 +55,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -62,6 +66,8 @@
unsigned int interp_rate,
int nchan,
int mux,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
Index: src/usrp1_source_base.cc
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_source_base.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/usrp1_source_base.cc 12 May 2006 00:14:24 -0000 1.22
+++ src/usrp1_source_base.cc 17 Jun 2006 18:18:42 -0000 1.23
@@ -38,6 +38,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
@@ -48,8 +50,8 @@
{
d_usrp = usrp_standard_rx::make (which_board, decim_rate,
nchan, mux, mode,
- 0, // fusb_block_size
- 0, // fusb_nblocks
+ fusb_block_size,
+ fusb_nblocks,
fpga_filename,
firmware_filename);
if (d_usrp == 0)
Index: src/usrp1_source_base.h
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_source_base.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/usrp1_source_base.h 12 May 2006 00:14:24 -0000 1.21
+++ src/usrp1_source_base.h 17 Jun 2006 18:18:42 -0000 1.22
@@ -44,6 +44,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
Index: src/usrp1_source_c.cc
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_source_c.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/usrp1_source_c.cc 19 Feb 2006 04:07:37 -0000 1.8
+++ src/usrp1_source_c.cc 17 Jun 2006 18:18:42 -0000 1.9
@@ -37,6 +37,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
@@ -46,6 +48,8 @@
nchan,
mux,
mode,
+ fusb_block_size,
+ fusb_nblocks,
fpga_filename,
firmware_filename
));
@@ -57,12 +61,15 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
: usrp1_source_base ("usrp1_source_c",
gr_make_io_signature (1, 1, sizeof (gr_complex)),
which_board, decim_rate, nchan, mux, mode,
+ fusb_block_size, fusb_nblocks,
fpga_filename, firmware_filename)
{
}
Index: src/usrp1_source_c.h
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_source_c.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/usrp1_source_c.h 19 Feb 2006 04:07:37 -0000 1.6
+++ src/usrp1_source_c.h 17 Jun 2006 18:18:42 -0000 1.7
@@ -41,6 +41,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -56,6 +58,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -66,6 +70,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
Index: src/usrp1_source_s.cc
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_source_s.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/usrp1_source_s.cc 19 Feb 2006 04:07:37 -0000 1.5
+++ src/usrp1_source_s.cc 17 Jun 2006 18:18:42 -0000 1.6
@@ -37,6 +37,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
@@ -46,6 +48,8 @@
nchan,
mux,
mode,
+ fusb_block_size,
+ fusb_nblocks,
fpga_filename,
firmware_filename
));
@@ -57,12 +61,16 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error)
: usrp1_source_base ("usrp1_source_s",
gr_make_io_signature (1, 1, sizeof (short)),
which_board, decim_rate, nchan, mux, mode,
+ fusb_block_size,
+ fusb_nblocks,
fpga_filename, firmware_filename)
{
}
Index: src/usrp1_source_s.h
===================================================================
RCS file: /sources/gnuradio/gr-usrp/src/usrp1_source_s.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/usrp1_source_s.h 19 Feb 2006 04:07:37 -0000 1.3
+++ src/usrp1_source_s.h 17 Jun 2006 18:18:42 -0000 1.4
@@ -41,6 +41,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -58,6 +60,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
@@ -68,6 +72,8 @@
int nchan,
int mux,
int mode,
+ int fusb_block_size,
+ int fusb_nblocks,
const std::string fpga_filename,
const std::string firmware_filename
) throw (std::runtime_error);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] gr-usrp ChangeLog src/usrp.py src/usrp1.i src/u...,
Eric Blossom <=