pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/31150 ) Change subject: rlcmac: Rename ts_*.c -> csn1_ts_*.c ...................................................................... rlcmac: Rename ts_*.c -> csn1_ts_*.c Done for files containing mostly (99%) of CSN1 related structrs and encdec functions. File ts_44_064.c is kept as is since it's not CSN1 related. File csn1_ts_44_060.c still contains some enums and value_string which will be split into ts_44_060.c in a follow up commit. Change-Id: I93ad9f90e7496b81ccfe679a614589373f244166 --- M .checkpatch.conf M src/rlcmac/Makefile.am R src/rlcmac/csn1_ts_24_008.c R src/rlcmac/csn1_ts_44_018.c R src/rlcmac/csn1_ts_44_060.c M tests/rlcmac/Makefile.am R tests/rlcmac/csn1_ts_44_018_test.c R tests/rlcmac/csn1_ts_44_018_test.err R tests/rlcmac/csn1_ts_44_018_test.ok R tests/rlcmac/csn1_ts_44_060_test.c R tests/rlcmac/csn1_ts_44_060_test.err R tests/rlcmac/csn1_ts_44_060_test.ok M tests/testsuite.at 13 files changed, 26 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/.checkpatch.conf b/.checkpatch.conf index d91a723..31f2b03 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -1,9 +1,9 @@ --exclude ^src/csn1/csn1.c$ --exclude ^src/csn1/csn1_(enc|dec).c$ --exclude ^include/osmocom/csn1/csn1.h$ ---exclude ^src/rlcmac/ts_24_008.c$ ---exclude ^src/rlcmac/ts_44_018.c$ ---exclude ^src/rlcmac/ts_44_060.c$ +--exclude ^src/rlcmac/csn1_ts_24_008.c$ +--exclude ^src/rlcmac/csn1_ts_44_018.c$ +--exclude ^src/rlcmac/csn1_ts_44_060.c$ --exclude ^include/osmocom/gprs/rlcmac/csn1_defs.h$ --exclude ^include/osmocom/gprs/sndcp/v42bis_private.h$ --exclude ^include/osmocom/gprs/sndcp/v42bis.h$ diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am index 47e88b6..4150f84 100644 --- a/src/rlcmac/Makefile.am +++ b/src/rlcmac/Makefile.am @@ -22,14 +22,14 @@ $(NULL) libosmo_gprs_rlcmac_la_SOURCES = \ + csn1_ts_24_008.c \ + csn1_ts_44_018.c \ + csn1_ts_44_060.c \ codel.c \ gre.c \ llc_queue.c \ rlcmac.c \ rlcmac_prim.c \ - ts_24_008.c \ - ts_44_018.c \ - ts_44_060.c \ ts_44_064.c \ misc.c \ $(NULL) diff --git a/src/rlcmac/ts_24_008.c b/src/rlcmac/csn1_ts_24_008.c similarity index 100% rename from src/rlcmac/ts_24_008.c rename to src/rlcmac/csn1_ts_24_008.c diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/csn1_ts_44_018.c similarity index 100% rename from src/rlcmac/ts_44_018.c rename to src/rlcmac/csn1_ts_44_018.c diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/csn1_ts_44_060.c similarity index 100% rename from src/rlcmac/ts_44_060.c rename to src/rlcmac/csn1_ts_44_060.c diff --git a/tests/rlcmac/Makefile.am b/tests/rlcmac/Makefile.am index b840b1f..9ea8f16 100644 --- a/tests/rlcmac/Makefile.am +++ b/tests/rlcmac/Makefile.am @@ -9,15 +9,15 @@ $(NULL) check_PROGRAMS = \ - ts_44_018_test \ - ts_44_060_test \ + csn1_ts_44_018_test \ + csn1_ts_44_060_test \ $(NULL) EXTRA_DIST = \ - ts_44_018_test.ok \ - ts_44_018_test.err \ - ts_44_060_test.ok \ - ts_44_060_test.err \ + csn1_ts_44_018_test.ok \ + csn1_ts_44_018_test.err \ + csn1_ts_44_060_test.ok \ + csn1_ts_44_060_test.err \ $(NULL) # Common LDADD entries @@ -27,8 +27,8 @@ $(top_builddir)/src/rlcmac/libosmo-gprs-rlcmac.la \ $(NULL) -ts_44_018_test_SOURCES = ts_44_018_test.c -ts_44_018_test_LDADD = $(LDADD) +csn1_ts_44_018_test_SOURCES = csn1_ts_44_018_test.c +csn1_ts_44_018_test_LDADD = $(LDADD) -ts_44_060_test_SOURCES = ts_44_060_test.c -ts_44_060_test_LDADD = $(LDADD) +csn1_ts_44_060_test_SOURCES = csn1_ts_44_060_test.c +csn1_ts_44_060_test_LDADD = $(LDADD) diff --git a/tests/rlcmac/ts_44_018_test.c b/tests/rlcmac/csn1_ts_44_018_test.c similarity index 100% rename from tests/rlcmac/ts_44_018_test.c rename to tests/rlcmac/csn1_ts_44_018_test.c diff --git a/tests/rlcmac/ts_44_018_test.err b/tests/rlcmac/csn1_ts_44_018_test.err similarity index 100% rename from tests/rlcmac/ts_44_018_test.err rename to tests/rlcmac/csn1_ts_44_018_test.err diff --git a/tests/rlcmac/ts_44_018_test.ok b/tests/rlcmac/csn1_ts_44_018_test.ok similarity index 100% rename from tests/rlcmac/ts_44_018_test.ok rename to tests/rlcmac/csn1_ts_44_018_test.ok diff --git a/tests/rlcmac/ts_44_060_test.c b/tests/rlcmac/csn1_ts_44_060_test.c similarity index 100% rename from tests/rlcmac/ts_44_060_test.c rename to tests/rlcmac/csn1_ts_44_060_test.c diff --git a/tests/rlcmac/ts_44_060_test.err b/tests/rlcmac/csn1_ts_44_060_test.err similarity index 100% rename from tests/rlcmac/ts_44_060_test.err rename to tests/rlcmac/csn1_ts_44_060_test.err diff --git a/tests/rlcmac/ts_44_060_test.ok b/tests/rlcmac/csn1_ts_44_060_test.ok similarity index 100% rename from tests/rlcmac/ts_44_060_test.ok rename to tests/rlcmac/csn1_ts_44_060_test.ok diff --git a/tests/testsuite.at b/tests/testsuite.at index 84cbb4e..87e95b6 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -29,18 +29,18 @@ AT_CHECK([$abs_top_builddir/tests/llc/xid_codec_test], [0], [expout], [experr]) AT_CLEANUP -AT_SETUP([rlcmac/ts_44_018]) -AT_KEYWORDS([rlcmac ts_44_018]) -cat $abs_srcdir/rlcmac/ts_44_018_test.ok > expout -cat $abs_srcdir/rlcmac/ts_44_018_test.err > experr -AT_CHECK([$abs_top_builddir/tests/rlcmac/ts_44_018_test], [0], [expout], [experr]) +AT_SETUP([rlcmac/csn1_ts_44_018]) +AT_KEYWORDS([rlcmac csn1_ts_44_018]) +cat $abs_srcdir/rlcmac/csn1_ts_44_018_test.ok > expout +cat $abs_srcdir/rlcmac/csn1_ts_44_018_test.err > experr +AT_CHECK([$abs_top_builddir/tests/rlcmac/csn1_ts_44_018_test], [0], [expout], [experr]) AT_CLEANUP -AT_SETUP([rlcmac/ts_44_060]) -AT_KEYWORDS([rlcmac ts_44_060]) -cat $abs_srcdir/rlcmac/ts_44_060_test.ok > expout -cat $abs_srcdir/rlcmac/ts_44_060_test.err > experr -AT_CHECK([$abs_top_builddir/tests/rlcmac/ts_44_060_test], [0], [expout], [experr]) +AT_SETUP([rlcmac/csn1_ts_44_060]) +AT_KEYWORDS([rlcmac csn1_ts_44_060]) +cat $abs_srcdir/rlcmac/csn1_ts_44_060_test.ok > expout +cat $abs_srcdir/rlcmac/csn1_ts_44_060_test.err > experr +AT_CHECK([$abs_top_builddir/tests/rlcmac/csn1_ts_44_060_test], [0], [expout], [experr]) AT_CLEANUP AT_SETUP([sndcp/sndcp_prim]) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/31150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I93ad9f90e7496b81ccfe679a614589373f244166 Gerrit-Change-Number: 31150 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged