summaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorPablo Neira Ayuso2011-06-07 12:21:51 +0200
committerPablo Neira Ayuso2011-06-07 12:21:51 +0200
commit177094b4c988f126ead93a5d3f25b4bedefa2d97 (patch)
tree640b83ad40de1c94b08c24f50f793a71f0c4d7c3 /src/input
parentsrc: use new socket API in libosmocore (diff)
downloadlibosmo-abis-177094b4c988f126ead93a5d3f25b4bedefa2d97.tar.gz
libosmo-abis-177094b4c988f126ead93a5d3f25b4bedefa2d97.tar.xz
libosmo-abis-177094b4c988f126ead93a5d3f25b4bedefa2d97.zip
src: use include/osmocom/abis instead of include/osmocom/gsm/abis
Harald prefers short paths. This patch also remove commented includes in several files.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/dahdi.c2
-rw-r--r--src/input/hsl.c11
-rw-r--r--src/input/ipaccess.c13
-rw-r--r--src/input/lapd.c1
-rw-r--r--src/input/misdn.c2
5 files changed, 4 insertions, 25 deletions
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>