summaryrefslogtreecommitdiff
path: root/util/spkmodem_decode/spkmodem-decode.c
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2026-03-13 00:29:30 +0000
committerLeah Rowe <leah@libreboot.org>2026-03-26 06:59:40 +0000
commit6ed722b73b17213e63369bf4e65b79c484864d5b (patch)
treecda638c53c8bb2238c955b250c0cc45784e2fb21 /util/spkmodem_decode/spkmodem-decode.c
parent4fff5121e8769559e76fdc4ac05ded6dcb2374ae (diff)
fix typo in comment
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'util/spkmodem_decode/spkmodem-decode.c')
-rw-r--r--util/spkmodem_decode/spkmodem-decode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/util/spkmodem_decode/spkmodem-decode.c b/util/spkmodem_decode/spkmodem-decode.c
index b320af6a..660f2e7a 100644
--- a/util/spkmodem_decode/spkmodem-decode.c
+++ b/util/spkmodem_decode/spkmodem-decode.c
@@ -143,7 +143,11 @@
* Convert tone frequency ranges into pulse counts within the
* sliding analysis window.
*
+<<<<<<< HEAD
* pulse_count is: tone_frequency / FRAME_RATE
+=======
+ * pulse_count = tone_frequency / FRAME_RATE
+>>>>>>> a010665c1d (fix typo in comment)
* where FRAME_RATE = SAMPLE_RATE / SAMPLES_PER_FRAME.
*/
#define FREQ_SEP_MIN ((SEP_TONE_MIN_HZ) / (FRAME_RATE))