FreeDV
/
librtlsdr
mirror of https://github.com/drowe67/librtlsdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "adding fifo to control muting of rx" 

This reverts commit ad1adfa379.
development
David Rowe 2020-11-11 20:00:31 +00:00
parent ad1adfa379
commit f030c97642
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/rtl_fsk.c
View File

@ -32,7 +32,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h> #include <netdb.h>
#include <getopt.h> #include <getopt.h>
#include <fcntl.h>
#ifndef _WIN32 #ifndef _WIN32
@ -40,6 +39,7 @@
#else #else
#include <windows.h> #include <windows.h>
#include <io.h> #include <io.h>
#include <fcntl.h>
#include "getopt/getopt.h" #include "getopt/getopt.h"
#endif #endif
@ -110,8 +110,6 @@ static uint8_t *zeros_out;
static int verbose = 0; static int verbose = 0;
static int data_bytes_per_frame; static int data_bytes_per_frame;
static int periodic_output = 0; static int periodic_output = 0;
static int rtl_fsk_fifo;
static int squelch = 0;
void usage(void) void usage(void)
{ {
@ -312,18 +310,6 @@ static void rtlsdr_callback(unsigned char *buf, uint32_t len, void *ctx)
int prev_fsk_nin; int prev_fsk_nin;
int nbytes = 0; int nbytes = 0;
uint8_t rx_status = 0; uint8_t rx_status = 0;
char fifobuf[256];
int ret;
// look for messages from control fifo
ret = read(rtl_fsk_fifo, fifobuf, sizeof(fifobuf));
if (ret > 0) {
fprintf(stderr, "rtl_fsk: Read %d bytes from rpitx_fsk: %s\n", ret, fifobuf);
if (strcmp(fifobuf, "squelch on") == 0) squelch = 1;
if (strcmp(fifobuf, "squelch off") == 0) squelch = 0;
}
if (squelch) return;
if (ctx) { if (ctx) {
if (do_exit) if (do_exit)
@ -469,11 +455,10 @@ int main(int argc, char **argv)
{"testframes",no_argument, 0, 'i'}, {"testframes",no_argument, 0, 'i'},
{"vv", no_argument, 0, 'l'}, {"vv", no_argument, 0, 'l'},
{"mask", required_argument, 0, 't'}, {"mask", required_argument, 0, 't'},
{"fifo", required_argument, 0, 'j'},
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
opt = getopt_long(argc,argv,"a:d:e:f:g:o:s:b:n:p:S:u:r:m:c:M:R:xt:w:jk:vq",long_opts,&opt_idx); opt = getopt_long(argc,argv,"a:d:e:f:g:s:b:n:p:S:u:r:m:c:M:R:xt:w:jk:vq",long_opts,&opt_idx);
if (opt != -1) { if (opt != -1) {
switch (opt) { switch (opt) {
case 'a': case 'a':
@ -510,15 +495,6 @@ int main(int argc, char **argv)
case 'g': case 'g':
gain = (int)(atof(optarg) * 10); /* tenths of a dB */ gain = (int)(atof(optarg) * 10); /* tenths of a dB */
break; break;
case 'o':
fprintf(stderr, "rtl_fsk: opening FIFO\n");
rtl_fsk_fifo = open(optarg, O_RDONLY | O_NONBLOCK);
if (rtl_fsk_fifo == -1) {
fprintf(stderr, "Error opening fifo %s\n", optarg);
exit(1);
}
fprintf(stderr, "rtl_fsk: FIFO opened OK ...\n");
break;
case 's': case 's':
samp_rate = (uint32_t)atofs(optarg); samp_rate = (uint32_t)atofs(optarg);
break; break;