Fix to build Linux. Tested on Debian 9.

This commit is contained in:
Mictronics 2018-03-06 20:15:22 +01:00
parent c08b035efc
commit 48f52a3fed
2 changed files with 381 additions and 421 deletions

View File

@ -4,11 +4,8 @@
#include <stdio.h>
#include <string.h>
#include <libbladeRF.h>
#ifdef _WIN32
#include "getopt.h"
#else
#include <unistd.h>
#endif
#include <errno.h>
#define TX_FREQUENCY 1575420000
#define TX_SAMPLERATE 2600000
@ -23,8 +20,7 @@
#define AMPLITUDE (1000) // Default amplitude for 12-bit I/Q
void usage(void)
{
void usage(void) {
fprintf(stderr, "Usage: bladeplayer [options]\n"
" -f <tx_file> I/Q sampling data file (required)\n"
" -b <iq_bits> I/Q data format [1/16] (default: 16)\n"
@ -33,15 +29,18 @@ void usage(void)
return;
}
int main(int argc, char *argv[])
{
int main(int argc, char *argv[]) {
int status;
char *devstr = NULL;
struct bladerf *dev = NULL;
FILE *fp;
int16_t *tx_buffer;
enum state {INIT, READ_FILE, PAD_TRAILING, DONE};
enum state {
INIT, READ_FILE, PAD_TRAILING, DONE
};
enum state state = INIT;
int compressed = 0;
@ -49,7 +48,7 @@ int main(int argc, char *argv[])
size_t samples_read;
int16_t lut[256][8];
int16_t amp = AMPLITUDE;
int i,k;
uint32_t i, k;
int gain = TX_VGA1;
int result;
@ -64,26 +63,21 @@ int main(int argc, char *argv[])
exit(1);
}
while ((result=getopt(argc,argv,"g:b:f:"))!=-1)
{
switch (result)
{
while ((result = getopt(argc, argv, "g:b:f:")) != -1) {
switch (result) {
case 'g':
gain = atoi(optarg);
if (gain>-4 || gain<-35)
{
if (gain>-4 || gain<-35) {
printf("ERROR: Invalid TX VGA1 gain.\n");
exit(1);
}
break;
case 'b':
data_format = atoi(optarg);
if (data_format!=1 && data_format!=16)
{
if (data_format != 1 && data_format != 16) {
printf("ERROR: Invalid I/Q data format.\n");
exit(1);
}
else if (data_format==1)
} else if (data_format == 1)
compressed = 1;
break;
case 'f':
@ -99,8 +93,7 @@ int main(int argc, char *argv[])
}
// Open TX file.
if (txfile[0]==0)
{
if (txfile[0] == 0) {
printf("ERROR: I/Q sampling data file is not specified.\n");
exit(1);
}
@ -134,8 +127,7 @@ int main(int argc, char *argv[])
if (status != 0) {
fprintf(stderr, "Failed to set TX sample rate: %s\n", bladerf_strerror(status));
goto out;
}
else {
} else {
printf("TX sample rate: %u sps\n", TX_SAMPLERATE);
}
@ -143,8 +135,7 @@ int main(int argc, char *argv[])
if (status != 0) {
fprintf(stderr, "Failed to set TX bandwidth: %s\n", bladerf_strerror(status));
goto out;
}
else {
} else {
printf("TX bandwidth: %u Hz\n", TX_BANDWIDTH);
}
@ -152,8 +143,7 @@ int main(int argc, char *argv[])
if (status != 0) {
fprintf(stderr, "Failed to set TX VGA1 gain: %s\n", bladerf_strerror(status));
goto out;
}
else {
} else {
printf("TX VGA1 gain: %d dB\n", gain);
}
@ -161,8 +151,7 @@ int main(int argc, char *argv[])
if (status != 0) {
fprintf(stderr, "Failed to set TX VGA2 gain: %s\n", bladerf_strerror(status));
goto out;
}
else {
} else {
printf("TX VGA2 gain: %d dB\n", TX_VGA2);
}
@ -185,8 +174,7 @@ int main(int argc, char *argv[])
goto out;
}
for (i=0; i<256; i++)
{
for (i = 0; i < 256; i++) {
for (k = 0; k < 8; k++)
lut[i][k] = ((i >> (7 - k))&0x1) ? amp : -amp;
}
@ -229,8 +217,7 @@ int main(int argc, char *argv[])
case INIT:
case READ_FILE:
// Read from the input file
if (compressed)
{
if (compressed) {
int16_t *write_buffer_current = tx_buffer;
samples_read = fread(read_buffer,
@ -242,16 +229,13 @@ int main(int argc, char *argv[])
buffer_samples_remaining = read_samples_remaining * 4;
// Expand compressed data into TX buffer
for (i=0; i<samples_read; i++)
{
for (i = 0; i < samples_read; i++) {
memcpy(write_buffer_current, lut[read_buffer[i]], 8);
// Advance the write buffer pointer
write_buffer_current += 8;
}
}
else
{
} else {
samples_populated = fread(tx_buffer_current,
2 * sizeof (int16_t),
buffer_samples_remaining,
@ -261,8 +245,7 @@ int main(int argc, char *argv[])
// If the end of the file was reached, pad the rest of the buffer and finish.
if (feof(fp)) {
state = PAD_TRAILING;
}
// Check for errors
} // Check for errors
else if (ferror(fp)) {
status = errno;
}

View File

@ -1,22 +1,10 @@
#define _CRT_SECURE_NO_WARNINGS
#include <hackrf.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <sys/types.h>
#include <getopt.h>
#include <windows.h>
#ifdef _WIN64
typedef int64_t ssize_t;
#else
typedef int32_t ssize_t;
#endif
typedef int bool;
#define true 1
#define false 0
#include <signal.h>
#include <hackrf.h>
static hackrf_device* device = NULL;
@ -25,27 +13,19 @@ volatile uint32_t byte_count = 0;
volatile bool do_exit = false;
static transceiver_mode_t transceiver_mode = TRANSCEIVER_MODE_TX;
#define FD_BUFFER_SIZE (8*1024)
#define FREQ_ONE_MHZ (1000000ull)
BOOL WINAPI sighandler(int signum)
{
if (CTRL_C_EVENT == signum) {
static void sighandler(int signum) {
fprintf(stdout, "Caught signal %d\n", signum);
do_exit = true;
return TRUE;
}
return FALSE;
}
int tx_callback(hackrf_transfer* transfer) {
size_t bytes_to_read;
if( fd != NULL )
{
ssize_t bytes_read;
if (fd != NULL) {
size_t bytes_read;
byte_count += transfer->valid_length;
bytes_to_read = transfer->valid_length;
@ -78,11 +58,9 @@ int main(int argc, char** argv) {
uint64_t freq_hz = 1575420000;
uint32_t amp_enable = 1;
while( (opt = getopt(argc, argv, "t:")) != EOF )
{
while ((opt = getopt(argc, argv, "t:")) != EOF) {
result = HACKRF_SUCCESS;
switch( opt )
{
switch (opt) {
case 't':
path = optarg;
break;
@ -136,7 +114,7 @@ int main(int argc, char** argv) {
return EXIT_FAILURE;
}
SetConsoleCtrlHandler( (PHANDLER_ROUTINE) sighandler, TRUE );
signal(SIGINT, sighandler);
printf("call hackrf_sample_rate_set(%.03f MHz)\n", ((float) sample_rate_hz / (float) FREQ_ONE_MHZ));
result = hackrf_set_sample_rate_manual(device, sample_rate_hz, 1);
@ -201,8 +179,7 @@ int main(int argc, char** argv) {
}
result = hackrf_close(device);
if( result != HACKRF_SUCCESS )
{
if (result != HACKRF_SUCCESS) {
printf("hackrf_close() failed: %s (%d)\n", hackrf_error_name(result), result);
} else {
printf("hackrf_close() done\n");