diff options
| -rw-r--r-- | src/DabMod.cpp | 3 | ||||
| -rw-r--r-- | src/OfdmGenerator.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/DabMod.cpp b/src/DabMod.cpp index 739fef1..b745271 100644 --- a/src/DabMod.cpp +++ b/src/DabMod.cpp @@ -424,7 +424,8 @@ int launch_modulator(int argc, char* argv[]) ModulatorData m; rcs.enrol(&m); - if (not mod_settings.fixedPoint) { + // Neither KISS FFT used for fixedpoint nor the FFT Accelerator used for DEXTER need planning. + if (not (mod_settings.fixedPoint or mod_settings.useDexterOutput)) { // This is mostly useful on ARM systems where FFTW planning takes some time. If we do it here // it will be done before the modulator starts up etiLog.level(debug) << "Running FFTW planning..."; diff --git a/src/OfdmGenerator.cpp b/src/OfdmGenerator.cpp index 198c2fc..62a0ee5 100644 --- a/src/OfdmGenerator.cpp +++ b/src/OfdmGenerator.cpp @@ -599,7 +599,7 @@ OfdmGeneratorDEXTER::OfdmGeneratorDEXTER(size_t nbSymbols, PDEBUG("OfdmGeneratorDEXTER::OfdmGeneratorDEXTER(%zu, %zu, %zu, %s) @ %p\n", nbSymbols, nbCarriers, spacing, inverse ? "true" : "false", this); - etiLog.level(info) << "Using DEXTER FFT Aceelerator for fixed-point transform"; + etiLog.level(info) << "Using DEXTER FFT Accelerator for fixed-point transform"; if (nbCarriers > spacing) { throw std::runtime_error("OfdmGenerator nbCarriers > spacing!"); @@ -758,7 +758,7 @@ int OfdmGeneratorDEXTER::process(Buffer* const dataIn, Buffer* dataOut) throw std::runtime_error("OfdmGenerator::process error refilling IIO buffer!"); } - memcpy(out, fft_out, mySpacing * sizeof(kiss_fft_cpx)); + memcpy(out, fft_out, mySpacing * sizeof(complexfix)); in += myNbCarriers; out += mySpacing; |