X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=src%2Fhost%2Fgsmmap%2Fgsmmap.c;h=83f0d01ce0418b87c6cc65f61fee7f1cae3c0d2b;hb=d8bb915da8c2f3fe948b65fd39ee0349eb6a9812;hp=01f3670c05fcf31c2e44d11babe6b0159e7fd32f;hpb=cef26cd2f529b574a880e39f0dec6d7996119cd3;p=osmocom-bb.git

diff --git a/src/host/gsmmap/gsmmap.c b/src/host/gsmmap/gsmmap.c
index 01f3670..83f0d01 100644
--- a/src/host/gsmmap/gsmmap.c
+++ b/src/host/gsmmap/gsmmap.c
@@ -32,6 +32,7 @@
 
 #include <osmocom/bb/common/osmocom_data.h>
 #include <osmocom/bb/common/networks.h>
+#include <osmocom/bb/common/logging.h>
 
 #include "log.h"
 #include "geo.h"
@@ -69,6 +70,21 @@ static void add_power()
 	memcpy(&node_power->power, &power, sizeof(power));
 }
 
+static void print_si(void *priv, const char *fmt, ...)
+{
+	char buffer[1000];
+	FILE *outfp = (FILE *)priv;
+	va_list args;
+
+	va_start(args, fmt);
+	vsnprintf(buffer, sizeof(buffer) - 1, fmt, args);
+	buffer[sizeof(buffer) - 1] = '\0';
+	va_end(args);
+
+	if (buffer[0])
+		fprintf(outfp, "%s", buffer);
+}
+
 static void add_sysinfo()
 {
 	struct gsm48_sysinfo s;
@@ -107,7 +123,8 @@ static void add_sysinfo()
 		gsm48_decode_sysinfo4(&s,
 			(struct gsm48_system_information_type_4 *) sysinfo.si4,
 			23);
-
+	printf("--------------------------------------------------------------------------\n");
+	gsm48_sysinfo_dump(&s, sysinfo.arfcn, print_si, stdout, NULL);
 	mcc = get_node_mcc(s.mcc);
 	if (!mcc)
 		nomem();
@@ -322,21 +339,6 @@ void kml_meas(FILE *outfp, struct node_meas *meas, int n, uint16_t mcc,
 	fprintf(outfp, "\t\t\t\t\t</Placemark>\n");
 }
 
-static void print_si(void *priv, const char *fmt, ...)
-{
-	char buffer[1000];
-	FILE *outfp = (FILE *)priv;
-	va_list args;
-
-	va_start(args, fmt);
-	vsnprintf(buffer, sizeof(buffer) - 1, fmt, args);
-	buffer[sizeof(buffer) - 1] = '\0';
-	va_end(args);
-
-	if (buffer[0])
-		fprintf(outfp, "%s", buffer);
-}
-
 double debug_long, debug_lat, debug_x_scale;
 FILE *debug_fp;
 
@@ -431,7 +433,8 @@ void kml_cell(FILE *outfp, struct node_cell *cell)
 		gsm_get_mcc(cell->s.mcc),
 		gsm_get_mnc(cell->s.mcc, cell->s.mnc));
 	fprintf(outfp, "\t\t\t\t\t\t<description>\n");
-	gsm48_sysinfo_dump(&cell->s, cell->sysinfo.arfcn, print_si, outfp);
+	gsm48_sysinfo_dump(&cell->s, cell->sysinfo.arfcn, print_si, outfp,
+		NULL);
 	fprintf(outfp, "\t\t\t\t\t\t</description>\n");
 	fprintf(outfp, "\t\t\t\t\t\t<LookAt>\n");
 	fprintf(outfp, "\t\t\t\t\t\t\t<longitude>%.8f</longitude>\n",
@@ -498,6 +501,8 @@ void kml_cell(FILE *outfp, struct node_cell *cell)
 	fprintf(outfp, "\t</Folder>\n");
 }
 
+struct log_target *stderr_target;
+
 int main(int argc, char *argv[])
 {
 	FILE *infp, *outfp;
@@ -509,6 +514,13 @@ int main(int argc, char *argv[])
 	struct node_cell *cell;
 	struct node_meas *meas;
 
+	log_init(&log_info, NULL);
+	stderr_target = log_target_create_stderr();
+	log_add_target(stderr_target);
+	log_set_all_filter(stderr_target, 1);
+	log_parse_category_mask(stderr_target, "Dxxx");
+	log_set_log_level(stderr_target, LOGL_INFO);
+
 	if (argc <= 2) {
 usage:
 		fprintf(stderr, "Usage: %s <file.log> <file.kml> "