diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-06-07 12:21:51 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-06-07 12:21:51 +0200 |
commit | 177094b4c988f126ead93a5d3f25b4bedefa2d97 (patch) | |
tree | 640b83ad40de1c94b08c24f50f793a71f0c4d7c3 | |
parent | f67471fb7f691cfe19622693c2bd59a6b9837cd4 (diff) |
src: use include/osmocom/abis instead of include/osmocom/gsm/abis
Harald prefers short paths.
This patch also remove commented includes in several files.
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | include/osmocom/Makefile.am | 2 | ||||
-rw-r--r-- | include/osmocom/abis/Makefile.am (renamed from include/osmocom/gsm/abis/Makefile.am) | 0 | ||||
-rw-r--r-- | include/osmocom/abis/e1_input.h (renamed from include/osmocom/gsm/abis/e1_input.h) | 3 | ||||
-rw-r--r-- | include/osmocom/abis/ipaccess.h (renamed from include/osmocom/gsm/abis/ipaccess.h) | 0 | ||||
-rw-r--r-- | include/osmocom/abis/subchan_demux.h (renamed from include/osmocom/gsm/abis/subchan_demux.h) | 0 | ||||
-rw-r--r-- | include/osmocom/abis/trau_frame.h (renamed from include/osmocom/gsm/abis/trau_frame.h) | 0 | ||||
-rw-r--r-- | include/osmocom/gsm/Makefile.am | 1 | ||||
-rw-r--r-- | src/e1_input.c | 14 | ||||
-rw-r--r-- | src/input/dahdi.c | 2 | ||||
-rw-r--r-- | src/input/hsl.c | 11 | ||||
-rw-r--r-- | src/input/ipaccess.c | 13 | ||||
-rw-r--r-- | src/input/lapd.c | 1 | ||||
-rw-r--r-- | src/input/misdn.c | 2 | ||||
-rw-r--r-- | src/subchan_demux.c | 6 | ||||
-rw-r--r-- | src/trau_frame.c | 5 | ||||
-rw-r--r-- | tests/e1inp_ipa_bsc_test.c | 2 |
17 files changed, 14 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac index 02ecdb4..774302a 100644 --- a/configure.ac +++ b/configure.ac @@ -43,8 +43,7 @@ AC_OUTPUT( libosmoabis.pc include/Makefile include/osmocom/Makefile - include/osmocom/gsm/Makefile - include/osmocom/gsm/abis/Makefile + include/osmocom/abis/Makefile src/Makefile src/input/Makefile tests/Makefile diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index 999a3ee..f9d5e7c 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1 +1 @@ -SUBDIRS=gsm +SUBDIRS=abis diff --git a/include/osmocom/gsm/abis/Makefile.am b/include/osmocom/abis/Makefile.am index 8bdcc96..8bdcc96 100644 --- a/include/osmocom/gsm/abis/Makefile.am +++ b/include/osmocom/abis/Makefile.am diff --git a/include/osmocom/gsm/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 1911568..c5a4137 100644 --- a/include/osmocom/gsm/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -5,11 +5,10 @@ #include <netinet/in.h> #include <osmocom/core/linuxlist.h> -//#include <openbsc/gsm_data.h> #include <osmocom/core/timer.h> #include <osmocom/core/msgb.h> #include <osmocom/core/select.h> -#include <osmocom/gsm/abis/subchan_demux.h> +#include <osmocom/abis/subchan_demux.h> #define NUM_E1_TS 32 diff --git a/include/osmocom/gsm/abis/ipaccess.h b/include/osmocom/abis/ipaccess.h index 2792572..2792572 100644 --- a/include/osmocom/gsm/abis/ipaccess.h +++ b/include/osmocom/abis/ipaccess.h diff --git a/include/osmocom/gsm/abis/subchan_demux.h b/include/osmocom/abis/subchan_demux.h index b71c856..b71c856 100644 --- a/include/osmocom/gsm/abis/subchan_demux.h +++ b/include/osmocom/abis/subchan_demux.h diff --git a/include/osmocom/gsm/abis/trau_frame.h b/include/osmocom/abis/trau_frame.h index a76da33..a76da33 100644 --- a/include/osmocom/gsm/abis/trau_frame.h +++ b/include/osmocom/abis/trau_frame.h diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am deleted file mode 100644 index f9d5e7c..0000000 --- a/include/osmocom/gsm/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS=abis diff --git a/src/e1_input.c b/src/e1_input.c index d806766..8a4e1b9 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -44,20 +44,10 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> #include <osmocom/core/signal.h> -//#include <openbsc/debug.h> -//#include <openbsc/gsm_data.h> -#include <osmocom/gsm/abis/e1_input.h> -//#include <openbsc/abis_nm.h> -//#include <openbsc/abis_rsl.h> +#include <osmocom/abis/e1_input.h> #include <osmocom/core/linuxlist.h> -#include <osmocom/gsm/abis/subchan_demux.h> -//#include <openbsc/trau_frame.h> -//#include <openbsc/trau_mux.h> +#include <osmocom/abis/subchan_demux.h> #include <talloc.h> -//#include <openbsc/signal.h> -//#include <openbsc/misdn.h> - -//#include "../../bscconfig.h" #define NUM_E1_TS 32 diff --git a/src/input/dahdi.c b/src/input/dahdi.c index a431a3a..ba8ce02 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -22,8 +22,6 @@ * */ -//#include "../../../bscconfig.h" - #ifdef HAVE_DAHDI_USER_H #include <stdio.h> diff --git a/src/input/hsl.c b/src/input/hsl.c index 211768c..689698c 100644 --- a/src/input/hsl.c +++ b/src/input/hsl.c @@ -47,19 +47,10 @@ #include <osmocom/core/select.h> #include <osmocom/gsm/tlv.h> #include <osmocom/core/msgb.h> -#include <osmocom/gsm/abis/e1_input.h> +#include <osmocom/abis/e1_input.h> #include <osmocom/core/logging.h> #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/core/socket.h> -/*#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/subchan_demux.h> -#include <openbsc/e1_input.h> -#include <openbsc/ipaccess.h> -#include <openbsc/socket.h> -#include <openbsc/signal.h> */ #include <talloc.h> #define HSL_TCP_PORT 2500 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 9894920..40d69b6 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -39,18 +39,9 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> #include <talloc.h> -#include <osmocom/gsm/abis/e1_input.h> -#include <osmocom/gsm/abis/ipaccess.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/abis/ipaccess.h> #include <osmocom/core/socket.h> -/*#include <openbsc/debug.h> -#include <openbsc/gsm_data.h> -#include <openbsc/abis_nm.h> -#include <openbsc/abis_rsl.h> -#include <openbsc/subchan_demux.h> -#include <openbsc/e1_input.h> -#include <openbsc/ipaccess.h> -#include <openbsc/socket.h> -#include <openbsc/signal.h> */ #define PRIV_OML 1 #define PRIV_RSL 2 diff --git a/src/input/lapd.c b/src/input/lapd.c index 060edb6..c8b777c 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -43,7 +43,6 @@ #include <talloc.h> #include <osmocom/core/msgb.h> #include <osmocom/core/timer.h> -//#include <openbsc/debug.h> #define SABM_INTERVAL 0, 300000 diff --git a/src/input/misdn.c b/src/input/misdn.c index 45d5e06..c97169a 100644 --- a/src/input/misdn.c +++ b/src/input/misdn.c @@ -44,7 +44,7 @@ #include <osmocom/core/select.h> #include <osmocom/core/msgb.h> #include <osmocom/core/logging.h> -#include <osmocom/gsm/abis/e1_input.h> +#include <osmocom/abis/e1_input.h> #include <talloc.h> /*#include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/src/subchan_demux.c b/src/subchan_demux.c index 6ff66bc..73efd31 100644 --- a/src/subchan_demux.c +++ b/src/subchan_demux.c @@ -26,11 +26,9 @@ #include <string.h> #include <errno.h> -#include <osmocom/gsm/abis/subchan_demux.h> -#include <osmocom/gsm/abis/trau_frame.h> -//#include <openbsc/debug.h> +#include <osmocom/abis/subchan_demux.h> +#include <osmocom/abis/trau_frame.h> #include <talloc.h> -//#include <openbsc/gsm_data.h> void *tall_tqe_ctx; diff --git a/src/trau_frame.c b/src/trau_frame.c index b884bf3..bf0dbd4 100644 --- a/src/trau_frame.c +++ b/src/trau_frame.c @@ -25,10 +25,9 @@ #include <string.h> #include <errno.h> -#include <osmocom/gsm/abis/trau_frame.h> -#include <osmocom/gsm/abis/subchan_demux.h> +#include <osmocom/abis/trau_frame.h> +#include <osmocom/abis/subchan_demux.h> #include <osmocom/core/logging.h> -//#include <openbsc/debug.h> static uint32_t get_bits(const uint8_t *bitbuf, int offset, int num) { diff --git a/tests/e1inp_ipa_bsc_test.c b/tests/e1inp_ipa_bsc_test.c index 8985e98..5ef725e 100644 --- a/tests/e1inp_ipa_bsc_test.c +++ b/tests/e1inp_ipa_bsc_test.c @@ -1,5 +1,5 @@ #include <stdio.h> -#include <osmocom/gsm/abis/e1_input.h> +#include <osmocom/abis/e1_input.h> static int rx_cb(struct msgb *msg, struct e1inp_ts *ts) { |