aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-10-20 08:28:25 +0200
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-10-30 21:24:10 +0100
commit7ce21eb042124b05faba929712de61de415973d0 (patch)
treeb7a417d899a68eb89ef0390fef932a0886ea6831
parent34bd8bdf30769b5aab50b87045ff2b621429c7be (diff)
data: Move gprs_rlcmac_cs to the place it is used and make static
-rw-r--r--src/gprs_rlcmac.cpp9
-rw-r--r--src/gprs_rlcmac.h2
-rw-r--r--src/gprs_rlcmac_data.cpp10
3 files changed, 10 insertions, 11 deletions
diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp
index a8fd5ec..4adcfba 100644
--- a/src/gprs_rlcmac.cpp
+++ b/src/gprs_rlcmac.cpp
@@ -27,15 +27,6 @@
#include <tbf.h>
-struct gprs_rlcmac_cs gprs_rlcmac_cs[] = {
-/* frame length data block max payload */
- { 0, 0, 0 },
- { 23, 23, 20 }, /* CS-1 */
- { 34, 33, 30 }, /* CS-2 */
- { 40, 39, 36 }, /* CS-3 */
- { 54, 53, 50 }, /* CS-4 */
-};
-
extern void *tall_pcu_ctx;
#ifdef DEBUG_DIAGRAM
diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h
index 90c1b77..d7d4647 100644
--- a/src/gprs_rlcmac.h
+++ b/src/gprs_rlcmac.h
@@ -65,8 +65,6 @@ struct gprs_rlcmac_cs {
uint8_t block_payload;
};
-extern struct gprs_rlcmac_cs gprs_rlcmac_cs[];
-
#ifdef DEBUG_DIAGRAM
void debug_diagram(BTS *bts, int diag, const char *format, ...);
#else
diff --git a/src/gprs_rlcmac_data.cpp b/src/gprs_rlcmac_data.cpp
index 170ed9a..67a8ed7 100644
--- a/src/gprs_rlcmac_data.cpp
+++ b/src/gprs_rlcmac_data.cpp
@@ -25,6 +25,16 @@
#include <encoding.h>
#include <tbf.h>
+static struct gprs_rlcmac_cs gprs_rlcmac_cs[] = {
+/* frame length data block max payload */
+ { 0, 0, 0 },
+ { 23, 23, 20 }, /* CS-1 */
+ { 34, 33, 30 }, /* CS-2 */
+ { 40, 39, 36 }, /* CS-3 */
+ { 54, 53, 50 }, /* CS-4 */
+};
+
+
extern void *tall_pcu_ctx;
extern "C" {