[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/03: Removing trailing/extra whitespaces
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/03: Removing trailing/extra whitespaces before release (for master). |
|
Date: |
Mon, 7 Jul 2014 17:21:34 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit 78f56e07e24e0820a73ba2b24f4b8293bb3b3393
Author: Tom Rondeau <address@hidden>
Date: Mon Jul 7 12:27:52 2014 -0400
Removing trailing/extra whitespaces before release (for master).
We should be more careful about letting these into the code in the future.
In emacs, we can use (add-hook 'before-save-hook 'delete-trailing-whitespace).
---
gnuradio-runtime/include/gnuradio/basic_block.h | 2 +-
gnuradio-runtime/lib/pmt/unv_template.cc.t | 2 +-
.../python/gnuradio/gr/packet_utils.py | 10 ++++----
.../gnuradio/blocks/interleaved_short_to_complex.h | 2 +-
.../include/gnuradio/blocks/tsb_vector_sink_X.h.t | 10 ++++----
gr-blocks/lib/deinterleave_impl.cc | 10 ++++----
gr-blocks/lib/deinterleave_impl.h | 4 +--
gr-blocks/lib/interleave_impl.cc | 16 ++++++------
gr-blocks/lib/interleave_impl.h | 2 +-
gr-blocks/lib/interleaved_short_to_complex_impl.cc | 8 +++---
gr-blocks/lib/interleaved_short_to_complex_impl.h | 4 +--
gr-blocks/lib/tsb_vector_sink_X_impl.cc.t | 10 ++++----
gr-blocks/lib/tsb_vector_sink_X_impl.h.t | 10 ++++----
gr-blocks/python/blocks/qa_tsb_vector_sink_X.py | 12 ++++-----
grc/gui/ActionHandler.py | 30 +++++++++++-----------
grc/gui/Actions.py | 4 +--
grc/gui/Dialogs.py | 8 +++---
grc/gui/MainWindow.py | 26 +++++++++----------
volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h | 12 ++++-----
19 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h
b/gnuradio-runtime/include/gnuradio/basic_block.h
index b413274..066257d 100644
--- a/gnuradio-runtime/include/gnuradio/basic_block.h
+++ b/gnuradio-runtime/include/gnuradio/basic_block.h
@@ -275,7 +275,7 @@ namespace gr {
}
return false;
}
-
+
const msg_queue_map_t& get_msg_map(void) const {
return msg_queue;
}
diff --git a/gnuradio-runtime/lib/pmt/unv_template.cc.t
b/gnuradio-runtime/lib/pmt/unv_template.cc.t
index c8020e7..d3fa14b 100644
--- a/gnuradio-runtime/lib/pmt/unv_template.cc.t
+++ b/gnuradio-runtime/lib/pmt/unv_template.cc.t
@@ -90,7 +90,7 @@ address@hidden@vector(size_t k, const @TYPE@ *data)
pmt_t
address@hidden@vector(size_t k, const std::vector< @TYPE@ > &data)
{
-
+
return pmt_t(new address@hidden@vector(k, &data[0]));
}
diff --git a/gnuradio-runtime/python/gnuradio/gr/packet_utils.py
b/gnuradio-runtime/python/gnuradio/gr/packet_utils.py
index 7ae42e8..720cfd9 100644
--- a/gnuradio-runtime/python/gnuradio/gr/packet_utils.py
+++ b/gnuradio-runtime/python/gnuradio/gr/packet_utils.py
@@ -1,24 +1,24 @@
#!/usr/bin/env python
#
# Copyright 2013 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-#
+#
from gnuradio import gr
import pmt
diff --git a/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h
b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h
index 39304e8..fee4352 100644
--- a/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h
+++ b/gr-blocks/include/gnuradio/blocks/interleaved_short_to_complex.h
@@ -43,7 +43,7 @@ namespace gr {
* Build an interleaved short to complex block.
*/
static sptr make(bool vector_input=false, bool swap=false);
-
+
virtual void set_swap(bool swap)=0;
};
diff --git a/gr-blocks/include/gnuradio/blocks/tsb_vector_sink_X.h.t
b/gr-blocks/include/gnuradio/blocks/tsb_vector_sink_X.h.t
index ec7c7d4..03cc37a 100644
--- a/gr-blocks/include/gnuradio/blocks/tsb_vector_sink_X.h.t
+++ b/gr-blocks/include/gnuradio/blocks/tsb_vector_sink_X.h.t
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
-/*
+/*
* Copyright 2014 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gr-blocks/lib/deinterleave_impl.cc
b/gr-blocks/lib/deinterleave_impl.cc
index 5e1cc52..c9d0e9a 100644
--- a/gr-blocks/lib/deinterleave_impl.cc
+++ b/gr-blocks/lib/deinterleave_impl.cc
@@ -34,7 +34,7 @@ namespace gr {
{
return gnuradio::get_initial_sptr(new deinterleave_impl(itemsize,
blocksize));
}
-
+
deinterleave_impl::deinterleave_impl(size_t itemsize, unsigned int
blocksize)
: block("deinterleave",
io_signature::make (1, 1, itemsize),
@@ -51,7 +51,7 @@ namespace gr {
d_noutputs = noutputs;
return true;
}
-
+
int
deinterleave_impl::general_work(int noutput_items,
gr_vector_int& ninput_items,
@@ -60,14 +60,14 @@ namespace gr {
{
const char *in = (const char*)input_items[0];
char **out = (char**)&output_items[0];
-
+
memcpy(out[d_current_output], in, d_itemsize * d_blocksize);
consume_each(d_blocksize);
produce(d_current_output, d_blocksize);
d_current_output = (d_current_output + 1) % d_noutputs;
return WORK_CALLED_PRODUCE;
}
-
-
+
+
} /* namespace blocks */
} /* namespace gr */
diff --git a/gr-blocks/lib/deinterleave_impl.h
b/gr-blocks/lib/deinterleave_impl.h
index a7a9e0a..247ee3a 100644
--- a/gr-blocks/lib/deinterleave_impl.h
+++ b/gr-blocks/lib/deinterleave_impl.h
@@ -30,7 +30,7 @@ namespace gr {
class BLOCKS_API deinterleave_impl : public deinterleave
{
-
+
size_t d_itemsize;
unsigned int d_blocksize;
unsigned int d_current_output;
@@ -51,6 +51,6 @@ namespace gr {
} /* namespace blocks */
} /* namespace gr */
-
+
#endif /* INCLUDED_DEINTERLEAVE_IMPL_H */
diff --git a/gr-blocks/lib/interleave_impl.cc b/gr-blocks/lib/interleave_impl.cc
index 22d6488..3e5a829 100644
--- a/gr-blocks/lib/interleave_impl.cc
+++ b/gr-blocks/lib/interleave_impl.cc
@@ -29,12 +29,12 @@
namespace gr {
namespace blocks {
-
+
interleave::sptr interleave::make(size_t itemsize, unsigned int blocksize)
{
return gnuradio::get_initial_sptr(new interleave_impl(itemsize,
blocksize));
}
-
+
interleave_impl::interleave_impl(size_t itemsize, unsigned int blocksize)
: block("interleave",
io_signature::make (1, io_signature::IO_INFINITE, itemsize),
@@ -53,8 +53,8 @@ namespace gr {
set_output_multiple(d_blocksize * d_ninputs);
return true;
}
-
-
+
+
int
interleave_impl::fixed_rate_ninput_to_noutput(int ninput)
{
@@ -66,7 +66,7 @@ namespace gr {
{
return (int) ((noutput / d_ninputs) + .5);
}
-
+
void
interleave_impl::forecast(int noutput_items,
gr_vector_int& ninput_items_required)
@@ -85,7 +85,7 @@ namespace gr {
size_t noutput_blocks = (size_t) ((noutput_items/d_blocksize) + .5);
const char **in = (const char**)&input_items[0];
char *out = (char*)output_items[0];
-
+
for (unsigned int i = 0; i < noutput_blocks; i += d_ninputs) {
for (unsigned int n = 0; n < d_ninputs; n++){
memcpy(out, in[n], d_itemsize * d_blocksize);
@@ -98,7 +98,7 @@ namespace gr {
}
-
-
+
+
} /* namespace blocks */
} /* namespace gr */
diff --git a/gr-blocks/lib/interleave_impl.h b/gr-blocks/lib/interleave_impl.h
index c74127f..7675259 100644
--- a/gr-blocks/lib/interleave_impl.h
+++ b/gr-blocks/lib/interleave_impl.h
@@ -58,6 +58,6 @@ namespace gr {
} /* namespace blocks */
} /* namespace gr */
-
+
#endif /* INCLUDED_INTERLEAVE_IMPL_H */
diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.cc
b/gr-blocks/lib/interleaved_short_to_complex_impl.cc
index bb1e229..6c7108b 100644
--- a/gr-blocks/lib/interleaved_short_to_complex_impl.cc
+++ b/gr-blocks/lib/interleaved_short_to_complex_impl.cc
@@ -44,7 +44,7 @@ namespace gr {
d_vector_input(vector_input), d_swap(swap)
{
}
-
+
void interleaved_short_to_complex_impl::set_swap(bool swap)
{
d_swap = swap;
@@ -57,9 +57,9 @@ namespace gr {
{
const short *in = (const short *) input_items[0];
gr_complex *out = (gr_complex *) output_items[0];
-
+
interleaved_short_array_to_complex (in, out, 2 * noutput_items);
-
+
if (d_swap) {
float* p = (float*)output_items[0];
for (int i = 0; i < noutput_items; ++i) {
@@ -68,7 +68,7 @@ namespace gr {
p[2*i+0] = f;
}
}
-
+
return noutput_items;
}
diff --git a/gr-blocks/lib/interleaved_short_to_complex_impl.h
b/gr-blocks/lib/interleaved_short_to_complex_impl.h
index c7669f1..8370786 100644
--- a/gr-blocks/lib/interleaved_short_to_complex_impl.h
+++ b/gr-blocks/lib/interleaved_short_to_complex_impl.h
@@ -35,7 +35,7 @@ namespace gr {
bool d_swap;
public:
interleaved_short_to_complex_impl(bool vector_input=false, bool
swap=false);
-
+
void set_swap(bool swap);
int work(int noutput_items,
@@ -45,6 +45,6 @@ namespace gr {
} /* namespace blocks */
} /* namespace gr */
-
+
#endif /* INCLUDED_INTERLEAVED_SHORT_TO_COMPLEX_IMPL_H */
diff --git a/gr-blocks/lib/tsb_vector_sink_X_impl.cc.t
b/gr-blocks/lib/tsb_vector_sink_X_impl.cc.t
index 450339a..c5b79f9 100644
--- a/gr-blocks/lib/tsb_vector_sink_X_impl.cc.t
+++ b/gr-blocks/lib/tsb_vector_sink_X_impl.cc.t
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
-/*
+/*
* Copyright 2014 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gr-blocks/lib/tsb_vector_sink_X_impl.h.t
b/gr-blocks/lib/tsb_vector_sink_X_impl.h.t
index 8a97378..3bf5892 100644
--- a/gr-blocks/lib/tsb_vector_sink_X_impl.h.t
+++ b/gr-blocks/lib/tsb_vector_sink_X_impl.h.t
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
-/*
+/*
* Copyright 2014 Free Software Foundation, Inc.
- *
+ *
* This file is part of GNU Radio
- *
+ *
* GNU Radio is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
- *
+ *
* GNU Radio is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with GNU Radio; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
diff --git a/gr-blocks/python/blocks/qa_tsb_vector_sink_X.py
b/gr-blocks/python/blocks/qa_tsb_vector_sink_X.py
index aa7154e..ac3cd38 100755
--- a/gr-blocks/python/blocks/qa_tsb_vector_sink_X.py
+++ b/gr-blocks/python/blocks/qa_tsb_vector_sink_X.py
@@ -1,25 +1,25 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-#
+#
# Copyright 2014 Free Software Foundation, Inc.
-#
+#
# This file is part of GNU Radio
-#
+#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3, or (at your option)
# any later version.
-#
+#
# GNU Radio is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-#
+#
import pmt
from gnuradio import gr, gr_unittest
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index 6ad2d55..2c1c994 100644
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@ -49,7 +49,7 @@ class ActionHandler:
ActionHandler constructor.
Create the main window, setup the message handler, import the
preferences,
and connect all of the action handlers. Finally, enter the gtk main
loop and block.
-
+
Args:
file_paths: a list of flow graph file passed from command line
platform: platform module
@@ -81,7 +81,7 @@ class ActionHandler:
* some keys are ignored by the accelerators like the direction keys,
* some keys are not registered to any accelerators but are still used.
When not in focus, gtk and the accelerators handle the the key press.
-
+
Returns:
false to let gtk handle the key action
"""
@@ -95,7 +95,7 @@ class ActionHandler:
Handle the delete event from the main window.
Generated by pressing X to close, alt+f4, or right click+close.
This method in turns calls the state handler to quit.
-
+
Returns:
true
"""
@@ -175,14 +175,14 @@ class ActionHandler:
self.get_page().get_state_cache().save_new_state(self.get_flow_graph().export_data())
self.get_page().set_saved(False)
##################################################
- # Create heir block
+ # Create heir block
##################################################
elif action == Actions.BLOCK_CREATE_HIER:
# keeping track of coordinates for pasting later
coords =
self.get_flow_graph().get_selected_blocks()[0].get_coordinate()
x,y = coords
- x_min = x
+ x_min = x
y_min = y
pads = [];
@@ -201,9 +201,9 @@ class ActionHandler:
# If a block parameter exists that is a
parameter, create a parameter for it
if param.get_value() ==
flow_param.get_id():
params.append(param.get_value())
-
-
- # keep track of x,y mins for pasting later
+
+
+ # keep track of x,y mins for pasting later
(x,y) = block.get_coordinate()
if x < x_min:
x_min = x
@@ -215,8 +215,8 @@ class ActionHandler:
# Get id of connected blocks
source_id =
connection.get_source().get_parent().get_id()
sink_id =
connection.get_sink().get_parent().get_id()
-
- # If connected block is not in the list of
selected blocks create a pad for it
+
+ # If connected block is not in the list of
selected blocks create a pad for it
if self.get_flow_graph().get_block(source_id)
not in self.get_flow_graph().get_selected_blocks():
pads.append({'key':
connection.get_sink().get_key(), 'coord':
connection.get_source().get_coordinate(), 'block_id' : block.get_id(),
'direction': 'source'})
@@ -242,7 +242,7 @@ class ActionHandler:
# Remove the default samp_rate variable block that is
created
remove_me =
self.get_flow_graph().get_block("samp_rate")
- self.get_flow_graph().remove_element(remove_me)
+ self.get_flow_graph().remove_element(remove_me)
# Add the param blocks along the top of the window
@@ -298,9 +298,9 @@ class ActionHandler:
# Connect the pad to the proper sinks
new_connection =
self.get_flow_graph().connect(pad_source,sink)
- # update the new heir block flow graph
+ # update the new heir block flow graph
self.get_flow_graph().update()
-
+
##################################################
# Move/Rotate/Delete/Create
@@ -503,7 +503,7 @@ class ActionHandler:
self.get_flow_graph()._old_selected_port = None
self.get_flow_graph()._new_selected_port = None
Actions.ELEMENT_CREATE()
-
+
elif action == Actions.BUSSIFY_SINKS:
n = {'name':'bus', 'type':'bus'}
for b in self.get_flow_graph().get_selected_blocks():
@@ -571,7 +571,7 @@ class ExecFlowGraphThread(Thread):
def __init__ (self, action_handler):
"""
ExecFlowGraphThread constructor.
-
+
Args:
action_handler: an instance of an ActionHandler
"""
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py
index 3aa9e61..a9ab412 100644
--- a/grc/gui/Actions.py
+++ b/grc/gui/Actions.py
@@ -33,10 +33,10 @@ def handle_key_press(event):
"""
Call the action associated with the key press event.
Both the key value and the mask must have a match.
-
+
Args:
event: a gtk key press event
-
+
Returns:
true if handled
"""
diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py
index 0ffba8e..17562bf 100644
--- a/grc/gui/Dialogs.py
+++ b/grc/gui/Dialogs.py
@@ -29,7 +29,7 @@ class TextDisplay(gtk.TextView):
def __init__(self, text=''):
"""
TextDisplay constructor.
-
+
Args:
text: the text to display (string)
"""
@@ -106,16 +106,16 @@ class TextDisplay(gtk.TextView):
def MessageDialogHelper(type, buttons, title=None, markup=None):
"""
Create a modal message dialog and run it.
-
+
Args:
type: the type of message: gtk.MESSAGE_INFO, gtk.MESSAGE_WARNING,
gtk.MESSAGE_QUESTION or gtk.MESSAGE_ERROR
buttons: the predefined set of buttons to use:
gtk.BUTTONS_NONE, gtk.BUTTONS_OK, gtk.BUTTONS_CLOSE,
gtk.BUTTONS_CANCEL, gtk.BUTTONS_YES_NO, gtk.BUTTONS_OK_CANCEL
-
+
Args:
tittle: the title of the window (string)
markup: the message text with pango markup
-
+
Returns:
the gtk response from run()
"""
diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py
index f309d34..a2853bd 100644
--- a/grc/gui/MainWindow.py
+++ b/grc/gui/MainWindow.py
@@ -121,7 +121,7 @@ class MainWindow(gtk.Window):
Handle the delete event from the main window.
Generated by pressing X to close, alt+f4, or right click+close.
This method in turns calls the state handler to quit.
-
+
Returns:
true
"""
@@ -133,7 +133,7 @@ class MainWindow(gtk.Window):
Handle a page change. When the user clicks on a new tab,
reload the flow graph to update the vars window and
call handle states (select nothing) to update the buttons.
-
+
Args:
notebook: the notebook
page: new page
@@ -150,7 +150,7 @@ class MainWindow(gtk.Window):
def add_report_line(self, line):
"""
Place line at the end of the text buffer, then scroll its window all
the way down.
-
+
Args:
line: the new text
"""
@@ -164,7 +164,7 @@ class MainWindow(gtk.Window):
"""
Create a new notebook page.
Set the tab to be selected.
-
+
Args:
file_path: optional file to load into the flow graph
show: true if the page should be shown after loading
@@ -202,7 +202,7 @@ class MainWindow(gtk.Window):
def close_pages(self):
"""
Close all the pages in this notebook.
-
+
Returns:
true if all closed
"""
@@ -227,7 +227,7 @@ class MainWindow(gtk.Window):
Close the current page.
If the notebook becomes empty, and ensure is true,
call new page upon exit to ensure that at least one page exists.
-
+
Args:
ensure: boolean
"""
@@ -257,7 +257,7 @@ class MainWindow(gtk.Window):
Set the title of the main window.
Set the titles on the page tabs.
Show/hide the reports window.
-
+
Args:
title: the window title
"""
@@ -285,7 +285,7 @@ class MainWindow(gtk.Window):
def get_page(self):
"""
Get the selected page.
-
+
Returns:
the selected page
"""
@@ -294,7 +294,7 @@ class MainWindow(gtk.Window):
def get_flow_graph(self):
"""
Get the selected flow graph.
-
+
Returns:
the selected flow graph
"""
@@ -316,7 +316,7 @@ class MainWindow(gtk.Window):
def _set_page(self, page):
"""
Set the current page.
-
+
Args:
page: the page widget
"""
@@ -326,7 +326,7 @@ class MainWindow(gtk.Window):
def _save_changes(self):
"""
Save changes to flow graph?
-
+
Returns:
true if yes
"""
@@ -338,7 +338,7 @@ class MainWindow(gtk.Window):
def _get_files(self):
"""
Get the file names for all the pages, in order.
-
+
Returns:
list of file paths
"""
@@ -347,7 +347,7 @@ class MainWindow(gtk.Window):
def _get_pages(self):
"""
Get a list of all pages in the notebook.
-
+
Returns:
list of pages
"""
diff --git a/volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h
b/volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h
index dfed73b..7b29438 100644
--- a/volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h
+++ b/volk/kernels/volk/volk_8u_x4_conv_k7_r2_8u.h
@@ -36,7 +36,7 @@ static inline void BFLY(int i, int s, unsigned char * syms,
unsigned char *Y, un
int METRICSHIFT = 1;
int PRECISIONSHIFT = 2;
-
+
metric =0;
for(j=0;j<RATE;j++)
@@ -335,7 +335,7 @@ static inline void volk_8u_x4_conv_k7_r2_8u_spiral(unsigned
char* Y, unsigned ch
for(i=0;i<64/2;i++){
BFLY(i, (((framebits+excess) >> 1) << 1) + j , syms, Y, X, (decision_t
*)dec, Branchtab);
}
-
+
renormalize(Y, 210);
@@ -344,7 +344,7 @@ static inline void volk_8u_x4_conv_k7_r2_8u_spiral(unsigned
char* Y, unsigned ch
printf("%d,", Y[ch]);
}
printf("\n");*/
-
+
}
/*skip*/
return;
@@ -368,16 +368,16 @@ static inline void
volk_8u_x4_conv_k7_r2_8u_generic(unsigned char* Y, unsigned c
int s,i;
-
-
+
+
for (s=0;s<nbits;s++){
void *tmp;
for(i=0;i<NUMSTATES/2;i++){
BFLY(i, s, syms, Y, X, (decision_t *)dec, Branchtab);
}
-
+
renormalize(Y, RENORMALIZE_THRESHOLD);