pespin submitted this change.

View Change

rlcmac: Rename gprs_rlcmac.h -> csn1_defs.h

That header is used (and should only be used) to contain CSN1 related
code for the encoder/decoder.
Hence rename it, otherwise it looks like a general placeholder for any
kind of stuff.

Change-Id: I84ea63ed0b804699fd995a2e0c07ced17b3ad4c8
---
M .checkpatch.conf
M debian/copyright
M include/osmocom/gprs/rlcmac/Makefile.am
R include/osmocom/gprs/rlcmac/csn1_defs.h
M src/rlcmac/ts_24_008.c
M src/rlcmac/ts_44_018.c
M src/rlcmac/ts_44_060.c
M tests/rlcmac/ts_44_018_test.c
M tests/rlcmac/ts_44_060_test.c
9 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.checkpatch.conf b/.checkpatch.conf
index 81f49da..d91a723 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -4,7 +4,7 @@
 --exclude ^src/rlcmac/ts_24_008.c$
 --exclude ^src/rlcmac/ts_44_018.c$
 --exclude ^src/rlcmac/ts_44_060.c$
---exclude ^include/osmocom/gprs/rlcmac/gprs_rlcmac.h$
+--exclude ^include/osmocom/gprs/rlcmac/csn1_defs.h$
 --exclude ^include/osmocom/gprs/sndcp/v42bis_private.h$
 --exclude ^include/osmocom/gprs/sndcp/v42bis.h$
 --exclude ^src/sndcp/v42bis.c$
diff --git a/debian/copyright b/debian/copyright
index 2ff9bd6..1340b54 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@
            src/csn1/csn1_dec.c
            src/rlcmac/gprs_rlcmac.c
            include/osmocom/csn1/csn1.h
-           include/osmocom/gprs/rlcmac/gprs_rlcmac.h
+           include/osmocom/gprs/rlcmac/csn1_defs.h
 Copyright: 2011 Vincent Helfre
            2011 ST-Ericsson (Jari Sassi)
 License:   GPL-2.0+
diff --git a/include/osmocom/gprs/rlcmac/Makefile.am b/include/osmocom/gprs/rlcmac/Makefile.am
index b8ff1e0..091882a 100644
--- a/include/osmocom/gprs/rlcmac/Makefile.am
+++ b/include/osmocom/gprs/rlcmac/Makefile.am
@@ -6,9 +6,9 @@
 	$(NULL)
 
 rlcmac_HEADERS = \
+	csn1_defs.h \
 	rlcmac.h \
 	rlcmac_prim.h \
-	gprs_rlcmac.h \
 	$(NULL)
 
 rlcmacdir = $(includedir)/osmocom/gprs/rlcmac
diff --git a/include/osmocom/gprs/rlcmac/gprs_rlcmac.h b/include/osmocom/gprs/rlcmac/csn1_defs.h
similarity index 100%
rename from include/osmocom/gprs/rlcmac/gprs_rlcmac.h
rename to include/osmocom/gprs/rlcmac/csn1_defs.h
diff --git a/src/rlcmac/ts_24_008.c b/src/rlcmac/ts_24_008.c
index 6dece2a..d38185d 100644
--- a/src/rlcmac/ts_24_008.c
+++ b/src/rlcmac/ts_24_008.c
@@ -25,7 +25,7 @@
 #include <osmocom/core/logging.h>
 
 #include <osmocom/csn1/csn1.h>
-#include <osmocom/gprs/rlcmac/gprs_rlcmac.h>
+#include <osmocom/gprs/rlcmac/csn1_defs.h>
 #include <osmocom/gprs/rlcmac/rlcmac_private.h>
 
 /*< MS Classmark 3 IE >*/
diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/ts_44_018.c
index c869ad8..cc62c62 100644
--- a/src/rlcmac/ts_44_018.c
+++ b/src/rlcmac/ts_44_018.c
@@ -25,7 +25,7 @@
 #include <osmocom/core/logging.h>
 
 #include <osmocom/csn1/csn1.h>
-#include <osmocom/gprs/rlcmac/gprs_rlcmac.h>
+#include <osmocom/gprs/rlcmac/csn1_defs.h>
 #include <osmocom/gprs/rlcmac/rlcmac_private.h>
 
 CSN_DESCR_EXTERN(GPRS_Mobile_Allocation_t);
diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/ts_44_060.c
index 33514e9..0ebfbed 100644
--- a/src/rlcmac/ts_44_060.c
+++ b/src/rlcmac/ts_44_060.c
@@ -29,7 +29,7 @@
 #include <osmocom/core/logging.h>
 
 #include <osmocom/csn1/csn1.h>
-#include <osmocom/gprs/rlcmac/gprs_rlcmac.h>
+#include <osmocom/gprs/rlcmac/csn1_defs.h>
 #include <osmocom/gprs/rlcmac/rlcmac_private.h>
 
 /* Payload type as defined in TS 44.060 / 10.4.7 */
diff --git a/tests/rlcmac/ts_44_018_test.c b/tests/rlcmac/ts_44_018_test.c
index a5c4540..bef4e8b 100644
--- a/tests/rlcmac/ts_44_018_test.c
+++ b/tests/rlcmac/ts_44_018_test.c
@@ -23,7 +23,7 @@
 #include <osmocom/core/msgb.h>
 
 #include <osmocom/csn1/csn1.h>
-#include <osmocom/gprs/rlcmac/gprs_rlcmac.h>
+#include <osmocom/gprs/rlcmac/csn1_defs.h>
 
 static void *tall_ctx = NULL;
 
diff --git a/tests/rlcmac/ts_44_060_test.c b/tests/rlcmac/ts_44_060_test.c
index 781ea9a..1591102 100644
--- a/tests/rlcmac/ts_44_060_test.c
+++ b/tests/rlcmac/ts_44_060_test.c
@@ -23,7 +23,7 @@
 #include <osmocom/core/msgb.h>
 
 #include <osmocom/csn1/csn1.h>
-#include <osmocom/gprs/rlcmac/gprs_rlcmac.h>
+#include <osmocom/gprs/rlcmac/csn1_defs.h>
 
 static void testRlcMacDownlink(void *test_ctx)
 {

To view, visit change 31149. To unsubscribe, or for help writing mail filters, visit settings.