From 86a8031e9cf0b8660d4c34079d0aec1505b4823f Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Sun, 28 Jan 2018 13:17:10 +0100
Subject: logging: Remove obsolete log categories

About half of our log categories/subsystems were inherited from
OsmoNITB, and are no longer used but may confuse the user.

Change-Id: I8b39429f71c0faefdf8158a82093cfb19f44809e
---
 include/osmocom/bsc/debug.h  | 17 -----------
 src/osmo-bsc/osmo_bsc_main.c | 72 --------------------------------------------
 tests/bsc-nat/bsc_nat_test.c |  2 +-
 3 files changed, 1 insertion(+), 90 deletions(-)

diff --git a/include/osmocom/bsc/debug.h b/include/osmocom/bsc/debug.h
index b9295a0c9..37f102c7a 100644
--- a/include/osmocom/bsc/debug.h
+++ b/include/osmocom/bsc/debug.h
@@ -14,33 +14,16 @@ enum {
 	DRR,
 	DRSL,
 	DNM,
-	DMNCC,
 	DPAG,
 	DMEAS,
-	DSCCP,
 	DMSC,
 	DMGCP,
 	DHO,
 	DHODEC,
-	DDB,
 	DREF,
-	DGPRS,
-	DNS,
-	DBSSGP,
-	DLLC,
-	DSNDCP,
-	DSLHC,
 	DNAT,
 	DCTRL,
-	DSMPP,
 	DFILTER,
-	DGTPHUB,
-	DRANAP,
-	DSUA,
-	DV42BIS,
 	DPCU,
-	DVLR,
-	DIUCS,
-	DSIGTRAN,
 	Debug_LastEntry,
 };
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 424d8169b..fd5273453 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -315,12 +315,6 @@ static const struct log_info_cat osmo_bsc_categories[] = {
 		.color = "\033[1;36m",
 		.enabled = 1, .loglevel = LOGL_INFO,
 	},
-	[DMNCC] = {
-		.name = "DMNCC",
-		.description = "MNCC API for Call Control application",
-		.color = "\033[1;39m",
-		.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
 	[DPAG]	= {
 		.name = "DPAG",
 		.description = "Paging Subsystem",
@@ -332,11 +326,6 @@ static const struct log_info_cat osmo_bsc_categories[] = {
 		.description = "Radio Measurement Processing",
 		.enabled = 0, .loglevel = LOGL_NOTICE,
 	},
-	[DSCCP] = {
-		.name = "DSCCP",
-		.description = "SCCP Protocol",
-		.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
 	[DMSC] = {
 		.name = "DMSC",
 		.description = "Mobile Switching Center",
@@ -359,41 +348,11 @@ static const struct log_info_cat osmo_bsc_categories[] = {
 		.color = "\033[1;38m",
 		.enabled = 1, .loglevel = LOGL_NOTICE,
 	},
-	[DDB] = {
-		.name = "DDB",
-		.description = "Database Layer",
-		.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
 	[DREF] = {
 		.name = "DREF",
 		.description = "Reference Counting",
 		.enabled = 0, .loglevel = LOGL_NOTICE,
 	},
-	[DGPRS] = {
-		.name = "DGPRS",
-		.description = "GPRS Packet Service",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
-	[DNS] = {
-		.name = "DNS",
-		.description = "GPRS Network Service (NS)",
-		.enabled = 1, .loglevel = LOGL_INFO,
-	},
-	[DBSSGP] = {
-		.name = "DBSSGP",
-		.description = "GPRS BSS Gateway Protocol (BSSGP)",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
-	[DLLC] = {
-		.name = "DLLC",
-		.description = "GPRS Logical Link Control Protocol (LLC)",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
-	[DSNDCP] = {
-		.name = "DSNDCP",
-		.description = "GPRS Sub-Network Dependent Control Protocol (SNDCP)",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
 	[DNAT] = {
 		.name = "DNAT",
 		.description = "GSM 08.08 NAT/Multiplexer",
@@ -404,47 +363,16 @@ static const struct log_info_cat osmo_bsc_categories[] = {
 		.description = "Control interface",
 		.enabled = 1, .loglevel = LOGL_NOTICE,
 	},
-	[DSMPP] = {
-		.name = "DSMPP",
-		.description = "SMPP interface for external SMS apps",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
 	[DFILTER] = {
 		.name = "DFILTER",
 		.description = "BSC/NAT IMSI based filtering",
 		.enabled = 1, .loglevel = LOGL_DEBUG,
 	},
-	[DRANAP] = {
-		.name = "DRANAP",
-		.description = "Radio Access Network Application Part Protocol",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
-	[DSUA] = {
-		.name = "DSUA",
-		.description = "SCCP User Adaptation Protocol",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
 	[DPCU] = {
 		.name = "DPCU",
 		.description = "PCU Interface",
 		.enabled = 1, .loglevel = LOGL_DEBUG,
 	},
-	[DVLR] = {
-		.name = "DVLR",
-		.description = "Visitor Location Register",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
-	[DIUCS] = {
-		.name = "DIUCS",
-		.description = "Iu-CS Protocol",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
-	[DSIGTRAN] = {
-		.name = "DSIGTRAN",
-		.description = "SIGTRAN Signalling Transport",
-		.color = "\033[1;29m",
-		.enabled = 1, .loglevel = LOGL_DEBUG,
-	},
 };
 
 static int filter_fn(const struct log_context *ctx, struct log_target *tar)
diff --git a/tests/bsc-nat/bsc_nat_test.c b/tests/bsc-nat/bsc_nat_test.c
index 3d3b4558d..09378ae6a 100644
--- a/tests/bsc-nat/bsc_nat_test.c
+++ b/tests/bsc-nat/bsc_nat_test.c
@@ -1560,7 +1560,7 @@ static const struct log_info log_info = {
 int main(int argc, char **argv)
 {
 	msgb_talloc_ctx_init(NULL, 0);
-	sccp_set_log_area(DSCCP);
+	sccp_set_log_area(DLSCCP);
 	osmo_init_logging(&log_info);
 
 	test_filter();
-- 
cgit v1.2.3