cellular-infrastructure
/
osmo-trx
mirror of https://gerrit.osmocom.org/osmo-trx
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

SigProcLib: Use available copyTo Vector API instead of memcopy 

This change allows to remove some wrong use of code as per compilation
warning:
osmo-trx/Transceiver52M/sigProcLib.cpp:1266:40: error:
‘void* memcpy(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class Complex<float>’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess]
   midMidamble->size() * sizeof(complex));

Change-Id: Id446711349bec70fa4e7c8efe0f7f9faf7e4f277
This commit is contained in:
Pau Espin 2018-08-30 20:45:14 +02:00
parent 1f4a009c67
commit 5e68cde779
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CommonLibs/Vector.h
View File

@ -107,7 +107,7 @@ template <class T> class Vector {
void clone(const Vector<T>& other) void clone(const Vector<T>& other)
{ {
resize(other.size()); resize(other.size());
memcpy(mData,other.mStart,other.bytes()); other.copyTo(*this);
} }

10
Transceiver52M/sigProcLib.cpp
View File

@ -1262,8 +1262,7 @@ static bool generateMidamble(int sps, int tsc)
data = (complex *) convolve_h_alloc(midMidamble->size()); data = (complex *) convolve_h_alloc(midMidamble->size());
_midMidamble = new signalVector(data, 0, midMidamble->size()); _midMidamble = new signalVector(data, 0, midMidamble->size());
_midMidamble->setAligned(true); _midMidamble->setAligned(true);
memcpy(_midMidamble->begin(), midMidamble->begin(), midMidamble->copyTo(*_midMidamble);
midMidamble->size() * sizeof(complex));
autocorr = convolve(midamble, _midMidamble, NULL, NO_DELAY); autocorr = convolve(midamble, _midMidamble, NULL, NO_DELAY);
if (!autocorr) { if (!autocorr) {
@ -1319,8 +1318,7 @@ static CorrelationSequence *generateEdgeMidamble(int tsc)
data = (complex *) convolve_h_alloc(midamble->size()); data = (complex *) convolve_h_alloc(midamble->size());
_midamble = new signalVector(data, 0, midamble->size()); _midamble = new signalVector(data, 0, midamble->size());
_midamble->setAligned(true); _midamble->setAligned(true);
memcpy(_midamble->begin(), midamble->begin(), midamble->copyTo(*_midamble);
midamble->size() * sizeof(complex));
/* Channel gain is an empirically measured value */ /* Channel gain is an empirically measured value */
seq = new CorrelationSequence; seq = new CorrelationSequence;
@ -1360,7 +1358,7 @@ static bool generateRACHSequence(int sps)
data = (complex *) convolve_h_alloc(seq1->size()); data = (complex *) convolve_h_alloc(seq1->size());
_seq1 = new signalVector(data, 0, seq1->size()); _seq1 = new signalVector(data, 0, seq1->size());
_seq1->setAligned(true); _seq1->setAligned(true);
memcpy(_seq1->begin(), seq1->begin(), seq1->size() * sizeof(complex)); seq1->copyTo(*_seq1);
autocorr = convolve(seq0, _seq1, autocorr, NO_DELAY); autocorr = convolve(seq0, _seq1, autocorr, NO_DELAY);
if (!autocorr) { if (!autocorr) {
@ -1457,7 +1455,7 @@ static signalVector *downsampleBurst(const signalVector &burst)
{ {
signalVector in(DOWNSAMPLE_IN_LEN, dnsampler->len()); signalVector in(DOWNSAMPLE_IN_LEN, dnsampler->len());
signalVector *out = new signalVector(DOWNSAMPLE_OUT_LEN); signalVector *out = new signalVector(DOWNSAMPLE_OUT_LEN);
memcpy(in.begin(), burst.begin(), DOWNSAMPLE_IN_LEN * 2 * sizeof(float)); burst.copyToSegment(in, 0, DOWNSAMPLE_IN_LEN);
if (dnsampler->rotate((float *) in.begin(), DOWNSAMPLE_IN_LEN, if (dnsampler->rotate((float *) in.begin(), DOWNSAMPLE_IN_LEN,
(float *) out->begin(), DOWNSAMPLE_OUT_LEN) < 0) { (float *) out->begin(), DOWNSAMPLE_OUT_LEN) < 0) {