From fe8ab0af7a3a0a8dce32907efda7a86ea39bc884 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 2 Jul 2011 18:48:45 +0200 Subject: logging: use new harald's logging infrastructure in libosmocore I can send patches to improve it later, better not to waste much time at it by now so port libosmo-abis upon it. --- src/e1_input.c | 1 - src/init.c | 44 +------------------------------------------- src/input/dahdi.c | 1 - src/input/hsl.c | 1 - src/input/ipa.c | 1 - src/input/ipaccess.c | 1 - src/input/lapd.c | 1 - src/input/misdn.c | 1 - src/ipa_proxy.c | 1 - src/trau_frame.c | 1 - 10 files changed, 1 insertion(+), 52 deletions(-) (limited to 'src') diff --git a/src/e1_input.c b/src/e1_input.c index c83dc04..13fcdcf 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include diff --git a/src/init.c b/src/init.c index f015443..2b21207 100644 --- a/src/init.c +++ b/src/init.c @@ -17,55 +17,13 @@ */ #include "internal.h" #include -#include +#include #include void *libosmo_abis_ctx; -struct log_info_cat libosmo_abis_default_categories[] = { - [DINP] = { - .name = "DINP", - .description = "A-bis Intput Subsystem", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, - [DMUX] = { - .name = "DMUX", - .description = "A-bis B-Subchannel TRAU Frame Multiplex", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, - [DMI] = { - .name = "DMI", - .description = "A-bis Input Driver for Signalling", - .enabled = 0, .loglevel = LOGL_NOTICE, - }, - [DMIB] = { - .name = "DMIB", - .description = "A-bis Input Driver for B-Channels (voice)", - .enabled = 0, .loglevel = LOGL_NOTICE, - }, - [DRSL] = { - .name = "DRSL", - .description = "A-bis Radio Siganlling Link (RSL)", - .color = "\033[1;35m", - .enabled = 1, .loglevel = LOGL_NOTICE, - }, - [DNM] = { - .name = "DNM", - .description = "A-bis Network Management / O&M (NM/OML)", - .color = "\033[1;36m", - .enabled = 1, .loglevel = LOGL_INFO, - }, -}; - -const struct log_info libosmo_abis_log_info = { - .filter_fn = NULL, /* the application should set this. */ - .cat = libosmo_abis_default_categories, - .num_cat = ARRAY_SIZE(libosmo_abis_default_categories), -}; - void libosmo_abis_init(void *ctx) { - log_init(&libosmo_abis_log_info); libosmo_abis_ctx = talloc_named_const(ctx, 0, "abis"); e1inp_init(); } diff --git a/src/input/dahdi.c b/src/input/dahdi.c index e411f9a..5a452a4 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include diff --git a/src/input/hsl.c b/src/input/hsl.c index d8eb8db..0bcde09 100644 --- a/src/input/hsl.c +++ b/src/input/hsl.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include diff --git a/src/input/ipa.c b/src/input/ipa.c index 2d499ee..c65a0ec 100644 --- a/src/input/ipa.c +++ b/src/input/ipa.c @@ -19,7 +19,6 @@ #include #include #include -#include #include diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 5da9b2c..e329a83 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -42,7 +42,6 @@ #include #include #include -#include #include static void *tall_ipa_ctx; diff --git a/src/input/lapd.c b/src/input/lapd.c index 2e0dd08..bd1c8ff 100644 --- a/src/input/lapd.c +++ b/src/input/lapd.c @@ -43,7 +43,6 @@ #include #include #include -#include #define SABM_INTERVAL 0, 300000 diff --git a/src/input/misdn.c b/src/input/misdn.c index 9bf3aea..252650b 100644 --- a/src/input/misdn.c +++ b/src/input/misdn.c @@ -46,7 +46,6 @@ #include #include #include -#include #define TS1_ALLOC_SIZE 300 diff --git a/src/ipa_proxy.c b/src/ipa_proxy.c index 4d08e17..2ad4654 100644 --- a/src/ipa_proxy.c +++ b/src/ipa_proxy.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/src/trau_frame.c b/src/trau_frame.c index fc5651d..bf0dbd4 100644 --- a/src/trau_frame.c +++ b/src/trau_frame.c @@ -28,7 +28,6 @@ #include #include #include -#include static uint32_t get_bits(const uint8_t *bitbuf, int offset, int num) { -- cgit v1.2.3-55-g7522