aboutsummaryrefslogtreecommitdiffstats
path: root/src/BlockPartitioner.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2018-01-28 07:19:54 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2018-01-28 07:19:54 +0100
commita1995ea7ffd6783a8445e72f12fcc92d09287c2b (patch)
tree301a50e2a6bfbfee546fb3467f2d5f701e462e2d /src/BlockPartitioner.cpp
parentaddfba670d14c837084894f8cc5a64f47f296051 (diff)
downloaddabmod-a1995ea7ffd6783a8445e72f12fcc92d09287c2b.tar.gz
dabmod-a1995ea7ffd6783a8445e72f12fcc92d09287c2b.tar.bz2
dabmod-a1995ea7ffd6783a8445e72f12fcc92d09287c2b.zip
Make blocks assume FP is 0 at initialisation
Diffstat (limited to 'src/BlockPartitioner.cpp')
-rw-r--r--src/BlockPartitioner.cpp27
1 files changed, 1 insertions, 26 deletions
diff --git a/src/BlockPartitioner.cpp b/src/BlockPartitioner.cpp
index 5767650..fbb130e 100644
--- a/src/BlockPartitioner.cpp
+++ b/src/BlockPartitioner.cpp
@@ -34,8 +34,7 @@
#include <stdint.h>
#include <assert.h>
-
-BlockPartitioner::BlockPartitioner(unsigned mode, unsigned phase) :
+BlockPartitioner::BlockPartitioner(unsigned mode) :
ModMux(),
ModMetadata(),
d_mode(mode)
@@ -72,14 +71,8 @@ BlockPartitioner::BlockPartitioner(unsigned mode, unsigned phase) :
"BlockPartitioner::BlockPartitioner invalid mode");
break;
}
- d_cifNb = 0;
- // For Synchronisation purpose, count nb of CIF to drop
- d_cifPhase = phase % d_cifCount;
- d_metaPhase = phase % d_cifCount;
- d_cifSize = 864 * 8;
}
-
// dataIn[0] -> FIC
// dataIn[1] -> CIF
int BlockPartitioner::process(std::vector<Buffer*> dataIn, Buffer* dataOut)
@@ -111,15 +104,6 @@ int BlockPartitioner::process(std::vector<Buffer*> dataIn, Buffer* dataOut)
"BlockPartitioner::process input 1 size not valid!");
}
- // Synchronize CIF phase
- if (d_cifPhase != 0) {
- if (++d_cifPhase == d_cifCount) {
- d_cifPhase = 0;
- }
- // Drop CIF
- return 0;
- }
-
uint8_t* fic = reinterpret_cast<uint8_t*>(dataIn[0]->getData());
uint8_t* cif = reinterpret_cast<uint8_t*>(dataIn[1]->getData());
uint8_t* out = reinterpret_cast<uint8_t*>(dataOut->getData());
@@ -141,15 +125,6 @@ int BlockPartitioner::process(std::vector<Buffer*> dataIn, Buffer* dataOut)
meta_vec_t BlockPartitioner::process_metadata(const meta_vec_t& metadataIn)
{
- // Synchronize CIF phase
- if (d_metaPhase != 0) {
- if (++d_metaPhase == d_cifCount) {
- d_metaPhase = 0;
- }
- // Drop this metadata
- return {};
- }
-
if (d_cifNb == 1) {
d_meta.clear();
}