<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/14891">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: Fix trailing whitespace in several files<br><br>Change-Id: Ifafb68353960fc5046661854ccfb8d783b0efb14<br>---<br>M CommonLibs/Interthread.h<br>M CommonLibs/Timeval.cpp<br>M GSM/GSMCommon.h<br>M Transceiver52M/Channelizer.cpp<br>M Transceiver52M/ChannelizerBase.cpp<br>M Transceiver52M/Resampler.cpp<br>M Transceiver52M/Resampler.h<br>M Transceiver52M/Synthesis.cpp<br>M Transceiver52M/arch/arm/mult_neon.S<br>M Transceiver52M/arch/common/convert_base.c<br>M Transceiver52M/arch/common/fft.c<br>M Transceiver52M/radioBuffer.cpp<br>M tests/CommonLibs/BitVectorTest.cpp<br>13 files changed, 40 insertions(+), 41 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/Interthread.h b/CommonLibs/Interthread.h</span><br><span>index 42e6f7f..185112f 100644</span><br><span>--- a/CommonLibs/Interthread.h</span><br><span>+++ b/CommonLibs/Interthread.h</span><br><span>@@ -53,7 +53,7 @@</span><br><span> </span><br><span> protected:</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- Fifo mQ; </span><br><span style="color: hsl(120, 100%, 40%);">+ Fifo mQ;</span><br><span> mutable Mutex mLock;</span><br><span> mutable Signal mWriteSignal;</span><br><span> </span><br><span>@@ -160,7 +160,7 @@</span><br><span> </span><br><span> protected:</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- Fifo mQ; </span><br><span style="color: hsl(120, 100%, 40%);">+ Fifo mQ;</span><br><span> mutable Mutex mLock;</span><br><span> mutable Signal mWriteSignal;</span><br><span> </span><br><span>@@ -256,7 +256,7 @@</span><br><span> // This recurs (and the InterthreadQueue fills up with data)</span><br><span> // until the read thread's accumulated temporary priority causes it to</span><br><span> // get a second pre-emptive activation over the writing thread,</span><br><span style="color: hsl(0, 100%, 40%);">- // resulting in bursts of activity by the read thread. </span><br><span style="color: hsl(120, 100%, 40%);">+ // resulting in bursts of activity by the read thread.</span><br><span> { ScopedLock lock(mLock);</span><br><span> mQ.put(val);</span><br><span> }</span><br><span>@@ -281,7 +281,7 @@</span><br><span> </span><br><span> protected:</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- PointerFIFO mQ; </span><br><span style="color: hsl(120, 100%, 40%);">+ PointerFIFO mQ;</span><br><span> mutable Mutex mLock;</span><br><span> mutable Signal mWriteSignal;</span><br><span> mutable Signal mReadSignal;</span><br><span>diff --git a/CommonLibs/Timeval.cpp b/CommonLibs/Timeval.cpp</span><br><span>index 420dd04..60bf7f6 100644</span><br><span>--- a/CommonLibs/Timeval.cpp</span><br><span>+++ b/CommonLibs/Timeval.cpp</span><br><span>@@ -81,7 +81,7 @@</span><br><span> int32_t deltaNs = other.nsec() - nsec();</span><br><span> return 1000*deltaS + deltaNs/1000000;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> </span><br><span> </span><br><span>diff --git a/GSM/GSMCommon.h b/GSM/GSMCommon.h</span><br><span>index f703c30..a3ada26 100644</span><br><span>--- a/GSM/GSMCommon.h</span><br><span>+++ b/GSM/GSMCommon.h</span><br><span>@@ -166,7 +166,7 @@</span><br><span> unsigned newTN = (mTN + other.mTN) % 8;</span><br><span> uint64_t newFN = (mFN+other.mFN + (mTN + other.mTN)/8) % gHyperframe;</span><br><span> return Time(newFN,newTN);</span><br><span style="color: hsl(0, 100%, 40%);">- } </span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> int operator-(const Time& other) const</span><br><span> {</span><br><span>diff --git a/Transceiver52M/Channelizer.cpp b/Transceiver52M/Channelizer.cpp</span><br><span>index a18dd03..1e4d7d4 100644</span><br><span>--- a/Transceiver52M/Channelizer.cpp</span><br><span>+++ b/Transceiver52M/Channelizer.cpp</span><br><span>@@ -1,6 +1,6 @@</span><br><span> /*</span><br><span> * Polyphase channelizer</span><br><span style="color: hsl(0, 100%, 40%);">- * </span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * Copyright (C) 2012-2014 Tom Tsou <tom@tsou.cc></span><br><span> * Copyright (C) 2015 Ettus Research LLC</span><br><span> *</span><br><span>@@ -63,7 +63,7 @@</span><br><span> return hInputs[chan];</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* </span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span> * Implementation based on material found in:</span><br><span> *</span><br><span> * "harris, fred, Multirate Signal Processing, Upper Saddle River, NJ,</span><br><span>@@ -78,8 +78,8 @@</span><br><span> </span><br><span> deinterleave(in, len, hInputs, blockLen, m);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* </span><br><span style="color: hsl(0, 100%, 40%);">- * Convolve through filterbank while applying and saving sample history </span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Convolve through filterbank while applying and saving sample history</span><br><span> */</span><br><span> for (size_t i = 0; i < m; i++) {</span><br><span> memcpy(&hInputs[i][2 * -hLen], hist[i], hSize);</span><br><span>diff --git a/Transceiver52M/ChannelizerBase.cpp b/Transceiver52M/ChannelizerBase.cpp</span><br><span>index f5b3ed4..96f76a9 100644</span><br><span>--- a/Transceiver52M/ChannelizerBase.cpp</span><br><span>+++ b/Transceiver52M/ChannelizerBase.cpp</span><br><span>@@ -1,8 +1,8 @@</span><br><span> /*</span><br><span> * Polyphase channelizer</span><br><span style="color: hsl(0, 100%, 40%);">- * </span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * Copyright (C) 2012-2014 Tom Tsou <tom@tsou.cc></span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright (C) 2015 Ettus Research LLC </span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2015 Ettus Research LLC</span><br><span> *</span><br><span> * This program is free software: you can redistribute it and/or modify</span><br><span> * it under the terms of the GNU Affero General Public License as published by</span><br><span>@@ -55,10 +55,10 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* </span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span> * Create polyphase filterbank</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * Implementation based material found in, </span><br><span style="color: hsl(120, 100%, 40%);">+ * Implementation based material found in,</span><br><span> *</span><br><span> * "harris, fred, Multirate Signal Processing, Upper Saddle River, NJ,</span><br><span> * Prentice Hall, 2006."</span><br><span>@@ -70,7 +70,7 @@</span><br><span> float sum = 0.0f, scale = 0.0f;</span><br><span> float midpt = (float) (protoLen - 1.0) / 2.0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* </span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span> * Allocate 'M' partition filters and the temporary prototype</span><br><span> * filter. Coefficients are real only and must be 16-byte memory</span><br><span> * aligned for SSE usage.</span><br><span>@@ -90,7 +90,7 @@</span><br><span> memalign(16, hLen * 2 * sizeof(float));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* </span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span> * Generate the prototype filter with a Blackman-harris window.</span><br><span> * Scale coefficients with DC filter gain set to unity divided</span><br><span> * by the number of channels.</span><br><span>@@ -110,7 +110,7 @@</span><br><span> }</span><br><span> scale = (float) m / sum;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* </span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span> * Populate partition filters and reverse the coefficients per</span><br><span> * convolution requirements.</span><br><span> */</span><br><span>@@ -174,7 +174,7 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* </span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span> * Setup filterbank internals</span><br><span> */</span><br><span> bool ChannelizerBase::init()</span><br><span>@@ -222,7 +222,7 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* </span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span> * Setup channelizer paramaters</span><br><span> */</span><br><span> ChannelizerBase::ChannelizerBase(size_t m, size_t blockLen, size_t hLen)</span><br><span>diff --git a/Transceiver52M/Resampler.cpp b/Transceiver52M/Resampler.cpp</span><br><span>index ecd8865..f545db8 100644</span><br><span>--- a/Transceiver52M/Resampler.cpp</span><br><span>+++ b/Transceiver52M/Resampler.cpp</span><br><span>@@ -51,7 +51,7 @@</span><br><span> float cutoff;</span><br><span> float sum = 0.0f, scale = 0.0f;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* </span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span> * Allocate partition filters and the temporary prototype filter</span><br><span> * according to numerator of the rational rate. Coefficients are</span><br><span> * real only and must be 16-byte memory aligned for SSE usage.</span><br><span>@@ -60,10 +60,10 @@</span><br><span> for (auto &part : partitions)</span><br><span> part = (complex<float> *) memalign(16, filt_len * sizeof(complex<float>));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* </span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span> * Generate the prototype filter with a Blackman-harris window.</span><br><span> * Scale coefficients with DC filter gain set to unity divided</span><br><span style="color: hsl(0, 100%, 40%);">- * by the number of filter partitions. </span><br><span style="color: hsl(120, 100%, 40%);">+ * by the number of filter partitions.</span><br><span> */</span><br><span> float a0 = 0.35875;</span><br><span> float a1 = 0.48829;</span><br><span>@@ -137,8 +137,8 @@</span><br><span> </span><br><span> /* Generate output from precomputed input/output paths */</span><br><span> for (size_t i = 0; i < out_len; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- n = in_index[i]; </span><br><span style="color: hsl(0, 100%, 40%);">- path = out_path[i]; </span><br><span style="color: hsl(120, 100%, 40%);">+ n = in_index[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ path = out_path[i];</span><br><span> </span><br><span> convolve_real(in, in_len,</span><br><span> reinterpret_cast<float *>(partitions[path]),</span><br><span>diff --git a/Transceiver52M/Resampler.h b/Transceiver52M/Resampler.h</span><br><span>index caffc08..bee2436 100644</span><br><span>--- a/Transceiver52M/Resampler.h</span><br><span>+++ b/Transceiver52M/Resampler.h</span><br><span>@@ -28,7 +28,7 @@</span><br><span> /* Constructor for rational sample rate conversion</span><br><span> * @param p numerator of resampling ratio</span><br><span> * @param q denominator of resampling ratio</span><br><span style="color: hsl(0, 100%, 40%);">- * @param filt_len length of each polyphase subfilter </span><br><span style="color: hsl(120, 100%, 40%);">+ * @param filt_len length of each polyphase subfilter</span><br><span> */</span><br><span> Resampler(size_t p, size_t q, size_t filt_len = 16);</span><br><span> ~Resampler();</span><br><span>@@ -58,7 +58,7 @@</span><br><span> int rotate(const float *in, size_t in_len, float *out, size_t out_len);</span><br><span> </span><br><span> /* Get filter length</span><br><span style="color: hsl(0, 100%, 40%);">- * @return number of taps in each filter partition </span><br><span style="color: hsl(120, 100%, 40%);">+ * @return number of taps in each filter partition</span><br><span> */</span><br><span> size_t len();</span><br><span> </span><br><span>diff --git a/Transceiver52M/Synthesis.cpp b/Transceiver52M/Synthesis.cpp</span><br><span>index 6b62156..a117390 100644</span><br><span>--- a/Transceiver52M/Synthesis.cpp</span><br><span>+++ b/Transceiver52M/Synthesis.cpp</span><br><span>@@ -1,6 +1,6 @@</span><br><span> /*</span><br><span> * Polyphase synthesis filter</span><br><span style="color: hsl(0, 100%, 40%);">- * </span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * Copyright (C) 2012-2014 Tom Tsou <tom@tsou.cc></span><br><span> * Copyright (C) 2015 Ettus Research LLC</span><br><span> *</span><br><span>@@ -74,7 +74,7 @@</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* </span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span> * Implementation based on material found in:</span><br><span> *</span><br><span> * "harris, fred, Multirate Signal Processing, Upper Saddle River, NJ,</span><br><span>@@ -92,8 +92,8 @@</span><br><span> </span><br><span> cxvec_fft(fftHandle);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* </span><br><span style="color: hsl(0, 100%, 40%);">- * Convolve through filterbank while applying and saving sample history </span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * Convolve through filterbank while applying and saving sample history</span><br><span> */</span><br><span> for (size_t i = 0; i < m; i++) {</span><br><span> memcpy(&hInputs[i][2 * -hLen], hist[i], hSize);</span><br><span>diff --git a/Transceiver52M/arch/arm/mult_neon.S b/Transceiver52M/arch/arm/mult_neon.S</span><br><span>index 162846e..113e227 100644</span><br><span>--- a/Transceiver52M/arch/arm/mult_neon.S</span><br><span>+++ b/Transceiver52M/arch/arm/mult_neon.S</span><br><span>@@ -1,5 +1,5 @@</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * NEON complex multiplication </span><br><span style="color: hsl(120, 100%, 40%);">+ * NEON complex multiplication</span><br><span> * Copyright (C) 2012,2013 Thomas Tsou <tom@tsou.cc></span><br><span> *</span><br><span> * This library is free software; you can redistribute it and/or</span><br><span>diff --git a/Transceiver52M/arch/common/convert_base.c b/Transceiver52M/arch/common/convert_base.c</span><br><span>index 5251fb8..8d29310 100644</span><br><span>--- a/Transceiver52M/arch/common/convert_base.c</span><br><span>+++ b/Transceiver52M/arch/common/convert_base.c</span><br><span>@@ -31,4 +31,3 @@</span><br><span> for (int i = 0; i < len; i++)</span><br><span> out[i] = in[i];</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/Transceiver52M/arch/common/fft.c b/Transceiver52M/arch/common/fft.c</span><br><span>index 18b2de7..ed79d13 100644</span><br><span>--- a/Transceiver52M/arch/common/fft.c</span><br><span>+++ b/Transceiver52M/arch/common/fft.c</span><br><span>@@ -1,18 +1,18 @@</span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * Fast Fourier transform </span><br><span style="color: hsl(120, 100%, 40%);">+ * Fast Fourier transform</span><br><span> *</span><br><span> * Copyright (C) 2012 Tom Tsou <tom@tsou.cc></span><br><span style="color: hsl(0, 100%, 40%);">- * </span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * This program is free software: you can redistribute it and/or modify</span><br><span> * it under the terms of the GNU Affero General Public License as published by</span><br><span> * the Free Software Foundation, either version 3 of the License, or</span><br><span> * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- * </span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * This program is distributed in the hope that it will be useful,</span><br><span> * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span> * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span> * GNU Affero General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- * </span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span> * You should have received a copy of the GNU Affero General Public License</span><br><span> * along with this program; if not, see <http://www.gnu.org/licenses/>.</span><br><span> * See the COPYING file in the main directory for details.</span><br><span>@@ -32,9 +32,9 @@</span><br><span> fftwf_plan fft_plan;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief Initialize FFT backend </span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Initialize FFT backend</span><br><span> * \param[in] reverse FFT direction</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] m FFT length </span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] m FFT length</span><br><span> * \param[in] istride input stride count</span><br><span> * \param[in] ostride output stride count</span><br><span> * \param[in] in input buffer (FFTW aligned)</span><br><span>@@ -92,7 +92,7 @@</span><br><span> free(ptr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief Free FFT backend resources </span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief Free FFT backend resources</span><br><span> */</span><br><span> void free_fft(struct fft_hdl *hdl)</span><br><span> {</span><br><span>diff --git a/Transceiver52M/radioBuffer.cpp b/Transceiver52M/radioBuffer.cpp</span><br><span>index a2b42c4..57de364 100644</span><br><span>--- a/Transceiver52M/radioBuffer.cpp</span><br><span>+++ b/Transceiver52M/radioBuffer.cpp</span><br><span>@@ -96,7 +96,7 @@</span><br><span> /*</span><br><span> * Output direction</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * Write a non-segment length of samples to the buffer. </span><br><span style="color: hsl(120, 100%, 40%);">+ * Write a non-segment length of samples to the buffer.</span><br><span> */</span><br><span> bool RadioBuffer::write(const float *wr, size_t len)</span><br><span> {</span><br><span>diff --git a/tests/CommonLibs/BitVectorTest.cpp b/tests/CommonLibs/BitVectorTest.cpp</span><br><span>index 063138f..74c7d45 100644</span><br><span>--- a/tests/CommonLibs/BitVectorTest.cpp</span><br><span>+++ b/tests/CommonLibs/BitVectorTest.cpp</span><br><span>@@ -29,7 +29,7 @@</span><br><span> #include "BitVector.h"</span><br><span> #include <iostream></span><br><span> #include <cstdlib></span><br><span style="color: hsl(0, 100%, 40%);">- </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> using namespace std;</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/14891">change 14891</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-trx/+/14891"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ifafb68353960fc5046661854ccfb8d783b0efb14 </div>
<div style="display:none"> Gerrit-Change-Number: 14891 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>