pespin submitted this change.

View Change

Move struct gsm_bts_paging_state to paging.h

Change-Id: I8c058d308fc816828b5e6a86e7c5a1f629a2d7c4
---
M include/osmocom/bsc/bts.h
M include/osmocom/bsc/gsm_data.h
M include/osmocom/bsc/paging.h
M src/ipaccess/Makefile.am
M src/utils/Makefile.am
M tests/abis/Makefile.am
M tests/acc/Makefile.am
M tests/codec_pref/Makefile.am
M tests/gsm0408/Makefile.am
M tests/nanobts_omlattr/Makefile.am
M tests/subscr/Makefile.am
11 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index cd0f8cb..95d9b05 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -17,6 +17,7 @@
 #include "osmocom/bsc/bts_trx.h"
 #include "osmocom/bsc/bts_sm.h"
 #include "osmocom/bsc/abis_om2000.h"
+#include "osmocom/bsc/paging.h"
 
 enum bts_counter_id {
 	BTS_CTR_CHREQ_TOTAL,
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index 4a58c2b..b478ba0 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -962,26 +962,6 @@
 
 #define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0])
 
-/*
- * This keeps track of the paging status of one BTS. It
- * includes a number of pending requests, a back pointer
- * to the gsm_bts, a timer and some more state.
- */
-struct gsm_bts_paging_state {
-	/* pending requests */
-	struct llist_head pending_requests;
-	struct gsm_bts *bts;
-
-	struct osmo_timer_list work_timer;
-	struct osmo_timer_list credit_timer;
-
-	/* free chans needed */
-	int free_chans_need;
-
-	/* load */
-	uint16_t available_slots;
-};
-
 struct gsm_envabtse {
 	struct gsm_abis_mo mo;
 };
diff --git a/include/osmocom/bsc/paging.h b/include/osmocom/bsc/paging.h
index dd3d316..c4381fa 100644
--- a/include/osmocom/bsc/paging.h
+++ b/include/osmocom/bsc/paging.h
@@ -89,6 +89,26 @@
 	enum bsc_paging_reason reason;
 };
 
+/*
+ * This keeps track of the paging status of one BTS. It
+ * includes a number of pending requests, a back pointer
+ * to the gsm_bts, a timer and some more state.
+ */
+struct gsm_bts_paging_state {
+	/* pending requests */
+	struct llist_head pending_requests;
+	struct gsm_bts *bts;
+
+	struct osmo_timer_list work_timer;
+	struct osmo_timer_list credit_timer;
+
+	/* free chans needed */
+	int free_chans_need;
+
+	/* load */
+	uint16_t available_slots;
+};
+
 void paging_init(struct gsm_bts *bts);
 
 /* schedule paging request */
diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index 9a9fff6..9bd648d 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -9,6 +9,8 @@
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
+	$(LIBOSMOSIGTRAN_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
 
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 1d6c48e..18debe7 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -9,6 +9,8 @@
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
+	$(LIBOSMOSIGTRAN_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(SQLITE3_CFLAGS) \
 	$(NULL)
diff --git a/tests/abis/Makefile.am b/tests/abis/Makefile.am
index 2fa6b30..d17eff8 100644
--- a/tests/abis/Makefile.am
+++ b/tests/abis/Makefile.am
@@ -7,8 +7,10 @@
 	-Wall \
 	-ggdb3 \
 	$(LIBOSMOCORE_CFLAGS) \
-	$(LIBOSMOABIS_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
+	$(LIBOSMOSIGTRAN_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
 
diff --git a/tests/acc/Makefile.am b/tests/acc/Makefile.am
index 2c41666..a169c5c 100644
--- a/tests/acc/Makefile.am
+++ b/tests/acc/Makefile.am
@@ -7,8 +7,10 @@
 	-Wall \
 	-ggdb3 \
 	$(LIBOSMOCORE_CFLAGS) \
-	$(LIBOSMOABIS_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
+	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
+	$(LIBOSMOSIGTRAN_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
 
diff --git a/tests/codec_pref/Makefile.am b/tests/codec_pref/Makefile.am
index b16f282..ec25da5 100644
--- a/tests/codec_pref/Makefile.am
+++ b/tests/codec_pref/Makefile.am
@@ -8,6 +8,7 @@
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
 	$(LIBOSMOSIGTRAN_CFLAGS) \
 	$(NULL)
 
diff --git a/tests/gsm0408/Makefile.am b/tests/gsm0408/Makefile.am
index e078610..4802025 100644
--- a/tests/gsm0408/Makefile.am
+++ b/tests/gsm0408/Makefile.am
@@ -9,6 +9,8 @@
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOCTRL_CFLAGS) \
 	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
+	$(LIBOSMOSIGTRAN_CFLAGS) \
 	$(NULL)
 
 check_PROGRAMS = \
diff --git a/tests/nanobts_omlattr/Makefile.am b/tests/nanobts_omlattr/Makefile.am
index 9b16a3c..8c64356 100644
--- a/tests/nanobts_omlattr/Makefile.am
+++ b/tests/nanobts_omlattr/Makefile.am
@@ -8,6 +8,8 @@
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
+	$(LIBOSMOSIGTRAN_CFLAGS) \
 	$(NULL)
 
 check_PROGRAMS = \
diff --git a/tests/subscr/Makefile.am b/tests/subscr/Makefile.am
index 329b6c0..e18b96a 100644
--- a/tests/subscr/Makefile.am
+++ b/tests/subscr/Makefile.am
@@ -9,6 +9,8 @@
 	$(LIBOSMOCORE_CFLAGS) \
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMONETIF_CFLAGS) \
+	$(LIBOSMOSIGTRAN_CFLAGS) \
 	$(LIBSMPP34_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)

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