Browse Source

WDSP: removed useless atomic

chirpmodem-v8.0.0
f4exb 2 years ago
parent
commit
4ad190c401
  1. 4
      wdsp/TXA.hpp
  2. 6
      wdsp/iqc.hpp
  3. 8
      wdsp/rmatch.hpp
  4. 4
      wdsp/siphon.hpp
  5. 11
      wdsp/slew.cpp
  6. 14
      wdsp/slew.hpp

4
wdsp/TXA.hpp

@ -28,8 +28,6 @@ warren@wpratt.com @@ -28,8 +28,6 @@ warren@wpratt.com
#ifndef wdsp_txa_h
#define wdsp_txa_h
#include <atomic>
#include "comm.hpp"
#include "unit.hpp"
@ -127,7 +125,7 @@ public: @@ -127,7 +125,7 @@ public:
float f_low;
float f_high;
double meter[TXA_METERTYPE_LAST];
std::atomic<long> upslew;
long upslew;
struct
{

6
wdsp/iqc.hpp

@ -28,8 +28,6 @@ warren@wpratt.com @@ -28,8 +28,6 @@ warren@wpratt.com
#ifndef wdsp_iqc_h
#define wdsp_iqc_h
#include <atomic>
#include "export.h"
namespace WDSP {
@ -39,8 +37,8 @@ class TXA; @@ -39,8 +37,8 @@ class TXA;
class WDSP_API IQC
{
public:
std::atomic<long> run;
std::atomic<long> busy;
long run;
long busy;
int size;
float* in;
float* out;

8
wdsp/rmatch.hpp

@ -28,8 +28,6 @@ warren@wpratt.com @@ -28,8 +28,6 @@ warren@wpratt.com
#ifndef wdsp_rmatch_h
#define wdsp_rmatch_h
#include <atomic>
#include "export.h"
namespace WDSP {
@ -76,7 +74,7 @@ public: @@ -76,7 +74,7 @@ public:
class WDSP_API RMATCH
{
public:
std::atomic<long> run;
long run;
float* in;
float* out;
int insize;
@ -126,8 +124,8 @@ public: @@ -126,8 +124,8 @@ public:
unsigned int write_startup;
int control_flag;
// diagnostics
std::atomic<long> underflows;
std::atomic<long> overflows;
long underflows;
long overflows;
int force;
float fvar;

4
wdsp/siphon.hpp

@ -34,8 +34,6 @@ warren@wpratt.com @@ -34,8 +34,6 @@ warren@wpratt.com
#include "fftw3.h"
#include "export.h"
#include <atomic>
namespace WDSP {
class RXA;
@ -57,7 +55,7 @@ public: @@ -57,7 +55,7 @@ public:
float* sipout;
int fftsize;
float* specout;
std::atomic<long> specmode;
long specmode;
fftwf_plan sipplan;
float* window;

11
wdsp/slew.cpp

@ -64,7 +64,16 @@ void USLEW::decalc_uslew (USLEW *a) @@ -64,7 +64,16 @@ void USLEW::decalc_uslew (USLEW *a)
delete[] (a->cup);
}
USLEW* USLEW::create_uslew (TXA *txa, std::atomic<long> *ch_upslew, int size, float* in, float* out, float rate, float tdelay, float tupslew)
USLEW* USLEW::create_uslew (
TXA *txa,
long *ch_upslew,
int size,
float* in,
float* out,
float rate,
float tdelay,
float tupslew
)
{
USLEW *a = new USLEW;
a->txa = txa;

14
wdsp/slew.hpp

@ -28,8 +28,6 @@ warren@wpratt.com @@ -28,8 +28,6 @@ warren@wpratt.com
#ifndef wdsp_slew_h
#define wdsp_slew_h
#include <atomic>
#include "export.h"
namespace WDSP {
@ -40,7 +38,7 @@ class WDSP_API USLEW @@ -40,7 +38,7 @@ class WDSP_API USLEW
{
public:
TXA *txa;
std::atomic<long> *ch_upslew;
long *ch_upslew;
int size;
float* in;
float* out;
@ -54,7 +52,15 @@ public: @@ -54,7 +52,15 @@ public:
int ntup;
float* cup;
static USLEW* create_uslew (TXA *txa, std::atomic<long> *ch_upslew, int size, float* in, float* out, float rate, float tdelay, float tupslew);
static USLEW* create_uslew (
TXA *txa,
long *ch_upslew,
int size, float* in,
float* out,
float rate,
float tdelay,
float tupslew
);
static void destroy_uslew (USLEW *a);
static void flush_uslew (USLEW *a);
static void xuslew (USLEW *a);

Loading…
Cancel
Save