Merged r10071:10164 from features/cppdb-test into trunk. Implements the fully native C++ API for the USRP.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10165 221aa14e-8319-0410-a670-987f0aec2ac5

3 files changed, 15 insertions, 15 deletions

diff --git a/gnuradio-examples/python/multi-antenna/multi_fft.py b/gnuradio-examples/python/multi-antenna/multi_fft.py
index 0f1dbb102..54d8286d4 100755
--- a/gnuradio-examples/python/multi-antenna/multi_fft.py
+++ b/gnuradio-examples/python/multi-antenna/multi_fft.py
@@ -49,9 +49,9 @@ class my_graph(stdgui2.std_top_block):
             sw_decim = 1
 
         self.u = usrp.source_c(0, options.decim, fpga_filename="std_4rx_0tx.rbf")
-        if self.u.nddc() < nchan:
+        if self.u.nddcs() < nchan:
             sys.stderr.write('This code requires an FPGA build with %d DDCs.  This FPGA has only %d.\n' % (
-                nchan, self.u.nddc()))
+                nchan, self.u.nddcs()))
             raise SystemExit
                              
         if not self.u.set_nchannels(nchan):
@@ -62,11 +62,11 @@ class my_graph(stdgui2.std_top_block):
         print "USB data rate   = %s" % (eng_notation.num_to_str(input_rate),)
         print "Scope data rate = %s" % (eng_notation.num_to_str(input_rate/sw_decim),)
 
-        self.subdev = self.u.db[0] + self.u.db[1]
+        self.subdev = self.u.db(0) + self.u.db(1)
 
         if (len (self.subdev) != 4 or
-            self.u.db[0][0].dbid() != usrp_dbid.BASIC_RX or
-            self.u.db[1][0].dbid() != usrp_dbid.BASIC_RX):
+            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX or
+            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX):
             sys.stderr.write('This code requires a Basic Rx board on Sides A & B\n')
             sys.exit(1)
 
diff --git a/gnuradio-examples/python/multi-antenna/multi_file.py b/gnuradio-examples/python/multi-antenna/multi_file.py
index f887b9cf6..6f09546ea 100755
--- a/gnuradio-examples/python/multi-antenna/multi_file.py
+++ b/gnuradio-examples/python/multi-antenna/multi_file.py
@@ -54,9 +54,9 @@ class my_graph(gr.top_block):
             sw_decim = 1
 
         self.u = usrp.source_c(0, options.decim, fpga_filename="std_4rx_0tx.rbf")
-        if self.u.nddc() < nchan:
+        if self.u.nddcs() < nchan:
             sys.stderr.write('This code requires an FPGA build with %d DDCs.  This FPGA has only %d.\n' % (
-                nchan, self.u.nddc()))
+                nchan, self.u.nddcs()))
             raise SystemExit
                              
         if not self.u.set_nchannels(nchan):
@@ -68,11 +68,11 @@ class my_graph(gr.top_block):
         sink_data_rate = input_rate/sw_decim
         print "Scope data rate = %s" % (eng_notation.num_to_str(sink_data_rate),)
 
-        self.subdev = self.u.db[0] + self.u.db[1]
+        self.subdev = self.u.db(0) + self.u.db(1)
 
         if (len(self.subdev) != 4 or
-            self.u.db[0][0].dbid() != usrp_dbid.BASIC_RX or
-            self.u.db[1][0].dbid() != usrp_dbid.BASIC_RX):
+            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX or
+            self.u.db(1, 0).dbid() != usrp_dbid.BASIC_RX):
             sys.stderr.write('This code requires a Basic Rx board on Sides A & B\n')
             sys.exit(1)
 
diff --git a/gnuradio-examples/python/multi-antenna/multi_scope.py b/gnuradio-examples/python/multi-antenna/multi_scope.py
index 8db183d6f..5d6b1e920 100755
--- a/gnuradio-examples/python/multi-antenna/multi_scope.py
+++ b/gnuradio-examples/python/multi-antenna/multi_scope.py
@@ -49,9 +49,9 @@ class my_top_block(stdgui2.std_top_block):
             sw_decim = 1
 
         self.u = usrp.source_c(0, options.decim, fpga_filename="std_4rx_0tx.rbf")
-        if self.u.nddc() < nchan:
+        if self.u.nddcs() < nchan:
             sys.stderr.write('This code requires an FPGA build with %d DDCs.  This FPGA has only %d.\n' % (
-                nchan, self.u.nddc()))
+                nchan, self.u.nddcs()))
             raise SystemExit
                              
         if not self.u.set_nchannels(nchan):
@@ -62,11 +62,11 @@ class my_top_block(stdgui2.std_top_block):
         print "USB data rate   = %s" % (eng_notation.num_to_str(input_rate),)
         print "Scope data rate = %s" % (eng_notation.num_to_str(input_rate/sw_decim),)
 
-        self.subdev = self.u.db[0] + self.u.db[1]
+        self.subdev = self.u.db(0) + self.u.db(1)
 
         if (len(self.subdev) != 4 or
-            self.u.db[0][0].dbid() != usrp_dbid.BASIC_RX or
-            self.u.db[1][0].dbid() != usrp_dbid.BASIC_RX):
+            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX or
+            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX):
             sys.stderr.write('This code requires a Basic Rx board on Sides A & B\n')
             sys.exit(1)