[Commit-gnuradio] [gnuradio] 01/03: digital: added missing parameter to additive scrambler GRC block; cleaned up whitespace

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch maint
in repository gnuradio.

commit db9e1914b5418e05a52e1e6f4ab8ac36f6b4735b
Author: Sean Nowlan <address@hidden>
Date:   Wed May 6 11:05:23 2015 -0400

    digital: added missing parameter to additive scrambler GRC block; cleaned 
up whitespace
---
 gr-digital/grc/digital_additive_scrambler_bb.xml            | 10 ++++++++--
 gr-digital/include/gnuradio/digital/additive_scrambler_bb.h |  2 +-
 gr-digital/lib/additive_scrambler_bb_impl.cc                |  6 +++---
 gr-digital/lib/additive_scrambler_bb_impl.h                 |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/gr-digital/grc/digital_additive_scrambler_bb.xml 
b/gr-digital/grc/digital_additive_scrambler_bb.xml
index df881eb..2bb06e4 100644
--- a/gr-digital/grc/digital_additive_scrambler_bb.xml
+++ b/gr-digital/grc/digital_additive_scrambler_bb.xml
@@ -8,7 +8,7 @@
        <name>Additive Scrambler</name>
        <key>digital_additive_scrambler_bb</key>
        <import>from gnuradio import digital</import>
-       <make>digital.additive_scrambler_bb($mask, $seed, $len, $count, 
reset_tag_key=$reset_tag_key)</make>
+       <make>digital.additive_scrambler_bb($mask, $seed, $len, count=$count, 
bits_per_byte=$bits_per_byte, reset_tag_key=$reset_tag_key)</make>
        <param>
                <name>Mask</name>
                <key>mask</key>
@@ -34,9 +34,15 @@
                <type>int</type>
        </param>
        <param>
+               <name>Bits per byte</name>
+               <key>bits_per_byte</key>
+               <value>1</value>
+               <type>int</type>
+       </param>
+       <param>
                <name>Reset tag key</name>
                <key>reset_tag_key</key>
-               <value></value>
+               <value>""</value>
                <type>string</type>
        </param>
        <sink>
diff --git a/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h 
b/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h
index 88e1299..e89e452 100644
--- a/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h
+++ b/gr-digital/include/gnuradio/digital/additive_scrambler_bb.h
@@ -28,7 +28,7 @@
 
 namespace gr {
   namespace digital {
-    
+
     /*!
      * \ingroup coding_blk
      *
diff --git a/gr-digital/lib/additive_scrambler_bb_impl.cc 
b/gr-digital/lib/additive_scrambler_bb_impl.cc
index 96e1fbb..58a2455 100644
--- a/gr-digital/lib/additive_scrambler_bb_impl.cc
+++ b/gr-digital/lib/additive_scrambler_bb_impl.cc
@@ -29,7 +29,7 @@
 
 namespace gr {
   namespace digital {
-    
+
     additive_scrambler_bb::sptr
     additive_scrambler_bb::make (int mask, int seed,
                                 int len, int count,
@@ -67,8 +67,8 @@ namespace gr {
     }
 
     int
-    additive_scrambler_bb_impl::mask() const 
-    { 
+    additive_scrambler_bb_impl::mask() const
+    {
       return d_lfsr.mask();
     }
 
diff --git a/gr-digital/lib/additive_scrambler_bb_impl.h 
b/gr-digital/lib/additive_scrambler_bb_impl.h
index a3b31c0..da77351 100644
--- a/gr-digital/lib/additive_scrambler_bb_impl.h
+++ b/gr-digital/lib/additive_scrambler_bb_impl.h
@@ -28,7 +28,7 @@
 
 namespace gr {
   namespace digital {
-    
+
     class additive_scrambler_bb_impl
       : public additive_scrambler_bb
     {