diff options
author | Sylvain Munaut <tnt@246tNt.com> | 2010-07-27 20:44:46 +0200 |
---|---|---|
committer | Sylvain Munaut <tnt@246tNt.com> | 2010-07-27 20:49:27 +0200 |
commit | 9e9f99c0a094a3b82a75bbac33cabc2be8a6bacb (patch) | |
tree | 24f420eb61d8204c93ae1f369221626e2c27a948 /src | |
parent | de21ca4aaf999b15caca686b217708111117789b (diff) |
layer23: Split [2/2] -> The header files
This split the headers and adapt the source.
We use osmocom/bb as a prefix because libosomore also
uses osmocom and generic names such as misc & common could
conflict in the future.
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Diffstat (limited to 'src')
50 files changed, 132 insertions, 122 deletions
diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac index 4adf0659..1be98eec 100644 --- a/src/host/layer23/configure.ac +++ b/src/host/layer23/configure.ac @@ -28,4 +28,8 @@ AC_OUTPUT( src/mobile/Makefile include/Makefile include/osmocom/Makefile + include/osmocom/bb/Makefile + include/osmocom/bb/common/Makefile + include/osmocom/bb/misc/Makefile + include/osmocom/bb/mobile/Makefile Makefile) diff --git a/src/host/layer23/include/osmocom/Makefile.am b/src/host/layer23/include/osmocom/Makefile.am index f4002f54..5adf9df5 100644 --- a/src/host/layer23/include/osmocom/Makefile.am +++ b/src/host/layer23/include/osmocom/Makefile.am @@ -1,2 +1 @@ -noinst_HEADERS = l1ctl.h osmocom_data.h lapdm.h rslms.h layer3.h \ - logging.h +SUBDIRS = bb diff --git a/src/host/layer23/include/osmocom/bb/Makefile.am b/src/host/layer23/include/osmocom/bb/Makefile.am new file mode 100644 index 00000000..58a5f7fb --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = common misc mobile diff --git a/src/host/layer23/include/osmocom/bb/common/Makefile.am b/src/host/layer23/include/osmocom/bb/common/Makefile.am new file mode 100644 index 00000000..fa467575 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/common/Makefile.am @@ -0,0 +1,2 @@ +noinst_HEADERS = l1ctl.h l1l2_interface.h l23_app.h lapdm.h logging.h networks.h \ + osmocom_data.h diff --git a/src/host/layer23/include/osmocom/l1ctl.h b/src/host/layer23/include/osmocom/bb/common/l1ctl.h index 9e76382c..75551abe 100644 --- a/src/host/layer23/include/osmocom/l1ctl.h +++ b/src/host/layer23/include/osmocom/bb/common/l1ctl.h @@ -2,7 +2,7 @@ #define osmocom_l1ctl_h #include <osmocore/msgb.h> -#include <osmocom/osmocom_data.h> +#include <osmocom/bb/common/osmocom_data.h> struct osmocom_ms; diff --git a/src/host/layer23/include/osmocom/l1l2_interface.h b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h index 41403d87..41403d87 100644 --- a/src/host/layer23/include/osmocom/l1l2_interface.h +++ b/src/host/layer23/include/osmocom/bb/common/l1l2_interface.h diff --git a/src/host/layer23/include/osmocom/l23_app.h b/src/host/layer23/include/osmocom/bb/common/l23_app.h index 1a228567..1a228567 100644 --- a/src/host/layer23/include/osmocom/l23_app.h +++ b/src/host/layer23/include/osmocom/bb/common/l23_app.h diff --git a/src/host/layer23/include/osmocom/lapdm.h b/src/host/layer23/include/osmocom/bb/common/lapdm.h index ab048b8a..ab048b8a 100644 --- a/src/host/layer23/include/osmocom/lapdm.h +++ b/src/host/layer23/include/osmocom/bb/common/lapdm.h diff --git a/src/host/layer23/include/osmocom/logging.h b/src/host/layer23/include/osmocom/bb/common/logging.h index 1a11cf9d..1a11cf9d 100644 --- a/src/host/layer23/include/osmocom/logging.h +++ b/src/host/layer23/include/osmocom/bb/common/logging.h diff --git a/src/host/layer23/include/osmocom/networks.h b/src/host/layer23/include/osmocom/bb/common/networks.h index e8c1b18e..e8c1b18e 100644 --- a/src/host/layer23/include/osmocom/networks.h +++ b/src/host/layer23/include/osmocom/bb/common/networks.h diff --git a/src/host/layer23/include/osmocom/osmocom_data.h b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h index 6fdeef78..dc7ba11d 100644 --- a/src/host/layer23/include/osmocom/osmocom_data.h +++ b/src/host/layer23/include/osmocom/bb/common/osmocom_data.h @@ -7,15 +7,16 @@ struct osmocom_ms; -#include <osmocom/support.h> -#include <osmocom/settings.h> -#include <osmocom/subscriber.h> -#include <osmocom/lapdm.h> -#include <osmocom/gsm48_rr.h> -#include <osmocom/sysinfo.h> -#include <osmocom/gsm322.h> -#include <osmocom/gsm48_mm.h> -#include <osmocom/gsm48_cc.h> + /* FIXME no 'mobile' specific stuff should be here */ +#include <osmocom/bb/mobile/support.h> +#include <osmocom/bb/mobile/settings.h> +#include <osmocom/bb/mobile/subscriber.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/mobile/gsm48_rr.h> +#include <osmocom/bb/mobile/sysinfo.h> +#include <osmocom/bb/mobile/gsm322.h> +#include <osmocom/bb/mobile/gsm48_mm.h> +#include <osmocom/bb/mobile/gsm48_cc.h> /* A layer2 entity */ struct osmol2_entity { diff --git a/src/host/layer23/include/osmocom/bb/misc/Makefile.am b/src/host/layer23/include/osmocom/bb/misc/Makefile.am new file mode 100644 index 00000000..71c9d389 --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/misc/Makefile.am @@ -0,0 +1 @@ +noinst_HEADERS = layer3.h rslms.h diff --git a/src/host/layer23/include/osmocom/layer3.h b/src/host/layer23/include/osmocom/bb/misc/layer3.h index bf68102d..dc7da87f 100644 --- a/src/host/layer23/include/osmocom/layer3.h +++ b/src/host/layer23/include/osmocom/bb/misc/layer3.h @@ -2,7 +2,7 @@ #define _OSMOCOM_L3_H #include <osmocore/msgb.h> -#include <osmocom/osmocom_data.h> +#include <osmocom/bb/common/osmocom_data.h> int gsm48_rx_ccch(struct msgb *msg, struct osmocom_ms *ms); int gsm48_rx_dcch(struct msgb *msg, struct osmocom_ms *ms); diff --git a/src/host/layer23/include/osmocom/rslms.h b/src/host/layer23/include/osmocom/bb/misc/rslms.h index 8f17b818..8b62ba92 100644 --- a/src/host/layer23/include/osmocom/rslms.h +++ b/src/host/layer23/include/osmocom/bb/misc/rslms.h @@ -2,7 +2,7 @@ #define _OSMOCOM_RSLMS_H #include <osmocore/msgb.h> -#include <osmocom/osmocom_data.h> +#include <osmocom/bb/common/osmocom_data.h> /* From L3 into RSLMS (direction -> L2) */ diff --git a/src/host/layer23/include/osmocom/bb/mobile/Makefile.am b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am new file mode 100644 index 00000000..49c8378b --- /dev/null +++ b/src/host/layer23/include/osmocom/bb/mobile/Makefile.am @@ -0,0 +1,2 @@ +noinst_HEADERS = gsm322.h gsm48_cc.h gsm48_mm.h gsm48_rr.h mncc.h settings.h \ + subscriber.h support.h sysinfo.h transaction.h diff --git a/src/host/layer23/include/osmocom/gsm322.h b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h index 78e380fe..78e380fe 100644 --- a/src/host/layer23/include/osmocom/gsm322.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm322.h diff --git a/src/host/layer23/include/osmocom/gsm48_cc.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_cc.h index d6ea5756..d6ea5756 100644 --- a/src/host/layer23/include/osmocom/gsm48_cc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_cc.h diff --git a/src/host/layer23/include/osmocom/gsm48_mm.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h index b988bd9a..b988bd9a 100644 --- a/src/host/layer23/include/osmocom/gsm48_mm.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h diff --git a/src/host/layer23/include/osmocom/gsm48_rr.h b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h index f5d52206..f5d52206 100644 --- a/src/host/layer23/include/osmocom/gsm48_rr.h +++ b/src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h diff --git a/src/host/layer23/include/osmocom/mncc.h b/src/host/layer23/include/osmocom/bb/mobile/mncc.h index d1d4d38f..d1d4d38f 100644 --- a/src/host/layer23/include/osmocom/mncc.h +++ b/src/host/layer23/include/osmocom/bb/mobile/mncc.h diff --git a/src/host/layer23/include/osmocom/settings.h b/src/host/layer23/include/osmocom/bb/mobile/settings.h index be13d208..be13d208 100644 --- a/src/host/layer23/include/osmocom/settings.h +++ b/src/host/layer23/include/osmocom/bb/mobile/settings.h diff --git a/src/host/layer23/include/osmocom/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h index 34f45289..34f45289 100644 --- a/src/host/layer23/include/osmocom/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h diff --git a/src/host/layer23/include/osmocom/support.h b/src/host/layer23/include/osmocom/bb/mobile/support.h index 9af4d1b6..9af4d1b6 100644 --- a/src/host/layer23/include/osmocom/support.h +++ b/src/host/layer23/include/osmocom/bb/mobile/support.h diff --git a/src/host/layer23/include/osmocom/sysinfo.h b/src/host/layer23/include/osmocom/bb/mobile/sysinfo.h index 6f57fcd5..6f57fcd5 100644 --- a/src/host/layer23/include/osmocom/sysinfo.h +++ b/src/host/layer23/include/osmocom/bb/mobile/sysinfo.h diff --git a/src/host/layer23/include/osmocom/transaction.h b/src/host/layer23/include/osmocom/bb/mobile/transaction.h index 4be82c19..4be82c19 100644 --- a/src/host/layer23/include/osmocom/transaction.h +++ b/src/host/layer23/include/osmocom/bb/mobile/transaction.h diff --git a/src/host/layer23/include/osmocom/vty.h b/src/host/layer23/include/osmocom/bb/mobile/vty.h index f9e65a12..70faef5b 100644 --- a/src/host/layer23/include/osmocom/vty.h +++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h @@ -1,7 +1,7 @@ #ifndef OSMOCOM_VTY_H #define OSMOCOM_VTY_H -#include <osmocom/osmocom_data.h> +#include <osmocom/bb/common/osmocom_data.h> #include <osmocom/vty/vty.h> #include <osmocom/vty/buffer.h> #include <osmocom/vty/command.h> diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c index 993c7db8..d68f80ab 100644 --- a/src/host/layer23/src/common/l1ctl.c +++ b/src/host/layer23/src/common/l1ctl.c @@ -41,11 +41,11 @@ #include <osmocore/protocol/gsm_08_58.h> #include <osmocore/rsl.h> -#include <osmocom/l1ctl.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/l1l2_interface.h> -#include <osmocom/lapdm.h> -#include <osmocom/logging.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1l2_interface.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/common/logging.h> static struct msgb *osmo_l1_alloc(uint8_t msg_type) { diff --git a/src/host/layer23/src/common/l1l2_interface.c b/src/host/layer23/src/common/l1l2_interface.c index f6d66bb5..2061adb3 100644 --- a/src/host/layer23/src/common/l1l2_interface.c +++ b/src/host/layer23/src/common/l1l2_interface.c @@ -21,9 +21,9 @@ * */ -#include <osmocom/osmocom_data.h> -#include <osmocom/l1ctl.h> -#include <osmocom/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/logging.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/src/host/layer23/src/common/lapdm.c b/src/host/layer23/src/common/lapdm.c index e798cdc7..c47bd7cd 100644 --- a/src/host/layer23/src/common/lapdm.c +++ b/src/host/layer23/src/common/lapdm.c @@ -65,10 +65,10 @@ #include <osmocore/protocol/gsm_04_08.h> #include <osmocore/protocol/gsm_08_58.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/l1ctl.h> -#include <osmocom/lapdm.h> -#include <osmocom/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/common/logging.h> #include <l1a_l23_interface.h> diff --git a/src/host/layer23/src/common/logging.c b/src/host/layer23/src/common/logging.c index 82195327..281f46fb 100644 --- a/src/host/layer23/src/common/logging.c +++ b/src/host/layer23/src/common/logging.c @@ -23,7 +23,7 @@ #include <osmocore/utils.h> #include <osmocore/logging.h> -#include <osmocom/logging.h> +#include <osmocom/bb/common/logging.h> static const struct log_info_cat default_categories[] = { [DRSL] = { diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 4a32e863..4bf14d08 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -21,13 +21,13 @@ * */ -#include <osmocom/osmocom_data.h> -#include <osmocom/l1ctl.h> -#include <osmocom/l1l2_interface.h> -#include <osmocom/layer3.h> -#include <osmocom/lapdm.h> -#include <osmocom/logging.h> -#include <osmocom/l23_app.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/l1l2_interface.h> +#include <osmocom/bb/misc/layer3.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/l23_app.h> #include <osmocore/msgb.h> #include <osmocore/talloc.h> diff --git a/src/host/layer23/src/common/networks.c b/src/host/layer23/src/common/networks.c index ae14d80c..77a42c25 100644 --- a/src/host/layer23/src/common/networks.c +++ b/src/host/layer23/src/common/networks.c @@ -2,7 +2,7 @@ #include <stdint.h> #include <stdio.h> -#include <osmocom/networks.h> +#include <osmocom/bb/common/networks.h> /* list of networks */ diff --git a/src/host/layer23/src/misc/app_bcch_scan.c b/src/host/layer23/src/misc/app_bcch_scan.c index 325345dd..35145535 100644 --- a/src/host/layer23/src/misc/app_bcch_scan.c +++ b/src/host/layer23/src/misc/app_bcch_scan.c @@ -21,11 +21,11 @@ * */ -#include <osmocom/osmocom_data.h> -#include <osmocom/l1ctl.h> -#include <osmocom/layer3.h> -#include <osmocom/lapdm.h> -#include <osmocom/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/misc/layer3.h> #include <osmocore/msgb.h> #include <osmocore/talloc.h> diff --git a/src/host/layer23/src/misc/app_echo_test.c b/src/host/layer23/src/misc/app_echo_test.c index a3cf59b5..56ab6740 100644 --- a/src/host/layer23/src/misc/app_echo_test.c +++ b/src/host/layer23/src/misc/app_echo_test.c @@ -21,11 +21,11 @@ * */ -#include <osmocom/osmocom_data.h> -#include <osmocom/l1ctl.h> -#include <osmocom/layer3.h> -#include <osmocom/lapdm.h> -#include <osmocom/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/misc/layer3.h> #include <osmocore/msgb.h> #include <osmocore/talloc.h> diff --git a/src/host/layer23/src/misc/app_phone.c b/src/host/layer23/src/misc/app_phone.c index b225a9ae..ced0154b 100644 --- a/src/host/layer23/src/misc/app_phone.c +++ b/src/host/layer23/src/misc/app_phone.c @@ -21,11 +21,11 @@ * */ -#include <osmocom/osmocom_data.h> -#include <osmocom/l1ctl.h> -#include <osmocom/layer3.h> -#include <osmocom/lapdm.h> -#include <osmocom/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/misc/layer3.h> #include <osmocore/msgb.h> #include <osmocore/talloc.h> diff --git a/src/host/layer23/src/misc/bcch_scan.c b/src/host/layer23/src/misc/bcch_scan.c index d0383231..e057da32 100644 --- a/src/host/layer23/src/misc/bcch_scan.c +++ b/src/host/layer23/src/misc/bcch_scan.c @@ -38,10 +38,10 @@ #include <osmocore/protocol/gsm_08_58.h> #include <osmocore/rsl.h> -#include <osmocom/l1ctl.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/lapdm.h> -#include <osmocom/logging.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/common/logging.h> /* somewhere in 05.08 */ #define MAX_CELLS_IN_BA 32 diff --git a/src/host/layer23/src/misc/layer3.c b/src/host/layer23/src/misc/layer3.c index 0680afb0..5f2acf7b 100644 --- a/src/host/layer23/src/misc/layer3.c +++ b/src/host/layer23/src/misc/layer3.c @@ -7,12 +7,12 @@ #include <osmocore/tlv.h> #include <osmocore/protocol/gsm_04_08.h> -#include <osmocom/logging.h> -#include <osmocom/lapdm.h> -#include <osmocom/rslms.h> -#include <osmocom/layer3.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/l1ctl.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/misc/rslms.h> +#include <osmocom/bb/misc/layer3.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1ctl.h> static int ccch_mode = CCCH_MODE_NONE; diff --git a/src/host/layer23/src/misc/rslms.c b/src/host/layer23/src/misc/rslms.c index 90920787..5ab367b9 100644 --- a/src/host/layer23/src/misc/rslms.c +++ b/src/host/layer23/src/misc/rslms.c @@ -29,12 +29,12 @@ #include <osmocore/tlv.h> #include <osmocore/protocol/gsm_04_08.h> -#include <osmocom/logging.h> -#include <osmocom/lapdm.h> -#include <osmocom/rslms.h> -#include <osmocom/layer3.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/l1ctl.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/misc/rslms.h> +#include <osmocom/bb/misc/layer3.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1ctl.h> /* Send a 'simple' RLL request to L2 */ int rslms_tx_rll_req(struct osmocom_ms *ms, uint8_t msg_type, diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 53e26bc1..aa62be19 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -26,14 +26,14 @@ #include <signal.h> #include <time.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/l1ctl.h> -#include <osmocom/l23_app.h> -#include <osmocom/gsm48_rr.h> -#include <osmocom/sysinfo.h> -#include <osmocom/lapdm.h> -#include <osmocom/logging.h> -#include <osmocom/vty.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/l23_app.h> +#include <osmocom/bb/common/lapdm.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/mobile/gsm48_rr.h> +#include <osmocom/bb/mobile/sysinfo.h> +#include <osmocom/bb/mobile/vty.h> #include <osmocom/vty/telnet_interface.h> #include <osmocore/msgb.h> diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 405483c7..9098f24c 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -31,12 +31,12 @@ #include <osmocore/gsm48.h> #include <osmocore/signal.h> -#include <osmocom/logging.h> -#include <osmocom/l1ctl.h> -#include <osmocom/l23_app.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/networks.h> -#include <osmocom/vty.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/common/l23_app.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/networks.h> +#include <osmocom/bb/mobile/vty.h> extern void *l23_ctx; diff --git a/src/host/layer23/src/mobile/gsm48_cc.c b/src/host/layer23/src/mobile/gsm48_cc.c index 820ce665..d7bfca5d 100644 --- a/src/host/layer23/src/mobile/gsm48_cc.c +++ b/src/host/layer23/src/mobile/gsm48_cc.c @@ -30,11 +30,11 @@ #include <osmocore/gsm48.h> #include <osmocore/talloc.h> -#include <osmocom/logging.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/mncc.h> -#include <osmocom/transaction.h> -#include <osmocom/gsm48_cc.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/mobile/mncc.h> +#include <osmocom/bb/mobile/transaction.h> +#include <osmocom/bb/mobile/gsm48_cc.h> extern void *l23_ctx; diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 82d09a7e..d048e89d 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -31,12 +31,12 @@ #include <osmocore/gsm48.h> #include <osmocore/talloc.h> -#include <osmocom/logging.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/gsm48_cc.h> -#include <osmocom/l23_app.h> -#include <osmocom/networks.h> -#include <osmocom/l1ctl.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l23_app.h> +#include <osmocom/bb/common/networks.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/mobile/gsm48_cc.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 37d8a671..02fff39f 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -54,12 +54,12 @@ #include <osmocore/gsm48.h> #include <osmocore/bitvec.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/l1l2_interface.h> -#include <osmocom/logging.h> -#include <osmocom/networks.h> -#include <osmocom/l1ctl.h> -#include <osmocom/vty.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/l1l2_interface.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/networks.h> +#include <osmocom/bb/common/l1ctl.h> +#include <osmocom/bb/mobile/vty.h> static void start_rr_t_monitor(struct gsm48_rrlayer *rr, int sec, int micro); static void stop_rr_t_monitor(struct gsm48_rrlayer *rr); diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index 8d5a54bf..70c33c89 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -27,10 +27,10 @@ #include <osmocore/talloc.h> -#include <osmocom/logging.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/mncc.h> -#include <osmocom/vty.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/mobile/mncc.h> +#include <osmocom/bb/mobile/vty.h> void *l23_ctx; static uint32_t new_callref = 1; diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c index 096b3db7..1aef48b0 100644 --- a/src/host/layer23/src/mobile/settings.c +++ b/src/host/layer23/src/mobile/settings.c @@ -24,9 +24,9 @@ #include <string.h> #include <osmocore/talloc.h> -#include <osmocom/logging.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/networks.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/networks.h> int gsm_settings_init(struct osmocom_ms *ms) { diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 8245cdcc..44434901 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -24,9 +24,9 @@ #include <string.h> #include <osmocore/talloc.h> -#include <osmocom/logging.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/networks.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/networks.h> void *l23_ctx; diff --git a/src/host/layer23/src/mobile/support.c b/src/host/layer23/src/mobile/support.c index 8b8b183e..40cf1b09 100644 --- a/src/host/layer23/src/mobile/support.c +++ b/src/host/layer23/src/mobile/support.c @@ -23,7 +23,7 @@ #include <stdint.h> #include <string.h> -#include <osmocom/osmocom_data.h> +#include <osmocom/bb/common/osmocom_data.h> void gsm_support_init(struct osmocom_ms *ms) { diff --git a/src/host/layer23/src/mobile/sysinfo.c b/src/host/layer23/src/mobile/sysinfo.c index 0f425b48..a16d39d4 100644 --- a/src/host/layer23/src/mobile/sysinfo.c +++ b/src/host/layer23/src/mobile/sysinfo.c @@ -23,8 +23,8 @@ #include <stdint.h> #include <string.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/networks.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/networks.h> int gsm48_sysinfo_dump(struct gsm48_sysinfo *s, uint16_t arfcn, void (*print)(void *, const char *, ...), void *priv) diff --git a/src/host/layer23/src/mobile/transaction.c b/src/host/layer23/src/mobile/transaction.c index 59ec17bd..abd3c2d1 100644 --- a/src/host/layer23/src/mobile/transaction.c +++ b/src/host/layer23/src/mobile/transaction.c @@ -25,10 +25,10 @@ #include <osmocore/timer.h> #include <osmocore/msgb.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/mncc.h> -#include <osmocom/transaction.h> -#include <osmocom/logging.h> +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/logging.h> +#include <osmocom/bb/mobile/mncc.h> +#include <osmocom/bb/mobile/transaction.h> extern void *l23_ctx; diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index d627d317..426c0d82 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -25,14 +25,14 @@ #include <unistd.h> #include <sys/types.h> -#include <osmocom/vty.h> -#include <osmocom/vty/telnet_interface.h> - #include <osmocore/gsm48.h> -#include <osmocom/osmocom_data.h> -#include <osmocom/networks.h> -#include <osmocom/mncc.h> -#include <osmocom/transaction.h> + +#include <osmocom/bb/common/osmocom_data.h> +#include <osmocom/bb/common/networks.h> +#include <osmocom/bb/mobile/mncc.h> +#include <osmocom/bb/mobile/transaction.h> +#include <osmocom/bb/mobile/vty.h> +#include <osmocom/vty/telnet_interface.h> int mncc_call(struct osmocom_ms *ms, char *number); int mncc_hangup(struct osmocom_ms *ms); |