util/spkmodem_recv: general code cleanup

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-02-19 12:21:05 +00:00
parent d5a1de820b
commit a95cf1feeb
+18 -25
View File
@@ -5,7 +5,7 @@
/* Forked from coreboot's version, at util/spkmodem_recv/ in coreboot.git, /* Forked from coreboot's version, at util/spkmodem_recv/ in coreboot.git,
* revision 5c2b5fcf2f9c9259938fd03cfa3ea06b36a007f0 as of 3 January 2022. * revision 5c2b5fcf2f9c9259938fd03cfa3ea06b36a007f0 as of 3 January 2022.
* This version is heavily modified, re-written based on OpenBSD Kernel Source * This version is heavily modified, re-written based on OpenBSD Kernel Source
* File Style Guide (KNF); this change is Copyright 2023 Leah Rowe. */ * File Style Guide (KNF); this change is Copyright 2023,2026 Leah Rowe. */
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
@@ -25,28 +25,24 @@
#define ERR() (errno = errno ? errno : ECANCELED) #define ERR() (errno = errno ? errno : ECANCELED)
#define reset_char() ascii = 0, ascii_bit = 7 #define reset_char() ascii = 0, ascii_bit = 7
#define err_if(x) if (x) err(ERR(), NULL)
signed short frame[MAX_SAMPLES], pulse[MAX_SAMPLES]; signed short frame[MAX_SAMPLES], pulse[MAX_SAMPLES];
int ringpos, debug, freq_data, freq_separator, sample_count, ascii_bit = 7; int ringpos, debug, freq_data, freq_separator, sample_count, ascii_bit = 7;
char ascii = 0; char ascii = 0;
void handle_audio(void);
void decode_pulse(void);
int set_ascii_bit(void); int set_ascii_bit(void);
void print_char(void); void handle_audio(void), decode_pulse(void), print_char(void),
void print_stats(void); print_stats(void);
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int c;
#ifdef __OpenBSD__ #ifdef __OpenBSD__
if (pledge("stdio", NULL) == -1) err_if (pledge("stdio", NULL) == -1);
err(ERR(), "pledge");
#endif #endif
while ((c = getopt(argc, argv, "d")) != -1) for (int c; (c = getopt(argc, argv, "d")) != -1;)
if (!(debug = (c == 'd'))) err_if (!(debug = (c == 'd')));
err(errno = EINVAL, NULL);
setvbuf(stdout, NULL, _IONBF, 0); setvbuf(stdout, NULL, _IONBF, 0);
while (!feof(stdin)) while (!feof(stdin))
handle_audio(); handle_audio();
@@ -65,7 +61,6 @@ handle_audio(void)
decode_pulse(); decode_pulse();
return; return;
} }
if (set_ascii_bit() < 0) if (set_ascii_bit() < 0)
print_char(); print_char();
sample_count = 0; sample_count = 0;
@@ -85,9 +80,8 @@ decode_pulse(void)
if (ferror(stdin) != 0) if (ferror(stdin) != 0)
err(ERR(), "Could not read from frame."); err(ERR(), "Could not read from frame.");
if ((pulse[ringpos] = (abs(frame[ringpos]) > THRESHOLD) ? 1 : 0)) pulse[ringpos] = (abs(frame[ringpos]) > THRESHOLD) ? 1 : 0;
++freq_separator; freq_separator += pulse[ringpos++];
++ringpos;
ringpos %= MAX_SAMPLES; ringpos %= MAX_SAMPLES;
++sample_count; ++sample_count;
} }
@@ -103,6 +97,15 @@ set_ascii_bit(void)
return ascii_bit; return ascii_bit;
} }
void
print_stats(void)
{
long stdin_pos;
err_if ((stdin_pos = ftell(stdin)) == -1);
printf ("%d %d %d @%ld\n", freq_data, freq_separator,
FREQ_DATA_THRESHOLD, stdin_pos - sizeof(frame));
}
void void
print_char(void) print_char(void)
{ {
@@ -112,13 +115,3 @@ print_char(void)
printf("%c", ascii); printf("%c", ascii);
reset_char(); reset_char();
} }
void
print_stats(void)
{
long stdin_pos;
if ((stdin_pos = ftell(stdin)) == -1)
err(ERR(), NULL);
printf ("%d %d %d @%ld\n", freq_data, freq_separator,
FREQ_DATA_THRESHOLD, stdin_pos - sizeof(frame));
}