12 Jan
2023
12 Jan
'23
5:21 p.m.
pespin has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/30959 )
Change subject: layer23: Add missing header dependencies to several files
......................................................................
layer23: Add missing header dependencies to several files
Change-Id: I9819b12d1c24f6ee197daa887452b09418d689e8
---
M src/host/layer23/include/osmocom/bb/common/l1ctl.h
M src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
M src/host/layer23/include/osmocom/bb/common/sim.h
M src/host/layer23/include/osmocom/bb/misc/log.h
M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
M src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
M src/host/layer23/include/osmocom/bb/mobile/mncc.h
M src/host/layer23/include/osmocom/bb/mobile/settings.h
M src/host/layer23/src/common/gps.c
M src/host/layer23/src/common/l1ctl_lapdm_glue.c
M src/host/layer23/src/common/l1l2_interface.c
M src/host/layer23/src/common/sap_fsm.c
M src/host/layer23/src/misc/app_cbch_sniff.c
M src/host/layer23/src/misc/app_echo_test.c
M src/host/layer23/src/misc/cell_log.c
M src/host/layer23/src/mobile/app_mobile.c
M src/host/layer23/src/mobile/gsm322.c
M src/host/layer23/src/mobile/gsm414.c
M src/host/layer23/src/mobile/gsm48_mm.c
M src/host/layer23/src/mobile/gsm48_rr.c
M src/host/layer23/src/mobile/mnccms.c
M src/host/layer23/src/mobile/settings.c
M src/host/layer23/src/mobile/subscriber.c
M src/host/layer23/src/mobile/voice.c
24 files changed, 49 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/59/30959/1
diff --git a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
index 7e9bf83..5b20506 100644
--- a/src/host/layer23/include/osmocom/bb/common/l1ctl.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h
@@ -2,6 +2,7 @@
#define osmocom_l1ctl_h
#include <osmocom/core/msgb.h>
+#include <osmocom/core/prim.h>
#include <osmocom/bb/common/osmocom_data.h>
struct osmocom_ms;
diff --git a/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
index 41403d8..4f46914 100644
--- a/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
+++ b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h
@@ -1,6 +1,8 @@
#ifndef _L1L2_INTERFACE_H
#define _L1L2_INTERFACE_H
+#include <osmocom/core/msgb.h>
+
int layer2_open(struct osmocom_ms *ms, const char *socket_path);
int layer2_close(struct osmocom_ms *ms);
int osmo_send_l1(struct osmocom_ms *ms, struct msgb *msg);
diff --git a/src/host/layer23/include/osmocom/bb/common/sim.h
b/src/host/layer23/include/osmocom/bb/common/sim.h
index 191a717..321baf4 100644
--- a/src/host/layer23/include/osmocom/bb/common/sim.h
+++ b/src/host/layer23/include/osmocom/bb/common/sim.h
@@ -17,6 +17,8 @@
#pragma once
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+
/* 9.2 commands */
#define GSM1111_CLASS_GSM 0xa0
#define GSM1111_INST_SELECT 0xa4
diff --git a/src/host/layer23/include/osmocom/bb/misc/log.h
b/src/host/layer23/include/osmocom/bb/misc/log.h
index 2e61401..f56eddc 100644
--- a/src/host/layer23/include/osmocom/bb/misc/log.h
+++ b/src/host/layer23/include/osmocom/bb/misc/log.h
@@ -1,6 +1,9 @@
+
#pragma once
+#include <osmocom/bb/common/sysinfo.h>
+
enum {
LOG_TYPE_NONE = 0,
LOG_TYPE_SYSINFO,
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
index bf3aa25..ce80317 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
@@ -1,6 +1,8 @@
#ifndef _GSM48_MM_H
#define _GSM48_MM_H
+struct gsm_settings;
+
/* GSM 04.07 9.2.2 */
#define GSM48_MMXX_MASK 0xf00
#define GSM48_MMCC_CLASS 0x100
diff --git a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
index 0e27026..ae9b867 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h
@@ -1,6 +1,7 @@
#ifndef _GSM48_RR_H
#define _GSM48_RR_H
+#include <osmocom/core/timer.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
#define GSM_TA_CM 55385
diff --git a/src/host/layer23/include/osmocom/bb/mobile/mncc.h
b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
index f5dbbe8..1ab83ef 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/mncc.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h
@@ -23,6 +23,7 @@
#define _MNCC_H
#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/timer.h>
#include <osmocom/gsm/mncc.h>
struct gsm_call {
diff --git a/src/host/layer23/include/osmocom/bb/mobile/settings.h
b/src/host/layer23/include/osmocom/bb/mobile/settings.h
index 879be54..7b64e40 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/settings.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h
@@ -1,6 +1,9 @@
#ifndef _settings_h
#define _settings_h
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+
#define MOB_C7_DEFLT_ANY_TIMEOUT 30
/* CC (Call Control) message handling entity */
diff --git a/src/host/layer23/src/common/gps.c b/src/host/layer23/src/common/gps.c
index b6b547b..3c69352 100644
--- a/src/host/layer23/src/common/gps.c
+++ b/src/host/layer23/src/common/gps.c
@@ -29,6 +29,7 @@
#endif
#include <osmocom/core/utils.h>
+#include <osmocom/core/select.h>
#include <osmocom/bb/common/osmocom_data.h>
#include <osmocom/bb/common/logging.h>
diff --git a/src/host/layer23/src/common/l1ctl_lapdm_glue.c
b/src/host/layer23/src/common/l1ctl_lapdm_glue.c
index a754476..601bed6 100644
--- a/src/host/layer23/src/common/l1ctl_lapdm_glue.c
+++ b/src/host/layer23/src/common/l1ctl_lapdm_glue.c
@@ -17,6 +17,7 @@
*/
#include <stdint.h>
+#include <errno.h>
#include <l1ctl_proto.h>
diff --git a/src/host/layer23/src/common/l1l2_interface.c
b/src/host/layer23/src/common/l1l2_interface.c
index 04a5dba..9db285f 100644
--- a/src/host/layer23/src/common/l1l2_interface.c
+++ b/src/host/layer23/src/common/l1l2_interface.c
@@ -24,6 +24,7 @@
#include <osmocom/core/utils.h>
#include <osmocom/core/socket.h>
+#include <osmocom/core/select.h>
#include <sys/socket.h>
#include <sys/un.h>
diff --git a/src/host/layer23/src/common/sap_fsm.c
b/src/host/layer23/src/common/sap_fsm.c
index 7e08836..ce0a22d 100644
--- a/src/host/layer23/src/common/sap_fsm.c
+++ b/src/host/layer23/src/common/sap_fsm.c
@@ -27,6 +27,7 @@
#include <osmocom/core/socket.h>
#include <osmocom/core/utils.h>
#include <osmocom/core/fsm.h>
+#include <osmocom/core/write_queue.h>
#include <osmocom/bb/common/osmocom_data.h>
#include <osmocom/bb/common/logging.h>
diff --git a/src/host/layer23/src/misc/app_cbch_sniff.c
b/src/host/layer23/src/misc/app_cbch_sniff.c
index d5424ba..24caae9 100644
--- a/src/host/layer23/src/misc/app_cbch_sniff.c
+++ b/src/host/layer23/src/misc/app_cbch_sniff.c
@@ -23,14 +23,15 @@
#include <osmocom/bb/common/logging.h>
#include <osmocom/bb/common/l23_app.h>
#include <osmocom/bb/misc/layer3.h>
+#include <osmocom/bb/common/sysinfo.h>
#include <osmocom/core/msgb.h>
#include <osmocom/core/talloc.h>
#include <osmocom/core/select.h>
#include <osmocom/core/signal.h>
#include <osmocom/gsm/rsl.h>
-
#include <osmocom/gsm/protocol/gsm_08_58.h>
+#include <osmocom/gsm/lapdm.h>
#include <l1ctl_proto.h>
diff --git a/src/host/layer23/src/misc/app_echo_test.c
b/src/host/layer23/src/misc/app_echo_test.c
index 6d95e65..3cf854a 100644
--- a/src/host/layer23/src/misc/app_echo_test.c
+++ b/src/host/layer23/src/misc/app_echo_test.c
@@ -26,7 +26,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/core/talloc.h>
#include <osmocom/core/select.h>
-
+#include <osmocom/core/timer.h>
static struct {
struct osmo_timer_list timer;
diff --git a/src/host/layer23/src/misc/cell_log.c b/src/host/layer23/src/misc/cell_log.c
index 57bed0f..ab8678d 100644
--- a/src/host/layer23/src/misc/cell_log.c
+++ b/src/host/layer23/src/misc/cell_log.c
@@ -32,12 +32,16 @@
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/gsm/rsl.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/lapdm.h>
#include <osmocom/bb/common/l1ctl.h>
#include <osmocom/bb/common/osmocom_data.h>
#include <osmocom/bb/common/logging.h>
#include <osmocom/bb/common/networks.h>
#include <osmocom/bb/common/gps.h>
+#include <osmocom/bb/common/sysinfo.h>
+#include <osmocom/bb/mobile/gsm48_rr.h>
#include <osmocom/bb/misc/cell_log.h>
#include <osmocom/bb/misc/geo.h>
diff --git a/src/host/layer23/src/mobile/app_mobile.c
b/src/host/layer23/src/mobile/app_mobile.c
index e59ecb9..5ea31c0 100644
--- a/src/host/layer23/src/mobile/app_mobile.c
+++ b/src/host/layer23/src/mobile/app_mobile.c
@@ -26,16 +26,21 @@
#include <osmocom/bb/common/l1ctl.h>
#include <osmocom/bb/common/logging.h>
#include <osmocom/bb/common/gps.h>
+#include <osmocom/bb/common/sap_interface.h>
+#include <osmocom/bb/common/sim.h>
+
#include <osmocom/bb/mobile/gsm48_rr.h>
#include <osmocom/bb/mobile/gsm480_ss.h>
+#include <osmocom/bb/mobile/gsm48_mm.h>
+#include <osmocom/bb/mobile/gsm48_cc.h>
#include <osmocom/bb/mobile/gsm411_sms.h>
+#include <osmocom/bb/mobile/gsm322.h>
#include <osmocom/bb/mobile/vty.h>
#include <osmocom/bb/mobile/app_mobile.h>
#include <osmocom/bb/mobile/mncc.h>
#include <osmocom/bb/mobile/voice.h>
#include <osmocom/bb/mobile/gapk_io.h>
#include <osmocom/bb/mobile/primitives.h>
-#include <osmocom/bb/common/sap_interface.h>
#include <osmocom/vty/ports.h>
#include <osmocom/vty/logging.h>
diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c
index 9b3806f..b94fbaf 100644
--- a/src/host/layer23/src/mobile/gsm322.c
+++ b/src/host/layer23/src/mobile/gsm322.c
@@ -33,9 +33,12 @@
#include <osmocom/bb/common/l1ctl.h>
#include <osmocom/bb/common/osmocom_data.h>
#include <osmocom/bb/common/networks.h>
+#include <osmocom/bb/common/utils.h>
#include <osmocom/bb/mobile/vty.h>
#include <osmocom/bb/mobile/app_mobile.h>
-#include <osmocom/bb/common/utils.h>
+#include <osmocom/bb/mobile/gsm322.h>
+#include <osmocom/bb/mobile/gsm48_mm.h>
+#include <osmocom/bb/mobile/settings.h>
#include <l1ctl_proto.h>
diff --git a/src/host/layer23/src/mobile/gsm414.c b/src/host/layer23/src/mobile/gsm414.c
index 2fcf4dc..e4a4edd 100644
--- a/src/host/layer23/src/mobile/gsm414.c
+++ b/src/host/layer23/src/mobile/gsm414.c
@@ -34,6 +34,7 @@
#include <osmocom/bb/common/osmocom_data.h>
#include <osmocom/bb/common/logging.h>
+#include <osmocom/bb/mobile/gsm48_rr.h>
#include <l1ctl_proto.h>
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c
b/src/host/layer23/src/mobile/gsm48_mm.c
index 80aff82..8e3c976 100644
--- a/src/host/layer23/src/mobile/gsm48_mm.c
+++ b/src/host/layer23/src/mobile/gsm48_mm.c
@@ -26,18 +26,22 @@
#include <osmocom/core/utils.h>
#include <osmocom/gsm/gsm48.h>
#include <osmocom/core/talloc.h>
+#include <osmocom/core/timer.h>
#include <osmocom/bb/common/logging.h>
#include <osmocom/bb/common/osmocom_data.h>
#include <osmocom/bb/common/networks.h>
#include <osmocom/bb/common/l1ctl.h>
+#include <osmocom/bb/common/utils.h>
#include <osmocom/bb/mobile/gsm48_cc.h>
#include <osmocom/bb/mobile/gsm480_ss.h>
#include <osmocom/bb/mobile/gsm411_sms.h>
#include <osmocom/bb/mobile/app_mobile.h>
#include <osmocom/bb/mobile/primitives.h>
#include <osmocom/bb/mobile/vty.h>
-#include <osmocom/bb/common/utils.h>
+#include <osmocom/bb/mobile/gsm48_rr.h>
+#include <osmocom/bb/mobile/gsm322.h>
+#include <osmocom/bb/mobile/subscriber.h>
extern void *l23_ctx;
diff --git a/src/host/layer23/src/mobile/gsm48_rr.c
b/src/host/layer23/src/mobile/gsm48_rr.c
index deb76c9..44d7440 100644
--- a/src/host/layer23/src/mobile/gsm48_rr.c
+++ b/src/host/layer23/src/mobile/gsm48_rr.c
@@ -74,10 +74,12 @@
#include <osmocom/bb/common/logging.h>
#include <osmocom/bb/common/networks.h>
#include <osmocom/bb/common/l1ctl.h>
+#include <osmocom/bb/common/utils.h>
#include <osmocom/bb/mobile/gapk_io.h>
#include <osmocom/bb/mobile/vty.h>
-#include <osmocom/bb/common/utils.h>
+#include <osmocom/bb/mobile/gsm48_rr.h>
+#include <osmocom/bb/mobile/settings.h>
#include <l1ctl_proto.h>
diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c
index 5accd5e..5d4502a 100644
--- a/src/host/layer23/src/mobile/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
@@ -28,6 +28,7 @@
#include <osmocom/bb/mobile/mncc.h>
#include <osmocom/bb/mobile/mncc_ms.h>
#include <osmocom/bb/mobile/vty.h>
+#include <osmocom/bb/mobile/settings.h>
static uint32_t new_callref = 1;
static LLIST_HEAD(call_list);
diff --git a/src/host/layer23/src/mobile/settings.c
b/src/host/layer23/src/mobile/settings.c
index 445190e..846cda2 100644
--- a/src/host/layer23/src/mobile/settings.c
+++ b/src/host/layer23/src/mobile/settings.c
@@ -21,6 +21,7 @@
#include <osmocom/core/talloc.h>
#include <osmocom/bb/mobile/app_mobile.h>
+#include <osmocom/bb/mobile/settings.h>
#include <osmocom/bb/common/utils.h>
#include <osmocom/bb/common/logging.h>
#include <osmocom/bb/common/osmocom_data.h>
diff --git a/src/host/layer23/src/mobile/subscriber.c
b/src/host/layer23/src/mobile/subscriber.c
index 4009238..a226889 100644
--- a/src/host/layer23/src/mobile/subscriber.c
+++ b/src/host/layer23/src/mobile/subscriber.c
@@ -28,6 +28,7 @@
#include <osmocom/bb/common/sap_proto.h>
#include <osmocom/bb/common/networks.h>
#include <osmocom/bb/mobile/vty.h>
+#include <osmocom/bb/mobile/subscriber.h>
/* enable to get an empty list of forbidden PLMNs, even if stored on SIM.
* if list is changed, the result is not written back to SIM */
diff --git a/src/host/layer23/src/mobile/voice.c b/src/host/layer23/src/mobile/voice.c
index 260e1d2..0840ea5 100644
--- a/src/host/layer23/src/mobile/voice.c
+++ b/src/host/layer23/src/mobile/voice.c
@@ -29,6 +29,7 @@
#include <osmocom/bb/common/osmocom_data.h>
#include <osmocom/bb/mobile/gapk_io.h>
#include <osmocom/bb/mobile/mncc.h>
+#include <osmocom/bb/mobile/mncc_sock.h>
#include <osmocom/bb/mobile/voice.h>
/* Forward a Downlink voice frame to the external MNCC handler */
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30959
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I9819b12d1c24f6ee197daa887452b09418d689e8
Gerrit-Change-Number: 30959
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange