summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso2011-07-02 19:01:58 +0200
committerPablo Neira Ayuso2011-07-05 18:27:33 +0200
commita20762ab7241cdafb0f568f8832d6ef34988ec1c (patch)
treed675155fa03ca6a05d3b9070b1e7f0f499cbf767
parentlogging: use new harald's logging infrastructure in libosmocore (diff)
downloadlibosmo-abis-a20762ab7241cdafb0f568f8832d6ef34988ec1c.tar.gz
libosmo-abis-a20762ab7241cdafb0f568f8832d6ef34988ec1c.tar.xz
libosmo-abis-a20762ab7241cdafb0f568f8832d6ef34988ec1c.zip
src: use signal infrastructure that will be available in libosmocore
This is still not in mainline yet, it's in a separate patch that I expect to send to Harald soon.
-rw-r--r--include/osmocom/abis/signal.h17
-rw-r--r--src/e1_input.c3
-rw-r--r--src/input/dahdi.c2
3 files changed, 2 insertions, 20 deletions
diff --git a/include/osmocom/abis/signal.h b/include/osmocom/abis/signal.h
deleted file mode 100644
index cf5ad55..0000000
--- a/include/osmocom/abis/signal.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _OSMO_ABIS_SIGNAL_H_
-#define _OSMO_ABIS_SIGNAL_H_
-
-#include <osmocom/core/signal.h>
-
-/* signal subsystems. */
-enum {
- SS_GLOBAL = OSMO_SIGNAL_SS_ABIS_RESERVED,
- SS_INPUT,
-};
-
-/* signal types. */
-enum {
- S_GLOBAL_SHUTDOWN = OSMO_SIGNAL_T_ABIS_RESERVED,
-};
-
-#endif
diff --git a/src/e1_input.c b/src/e1_input.c
index 13fcdcf..419ec8c 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -47,7 +47,6 @@
#include <osmocom/abis/e1_input.h>
#include <osmocom/core/linuxlist.h>
#include <osmocom/abis/subchan_demux.h>
-#include <osmocom/abis/signal.h>
#include <talloc.h>
#define NUM_E1_TS 32
@@ -569,7 +568,7 @@ int e1inp_line_update(struct e1inp_line *line)
return rc;
}
-static int e1i_sig_cb(uint8_t subsys, unsigned int signal,
+static int e1i_sig_cb(unsigned int subsys, unsigned int signal,
void *handler_data, void *signal_data)
{
if (subsys != SS_GLOBAL ||
diff --git a/src/input/dahdi.c b/src/input/dahdi.c
index 5a452a4..3d33749 100644
--- a/src/input/dahdi.c
+++ b/src/input/dahdi.c
@@ -37,9 +37,9 @@
#include <osmocom/core/select.h>
#include <osmocom/core/msgb.h>
#include <osmocom/core/logging.h>
+#include <osmocom/core/signal.h>
#include <osmocom/abis/subchan_demux.h>
#include <osmocom/abis/e1_input.h>
-#include <osmocom/abis/signal.h>
#include <talloc.h>
#include <osmocom/abis/lapd.h>