diff options
author | Harald Welte <laforge@gnumonks.org> | 2012-06-16 14:59:56 +0800 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2012-06-16 15:14:00 +0800 |
commit | ea34a4e3a7741c0b03fc421e2850234b82a0977c (patch) | |
tree | 6a57247a94bf85ac6b24261fcff831eeb3593920 /openbsc/include | |
parent | 704cb8680bbdf62cdaa2583fd5072791b7589a90 (diff) |
split libgb into a separate library for outside use
This also removes the dependency to osmo_sock() inside libcommon and
replaces it with osmo_sock_* from libosmocore
Diffstat (limited to 'openbsc/include')
-rw-r--r-- | openbsc/include/Makefile.am | 2 | ||||
-rw-r--r-- | openbsc/include/openbsc/Makefile.am | 4 | ||||
-rw-r--r-- | openbsc/include/openbsc/gb_proxy.h | 2 | ||||
-rw-r--r-- | openbsc/include/openbsc/sgsn.h | 2 | ||||
-rw-r--r-- | openbsc/include/osmocom/Makefile.am | 1 | ||||
-rw-r--r-- | openbsc/include/osmocom/gprs/Makefile.am | 3 | ||||
-rw-r--r-- | openbsc/include/osmocom/gprs/gprs_bssgp.h (renamed from openbsc/include/openbsc/gprs_bssgp.h) | 2 | ||||
-rw-r--r-- | openbsc/include/osmocom/gprs/gprs_ns.h (renamed from openbsc/include/openbsc/gprs_ns.h) | 0 | ||||
-rw-r--r-- | openbsc/include/osmocom/gprs/gprs_ns_frgre.h (renamed from openbsc/include/openbsc/gprs_ns_frgre.h) | 0 |
9 files changed, 11 insertions, 5 deletions
diff --git a/openbsc/include/Makefile.am b/openbsc/include/Makefile.am index 4596b6e3c..2cc8bee71 100644 --- a/openbsc/include/Makefile.am +++ b/openbsc/include/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = openbsc +SUBDIRS = openbsc osmocom noinst_HEADERS = mISDNif.h compat_af_isdn.h diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am index 8e64ff8d3..58fa691b0 100644 --- a/openbsc/include/openbsc/Makefile.am +++ b/openbsc/include/openbsc/Makefile.am @@ -7,9 +7,9 @@ noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \ system_information.h handover.h mgcp_internal.h \ vty.h socket.h e1_config.h trau_upqueue.h token_auth.h \ handover_decision.h rrlp.h control_if.h \ - crc24.h gprs_bssgp.h gprs_llc.h gprs_ns.h gprs_gmm.h \ + crc24.h gprs_llc.h gprs_gmm.h \ gb_proxy.h gprs_sgsn.h gsm_04_08_gprs.h sgsn.h \ - gprs_ns_frgre.h auth.h osmo_msc.h bsc_msc.h bsc_nat.h \ + auth.h osmo_msc.h bsc_msc.h bsc_nat.h \ osmo_bsc_rf.h osmo_bsc.h network_listen.h bsc_nat_sccp.h \ osmo_msc_data.h osmo_bsc_grace.h sms_queue.h abis_om2000.h \ bss.h gsm_data_shared.h control_cmd.h ipaccess.h mncc_int.h diff --git a/openbsc/include/openbsc/gb_proxy.h b/openbsc/include/openbsc/gb_proxy.h index c0cdcbf05..2c8ddb334 100644 --- a/openbsc/include/openbsc/gb_proxy.h +++ b/openbsc/include/openbsc/gb_proxy.h @@ -4,7 +4,7 @@ #include <osmocom/core/msgb.h> -#include <openbsc/gprs_ns.h> +#include <osmocom/gprs/gprs_ns.h> #include <osmocom/vty/command.h> struct gbproxy_config { diff --git a/openbsc/include/openbsc/sgsn.h b/openbsc/include/openbsc/sgsn.h index 966b4e68b..48a7b3474 100644 --- a/openbsc/include/openbsc/sgsn.h +++ b/openbsc/include/openbsc/sgsn.h @@ -4,7 +4,7 @@ #include <osmocom/core/msgb.h> -#include <openbsc/gprs_ns.h> +#include <osmocom/gprs/gprs_ns.h> #include <openbsc/gprs_sgsn.h> struct sgsn_config { diff --git a/openbsc/include/osmocom/Makefile.am b/openbsc/include/osmocom/Makefile.am new file mode 100644 index 000000000..596ce23fc --- /dev/null +++ b/openbsc/include/osmocom/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = gprs diff --git a/openbsc/include/osmocom/gprs/Makefile.am b/openbsc/include/osmocom/gprs/Makefile.am new file mode 100644 index 000000000..fe5714ea8 --- /dev/null +++ b/openbsc/include/osmocom/gprs/Makefile.am @@ -0,0 +1,3 @@ +libgb_HEADERS = gprs_bssgp.h gprs_ns.h gprs_ns_frgre.h + +libgbdir = $(includedir)/osmocom/gprs diff --git a/openbsc/include/openbsc/gprs_bssgp.h b/openbsc/include/osmocom/gprs/gprs_bssgp.h index df93f5b2c..bfc7d331d 100644 --- a/openbsc/include/openbsc/gprs_bssgp.h +++ b/openbsc/include/osmocom/gprs/gprs_bssgp.h @@ -143,6 +143,8 @@ enum gprs_bssgp_cause { /* Our implementation */ +#include <osmocom/gsm/gsm48.h> + /* gprs_bssgp_util.c */ extern struct gprs_ns_inst *bssgp_nsi; struct msgb *bssgp_msgb_alloc(void); diff --git a/openbsc/include/openbsc/gprs_ns.h b/openbsc/include/osmocom/gprs/gprs_ns.h index 7045d84d1..7045d84d1 100644 --- a/openbsc/include/openbsc/gprs_ns.h +++ b/openbsc/include/osmocom/gprs/gprs_ns.h diff --git a/openbsc/include/openbsc/gprs_ns_frgre.h b/openbsc/include/osmocom/gprs/gprs_ns_frgre.h index abcd43ffb..abcd43ffb 100644 --- a/openbsc/include/openbsc/gprs_ns_frgre.h +++ b/openbsc/include/osmocom/gprs/gprs_ns_frgre.h |