Skip to content

Commit

Permalink
float _Complex removed from code.
Browse files Browse the repository at this point in the history
  • Loading branch information
KejPi committed Sep 1, 2022
1 parent 0c16a76 commit 06c3786
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions gui/inputdevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void getSamples(float buffer[], uint16_t numSamples)
// input read -> lets store it to FIFO
pthread_mutex_lock(&inputBuffer.countMutex);
uint64_t count = inputBuffer.count;
while (count < numSamples*sizeof(float _Complex))
while (count < numSamples*2*sizeof(float))
{
pthread_cond_wait(&inputBuffer.countCondition, &inputBuffer.countMutex);
count = inputBuffer.count;
Expand All @@ -57,22 +57,22 @@ void getSamples(float buffer[], uint16_t numSamples)

// there is enough samples in input buffer
uint64_t bytesTillEnd = INPUT_FIFO_SIZE - inputBuffer.tail;
if (bytesTillEnd >= numSamples*sizeof(float _Complex))
if (bytesTillEnd >= numSamples*2*sizeof(float))
{
memcpy(buffer, inputBuffer.buffer + inputBuffer.tail, numSamples*sizeof(float _Complex));
inputBuffer.tail = (inputBuffer.tail + numSamples*sizeof(float _Complex));
memcpy(buffer, inputBuffer.buffer + inputBuffer.tail, numSamples*2*sizeof(float));
inputBuffer.tail = (inputBuffer.tail + numSamples*2*sizeof(float));
}
else
{
memcpy(buffer, inputBuffer.buffer + inputBuffer.tail, bytesTillEnd);
Q_ASSERT(sizeof(float _Complex) == 8);
Q_ASSERT(2*sizeof(float) == 8);
uint64_t samplesTillEnd = bytesTillEnd >> 3;
memcpy(buffer+samplesTillEnd, inputBuffer.buffer, (numSamples - samplesTillEnd)*sizeof(float _Complex));
inputBuffer.tail = (numSamples - samplesTillEnd) * sizeof(float _Complex);
memcpy(buffer+samplesTillEnd, inputBuffer.buffer, (numSamples - samplesTillEnd)*2*sizeof(float));
inputBuffer.tail = (numSamples - samplesTillEnd) * 2*sizeof(float);
}

pthread_mutex_lock(&inputBuffer.countMutex);
inputBuffer.count = inputBuffer.count - numSamples*sizeof(float _Complex);
inputBuffer.count = inputBuffer.count - numSamples*2*sizeof(float);
pthread_cond_signal(&inputBuffer.countCondition);
pthread_mutex_unlock(&inputBuffer.countMutex);
}
Expand All @@ -84,15 +84,15 @@ void skipSamples(float buffer[], uint16_t numSamples)
// input read -> lets store it to FIFO
pthread_mutex_lock(&inputBuffer.countMutex);
uint64_t count = inputBuffer.count;
while (count < numSamples*sizeof(float _Complex))
while (count < numSamples*2*sizeof(float))
{
pthread_cond_wait(&inputBuffer.countCondition, &inputBuffer.countMutex);
count = inputBuffer.count;
}

inputBuffer.tail = (inputBuffer.tail + numSamples*sizeof(float _Complex)) % INPUT_FIFO_SIZE;
inputBuffer.tail = (inputBuffer.tail + numSamples*2*sizeof(float)) % INPUT_FIFO_SIZE;

inputBuffer.count = inputBuffer.count - numSamples*sizeof(float _Complex);
inputBuffer.count = inputBuffer.count - numSamples*2*sizeof(float);
pthread_cond_signal(&inputBuffer.countCondition);
pthread_mutex_unlock(&inputBuffer.countMutex);
}
2 changes: 1 addition & 1 deletion gui/inputdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

// Input FIFO size in bytes - FIFO contains float _Complex samples => [float float]
// total capacity is 8 input chunks
#define INPUT_FIFO_SIZE (INPUT_CHUNK_IQ_SAMPLES * (sizeof(float _Complex)) * 8)
#define INPUT_FIFO_SIZE (INPUT_CHUNK_IQ_SAMPLES * (2*sizeof(float)) * 8)

#define INPUTDEVICE_WDOG_TIMEOUT_SEC 2 // watchdog timeout in seconds (if implemented and enabled)

Expand Down

2 comments on commit 06c3786

@gvanem
Copy link
Contributor

@gvanem gvanem commented on 06c3786 Sep 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good. Now it builds with MSVC.
But still some float _Complex in the comments.

@KejPi
Copy link
Owner Author

@KejPi KejPi commented on 06c3786 Sep 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it in comments by intention to make clear what is going on.

Please sign in to comment.