From d2d9760c08f35a231d32f0ebeb73b2927e5573b3 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Wed, 7 Sep 2016 22:18:10 +0700 Subject: utils/conv_gen.py: generate a single file Instead of generating every convolutional code into a separate file (such as conv_xcch_gen.c, conv_cs3_gen.c), it is better to have a single file, containing all definitions, because as many convolutional codes we add, as many entries we will have to add into 'src/gsm/Makefile.am'. This approach increases readability of the Makefile.am, and also makes us able to share some data between some convolutional code definitions. For example: xCCH, RACH, SCH, TCH/F, both CS2 and CS3 may use the same *_state[][2] and *_output[][2] arrays within a single file. This optimization is currently WIP. Change-Id: Ib4e4ee5fdde38429e68e3b2fa50ec03a18f59daa --- src/gsm/Makefile.am | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 20714132..3877f78a 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -18,16 +18,11 @@ libgsmint_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \ gprs_cipher_core.c gprs_rlc.c gsm0480.c abis_nm.c gsm0502.c \ gsm0411_utils.c gsm0411_smc.c gsm0411_smr.c \ lapd_core.c lapdm.c kasumi.c gsm_04_08_gprs.c \ - conv_cs2_gen.c conv_cs3_gen.c conv_xcch_gen.c \ - conv_tch_afs_12_2_gen.c conv_tch_afs_10_2_gen.c \ - conv_tch_afs_7_95_gen.c conv_tch_afs_7_4_gen.c \ - conv_tch_afs_6_7_gen.c conv_tch_afs_5_9_gen.c \ - conv_tch_afs_5_15_gen.c conv_tch_afs_4_75_gen.c \ auth_core.c auth_comp128v1.c auth_comp128v23.c \ auth_milenage.c milenage/aes-encblock.c gea.c \ milenage/aes-internal.c milenage/aes-internal-enc.c \ milenage/milenage.c gan.c ipa.c gsm0341.c apn.c \ - gsup.c gprs_gea.c + gsup.c gprs_gea.c gsm0503_conv.c libgsmint_la_LDFLAGS = -no-undefined libgsmint_la_LIBADD = $(top_builddir)/src/libosmocore.la @@ -37,5 +32,8 @@ libosmogsm_la_LIBADD = libgsmint.la EXTRA_DIST = libosmogsm.map -conv%gen.c: $(top_srcdir)/utils/conv_gen.py +# Convolutional codes generation +gsm0503_conv.c: $(AM_V_GEN)python2 $(top_srcdir)/utils/conv_gen.py + +CLEANFILES = gsm0503_conv.c -- cgit v1.2.3