diff options
Diffstat (limited to 'src/host/layer23/include/osmocom')
-rw-r--r-- | src/host/layer23/include/osmocom/Makefile.am | 3 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/Makefile.am | 1 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/Makefile.am | 2 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/l1ctl.h (renamed from src/host/layer23/include/osmocom/l1ctl.h) | 2 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/l1l2_interface.h (renamed from src/host/layer23/include/osmocom/l1l2_interface.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/l23_app.h (renamed from src/host/layer23/include/osmocom/l23_app.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/lapdm.h (renamed from src/host/layer23/include/osmocom/lapdm.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/logging.h (renamed from src/host/layer23/include/osmocom/logging.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/networks.h (renamed from src/host/layer23/include/osmocom/networks.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/osmocom_data.h (renamed from src/host/layer23/include/osmocom/osmocom_data.h) | 19 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/misc/Makefile.am | 1 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/misc/layer3.h (renamed from src/host/layer23/include/osmocom/layer3.h) | 2 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/misc/rslms.h (renamed from src/host/layer23/include/osmocom/rslms.h) | 2 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/Makefile.am | 2 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/gsm322.h (renamed from src/host/layer23/include/osmocom/gsm322.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/gsm48_cc.h (renamed from src/host/layer23/include/osmocom/gsm48_cc.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h (renamed from src/host/layer23/include/osmocom/gsm48_mm.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/gsm48_rr.h (renamed from src/host/layer23/include/osmocom/gsm48_rr.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/mncc.h (renamed from src/host/layer23/include/osmocom/mncc.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/settings.h (renamed from src/host/layer23/include/osmocom/settings.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/subscriber.h (renamed from src/host/layer23/include/osmocom/subscriber.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/support.h (renamed from src/host/layer23/include/osmocom/support.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/sysinfo.h (renamed from src/host/layer23/include/osmocom/sysinfo.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/transaction.h (renamed from src/host/layer23/include/osmocom/transaction.h) | 0 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/mobile/vty.h (renamed from src/host/layer23/include/osmocom/vty.h) | 2 |
25 files changed, 21 insertions, 15 deletions
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> |