Vadim Yanitskiy has submitted this change and it was merged. Change subject: core/conv: use proper filenames ......................................................................
core/conv: use proper filenames We already have generic convolutional transcoding implementation written by Sylvain Munaut and named 'conv.c', so 'viterbi_*' names looked a bit confusing. Let's use a single naming scheme for Viterbi related code. Change-Id: I61062a8d1fbf5f5fc85b4fac58dc4e9fa8b5ef90 --- M src/Makefile.am R src/conv_acc.c R src/conv_acc_generic.c R src/conv_acc_sse.c R src/conv_acc_sse_avx.c R src/conv_acc_sse_impl.h 6 files changed, 10 insertions(+), 10 deletions(-) Approvals: Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/Makefile.am b/src/Makefile.am index e98c623..692b699 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,28 +21,28 @@ conv.c application.c rbtree.c strrb.c \ loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ macaddr.c stat_item.c stats.c stats_statsd.c prim.c \ - viterbi.c viterbi_generic.c sercomm.c + conv_acc.c conv_acc_generic.c sercomm.c if HAVE_SSE3 -libosmocore_la_SOURCES += viterbi_sse.c +libosmocore_la_SOURCES += conv_acc_sse.c if HAVE_SSE4_1 -viterbi_sse.lo : CFLAGS += -msse3 -msse4.1 +conv_acc_sse.lo : CFLAGS += -msse3 -msse4.1 else -viterbi_sse.lo : CFLAGS += -msse3 +conv_acc_sse.lo : CFLAGS += -msse3 endif if HAVE_AVX2 -libosmocore_la_SOURCES += viterbi_sse_avx.c +libosmocore_la_SOURCES += conv_acc_sse_avx.c if HAVE_SSE4_1 -viterbi_sse_avx.lo : CFLAGS += -msse3 -mavx2 -msse4.1 +conv_acc_sse_avx.lo : CFLAGS += -msse3 -mavx2 -msse4.1 else -viterbi_sse_avx.lo : CFLAGS += -msse3 -mavx2 +conv_acc_sse_avx.lo : CFLAGS += -msse3 -mavx2 endif endif endif BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c -EXTRA_DIST = viterbi_sse_common.h +EXTRA_DIST = conv_acc_sse_impl.h if ENABLE_PLUGIN libosmocore_la_SOURCES += plugin.c diff --git a/src/viterbi.c b/src/conv_acc.c similarity index 100% rename from src/viterbi.c rename to src/conv_acc.c diff --git a/src/viterbi_generic.c b/src/conv_acc_generic.c similarity index 100% rename from src/viterbi_generic.c rename to src/conv_acc_generic.c diff --git a/src/viterbi_sse.c b/src/conv_acc_sse.c similarity index 98% rename from src/viterbi_sse.c rename to src/conv_acc_sse.c index f389085..9cbcc2f 100644 --- a/src/viterbi_sse.c +++ b/src/conv_acc_sse.c @@ -55,7 +55,7 @@ /** * Include common SSE implementation */ -#include <viterbi_sse_common.h> +#include <conv_acc_sse_impl.h> /* Aligned Memory Allocator * SSE requires 16-byte memory alignment. We store relevant trellis values diff --git a/src/viterbi_sse_avx.c b/src/conv_acc_sse_avx.c similarity index 98% rename from src/viterbi_sse_avx.c rename to src/conv_acc_sse_avx.c index b4c45a6..5d9a82b 100644 --- a/src/viterbi_sse_avx.c +++ b/src/conv_acc_sse_avx.c @@ -55,7 +55,7 @@ /** * Include common SSE implementation */ -#include <viterbi_sse_common.h> +#include <conv_acc_sse_impl.h> /* Aligned Memory Allocator * SSE requires 16-byte memory alignment. We store relevant trellis values diff --git a/src/viterbi_sse_common.h b/src/conv_acc_sse_impl.h similarity index 100% rename from src/viterbi_sse_common.h rename to src/conv_acc_sse_impl.h -- To view, visit https://gerrit.osmocom.org/2972 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61062a8d1fbf5f5fc85b4fac58dc4e9fa8b5ef90 Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Vadim Yanitskiy <axilira...@gmail.com> Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <msur...@sysmocom.de> Gerrit-Reviewer: Tom Tsou <t...@tsou.cc> Gerrit-Reviewer: Vadim Yanitskiy <axilira...@gmail.com>