From a20762ab7241cdafb0f568f8832d6ef34988ec1c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 2 Jul 2011 19:01:58 +0200 Subject: 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. --- include/osmocom/abis/signal.h | 17 ----------------- src/e1_input.c | 3 +-- src/input/dahdi.c | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 include/osmocom/abis/signal.h 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 - -/* 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 #include #include -#include #include #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 #include #include +#include #include #include -#include #include #include -- cgit v1.2.3-55-g7522