FreeCalypso > hg > gsm-net-reveng

changeset 78:00fd38c7c8fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trau-decode: factor out parse-amr.c
author Mychaela Falconia <falcon@freecalypso.org>
date Sat, 08 Feb 2025 06:22:45 +0000
parents 729dbac9df82
children 8c1f20e845a1
files trau-decode/Makefile trau-decode/parse-amr.c trau-decode/parse-main.c
diffstat 3 files changed, 63 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/trau-decode/Makefile	Sat Feb 08 05:16:35 2025 +0000
+++ b/trau-decode/Makefile	Sat Feb 08 06:22:45 2025 +0000
@@ -3,25 +3,29 @@
 PROGS=	dump-1bit tfo-parse-fr16 trau-extr trau-hr-dump trau-hr-dump-hex \
 	trau-parse trau-sync8
 
+FR_OBJS=parse-fr.o parse-fr-common.o parse-efr.o
+HR_OBJS=gsmhr_unpack.o hr-guts.o
+
+TRAU16_OBJS=	parse-amr.o parse-data.o ${FR_OBJS}
+
 all:	${PROGS}
 
 dump-1bit:	dump-1bit.c
 	${CC} ${CFLAGS} -o $@ $@.c
 
-tfo-parse-fr16:	crc8gen.o parse-fr.o parse-fr-common.o parse-efr.o parse-tfo16.o
+tfo-parse-fr16:	crc8gen.o parse-tfo16.o ${FR_OBJS}
 	${CC} ${CFLAGS} -o $@ $^ -lgsmfr2 -lgsmefr
 
 trau-extr:	extr-fr.o extr-efr.o extr-main.o
 	${CC} ${CFLAGS} -o $@ $^ -lgsmfr2
 
-trau-hr-dump:	crc8gen.o gsmhr_unpack.o hr-guts.o trau-hr-dump.o
+trau-hr-dump:	crc8gen.o trau-hr-dump.o ${HR_OBJS}
 	${CC} ${CFLAGS} -o $@ $^
 
-trau-hr-dump-hex:	crc8gen.o gsmhr_unpack.o hr-guts.o trau-hr-dump-hex.o
+trau-hr-dump-hex:	crc8gen.o trau-hr-dump-hex.o ${HR_OBJS}
 	${CC} ${CFLAGS} -o $@ $^
 
-trau-parse:	crc8gen.o parse-data.o parse-fr.o parse-fr-common.o parse-efr.o\
-			parse-main.o
+trau-parse:	crc8gen.o parse-main.o ${TRAU16_OBJS}
 	${CC} ${CFLAGS} -o $@ $^ -lgsmfr2 -lgsmefr
 
 trau-sync8:	trau-sync8.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/trau-decode/parse-amr.c	Sat Feb 08 06:22:45 2025 +0000
@@ -0,0 +1,53 @@
+/*
+ * This module contains a bit of code that has been factored out of
+ * trau-parse program; it handles AMR frames.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+static unsigned
+bits_to_num(bits, nbits)
+	uint8_t *bits;
+	unsigned nbits;
+{
+	unsigned accum;
+	unsigned n;
+
+	accum = 0;
+	for (n = 0; n < nbits; n++) {
+		accum <<= 1;
+		if (*bits)
+			accum |= 1;
+		bits++;
+	}
+	return accum;
+}
+
+void
+print_amr_frame(frame_bits)
+	uint8_t *frame_bits;
+{
+	unsigned c6_11;
+
+	c6_11 = bits_to_num(frame_bits + 22, 6);
+	printf("  C6-C11: %u\n", c6_11);
+	printf("  RIF=%u C13=%u Config_Prot=%u%u%u Msg_No=%u%u\n",
+		frame_bits[28], frame_bits[29], frame_bits[30],
+		frame_bits[31], frame_bits[33], frame_bits[34],
+		frame_bits[35]);
+	printf("  DTXd=%u TFOE=%u FClass=%u%u CMI/CMR=%u%u%u\n",
+		frame_bits[36], frame_bits[37], frame_bits[38],
+		frame_bits[39], frame_bits[40], frame_bits[41],
+		frame_bits[42]);
+	if (!frame_bits[38] && !frame_bits[39])
+		printf("  No_Spch_Class=%u%u%u CMI=%u%u%u CMR=%u%u%u\n",
+			frame_bits[76], frame_bits[77], frame_bits[78],
+			frame_bits[79], frame_bits[81], frame_bits[82],
+			frame_bits[83], frame_bits[84], frame_bits[85]);
+	printf("  T1=%u T2=%u T3=%u T4=%u\n", frame_bits[316],
+		frame_bits[317], frame_bits[318], frame_bits[319]);
+}
--- a/trau-decode/parse-main.c	Sat Feb 08 05:16:35 2025 +0000
+++ b/trau-decode/parse-main.c	Sat Feb 08 06:22:45 2025 +0000
@@ -167,23 +167,7 @@
 		print_edata_frame(frame_bits);
 		break;
 	case 0x06:
-		c6_11 = bits_to_num(frame_bits + 22, 6);
-		printf("  C6-C11: %u\n", c6_11);
-		printf("  RIF=%u C13=%u Config_Prot=%u%u%u Msg_No=%u%u\n",
-			frame_bits[28], frame_bits[29], frame_bits[30],
-			frame_bits[31], frame_bits[33], frame_bits[34],
-			frame_bits[35]);
-		printf("  DTXd=%u TFOE=%u FClass=%u%u CMI/CMR=%u%u%u\n",
-			frame_bits[36], frame_bits[37], frame_bits[38],
-			frame_bits[39], frame_bits[40], frame_bits[41],
-			frame_bits[42]);
-		if (!frame_bits[38] && !frame_bits[39])
-			printf("  No_Spch_Class=%u%u%u CMI=%u%u%u CMR=%u%u%u\n",
-				frame_bits[76], frame_bits[77], frame_bits[78],
-				frame_bits[79], frame_bits[81], frame_bits[82],
-				frame_bits[83], frame_bits[84], frame_bits[85]);
-		printf("  T1=%u T2=%u T3=%u T4=%u\n", frame_bits[316],
-			frame_bits[317], frame_bits[318], frame_bits[319]);
+		print_amr_frame(frame_bits);
 		break;
 	default:
 		printf("  C6-C15: %u%u%u%u%u%u%u%u%u%u\n", frame_bits[22],