VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 01:18:38 -05:00
Code Issues Projects Releases Wiki Activity

WDSP: removed useless atomic

Browse Source
This commit is contained in:
f4exb 2024-07-14 00:05:10 +02:00
parent 5891dfa5da
commit 4ad190c401
6 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wdsp/TXA.hpp
View File

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

6
wdsp/iqc.hpp
View File

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

8
wdsp/rmatch.hpp
View File

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

4
wdsp/siphon.hpp
View File

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

11
wdsp/slew.cpp
View File

@ -64,7 +64,16 @@ void USLEW::decalc_uslew (USLEW *a)
delete[] (a->cup); 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; USLEW *a = new USLEW;
a->txa = txa; a->txa = txa;

14
wdsp/slew.hpp
View File

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