From e9509be98cc35359a7c08395eeb39b325231cc42 Mon Sep 17 00:00:00 2001
From: George Oikonomou <george@contiki-os.org>
Date: Wed, 18 Oct 2017 00:16:11 +0100
Subject: [PATCH] Extend the logging module to support the common main +
 platform-specific hooks

---
 os/sys/log-conf.h | 4 ++++
 os/sys/log.c      | 2 ++
 os/sys/log.h      | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/os/sys/log-conf.h b/os/sys/log-conf.h
index c309e69bd..209d3d1ad 100644
--- a/os/sys/log-conf.h
+++ b/os/sys/log-conf.h
@@ -117,6 +117,10 @@
 #define LOG_CONF_LEVEL_6TOP                        LOG_LEVEL_NONE
 #endif /* LOG_CONF_LEVEL_6TOP */
 
+#ifndef LOG_CONF_LEVEL_MAIN
+#define LOG_CONF_LEVEL_MAIN                        LOG_LEVEL_INFO
+#endif /* LOG_CONF_LEVEL_MAIN */
+
 #endif /* __LOG_CONF_H__ */
 
 /** @} */
diff --git a/os/sys/log.c b/os/sys/log.c
index 98e982451..d4b21639d 100644
--- a/os/sys/log.c
+++ b/os/sys/log.c
@@ -59,6 +59,7 @@ int curr_log_level_nullnet = LOG_CONF_LEVEL_NULLNET;
 int curr_log_level_mac = LOG_CONF_LEVEL_MAC;
 int curr_log_level_framer = LOG_CONF_LEVEL_FRAMER;
 int curr_log_level_6top = LOG_CONF_LEVEL_6TOP;
+int curr_log_level_main = LOG_CONF_LEVEL_MAIN;
 
 struct log_module all_modules[] = {
   {"rpl", &curr_log_level_rpl, LOG_CONF_LEVEL_RPL},
@@ -69,6 +70,7 @@ struct log_module all_modules[] = {
   {"mac", &curr_log_level_mac, LOG_CONF_LEVEL_MAC},
   {"framer", &curr_log_level_framer, LOG_CONF_LEVEL_FRAMER},
   {"6top", &curr_log_level_6top, LOG_CONF_LEVEL_6TOP},
+  {"main", &curr_log_level_main, LOG_CONF_LEVEL_MAIN},
   {NULL, NULL, 0},
 };
 
diff --git a/os/sys/log.h b/os/sys/log.h
index 99f43f93f..d638bee7d 100644
--- a/os/sys/log.h
+++ b/os/sys/log.h
@@ -81,6 +81,7 @@ extern int curr_log_level_nullnet;
 extern int curr_log_level_mac;
 extern int curr_log_level_framer;
 extern int curr_log_level_6top;
+extern int curr_log_level_main;
 
 extern struct log_module all_modules[];
 
@@ -92,6 +93,7 @@ extern struct log_module all_modules[];
 #define LOG_LEVEL_MAC                         MIN((LOG_CONF_LEVEL_MAC), curr_log_level_mac)
 #define LOG_LEVEL_FRAMER                      MIN((LOG_CONF_LEVEL_FRAMER), curr_log_level_framer)
 #define LOG_LEVEL_6TOP                        MIN((LOG_CONF_LEVEL_6TOP), curr_log_level_6top)
+#define LOG_LEVEL_MAIN                        MIN((LOG_CONF_LEVEL_MAIN), curr_log_level_main)
 
 /* Main log function */