From 0b9ed9a38936768f4575309eee9ab1da4c2a2ef7 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@gnumonks.org>
Date: Sat, 2 Jul 2011 17:25:19 +0200
Subject: [PATCH] dahdi: fix driver compilation

Now dahdi driver compiles file. We force the compilation of this
driver, I prefer to avoid condition compilation options that tend
add problems IMO.
---
 configure.ac      |  2 ++
 src/input/dahdi.c | 26 ++++++++------------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 774302a..84a6dc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,8 @@ PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0)
 PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0)
 PKG_CHECK_MODULES([LIBTALLOC], talloc >= 2.0.1)
 
+AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_ERROR(DAHDI input driver headers missing))
+
 AC_OUTPUT(
 	libosmoabis.pc
 	include/Makefile
diff --git a/src/input/dahdi.c b/src/input/dahdi.c
index 20c2a09..e7400e4 100644
--- a/src/input/dahdi.c
+++ b/src/input/dahdi.c
@@ -22,8 +22,6 @@
  *
  */
 
-#ifdef HAVE_DAHDI_USER_H
-
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -38,13 +36,11 @@
 
 #include <osmocom/core/select.h>
 #include <osmocom/core/msgb.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/signal.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/abis/subchan_demux.h>
+#include <osmocom/abis/e1_input.h>
+#include <osmocom/abis/signal.h>
+#include <osmocom/abis/logging.h>
 #include <talloc.h>
 
 #include "lapd.h"
@@ -121,11 +117,8 @@ static int handle_ts1_read(struct osmo_fd *bfd)
 	DEBUGP(DMI, "<= len = %d, sapi(%d) tei(%d)", ret, sapi, tei);
 
 	idata = lapd_receive(e1i_ts->driver.dahdi.lapd, msg->data, msg->len, &ilen, &prim);
-	if (!idata && prim == 0) {
-		if (line->ops->error)
-			line->ops->error(NULL, -EBADMSG);
+	if (!idata && prim == 0)
 		return -EIO;
-	}
 
 	msgb_pull(msg, 2);
 
@@ -152,8 +145,7 @@ static int handle_ts1_read(struct osmo_fd *bfd)
 		ret = e1inp_rx_ts(e1i_ts, msg, tei, sapi);
 		break;
 	default:
-		if (line->ops->error)
-			line->ops->error(NULL, -EBADMSG);
+		printf("ERROR: unknown prim\n");
 		break;
 	}
 
@@ -478,7 +470,7 @@ static int dahdi_e1_setup(struct e1inp_line *line)
 }
 
 static int dahdi_e1_line_update(struct e1inp_line *line,
-				enum e1inp_line_role role, void *data)
+				enum e1inp_line_role role, const char *addr)
 {
 	if (line->driver != &dahdi_driver)
 		return -EINVAL;
@@ -493,5 +485,3 @@ int e1inp_dahdi_init(void)
 	/* register the driver with the core */
 	return e1inp_driver_register(&dahdi_driver);
 }
-
-#endif /* HAVE_DAHDI_USER_H */