Imported Upstream version 1.0.0

[platform/upstream/iotivity.git] / resource / csdk / connectivity / common / inc / logger.h

diff --git a/resource/csdk/connectivity/common/inc/logger.h b/resource/csdk/connectivity/common/inc/logger.h
index bf6f130..e48ee7c 100644 (file)
--- a/resource/csdk/connectivity/common/inc/logger.h
+++ b/resource/csdk/connectivity/common/inc/logger.h
@@ -59,17 +59,25 @@ extern "C"
 #define MAX_LOG_V_BUFFER_SIZE (256)
 
 // Log levels
-#ifndef __TIZEN__
+#ifdef __TIZEN__
+typedef enum {
+    DEBUG = DLOG_DEBUG,
+    INFO = DLOG_INFO,
+    WARNING = DLOG_WARN,
+    ERROR = DLOG_ERROR,
+    FATAL = DLOG_ERROR
+} LogLevel;
+#else
 typedef enum
 {
     DEBUG = 0, INFO, WARNING, ERROR, FATAL
 } LogLevel;
-#else
-#define DEBUG DLOG_DEBUG
-#define INFO DLOG_INFO
-#define WARNING DLOG_WARNING
-#define ERROR DLOG_ERROR
-#define FATAL DLOG_ERROR
+#endif
+
+#ifdef __TIZEN__
+#define OC_LOG(level,tag,mes) LOG_(LOG_ID_MAIN, level, tag, mes)
+#define OC_LOG_V(level,tag,fmt,args...) LOG_(LOG_ID_MAIN, level, tag, fmt,##args)
+#define OC_LOG_BUFFER(level, tag, buffer, bufferSize)
 #endif
 
 #ifdef __TIZEN__
@@ -190,27 +198,17 @@ void OICLogv(LogLevel level, PROGMEM const char *tag, const int16_t lineNum,
 #endif //__TIZEN__
 #else //TB_LOG
 
-#ifdef __ANDROID__
-#define OIC_LOG_CONFIG(ctx)
-#define OIC_LOG_SHUTDOWN()
-#define OIC_LOG_BUFFER(level, tag, buffer, bufferSize)
-#define OIC_LOG_INIT()
-#define OIC_LOG(level,tag,mes) __android_log_print(ANDROID_LOG_INFO, tag, mes)
-#define OIC_LOG_V(level,tag,fmt,args...) __android_log_print(ANDROID_LOG_INFO, tag, fmt,##args)
-
-#else
 #define OIC_LOG_CONFIG(ctx)
 #define OIC_LOG_SHUTDOWN()
 #define OIC_LOG(level, tag, logStr)
 #define OIC_LOG_V(level, tag, ...)
 #define OIC_LOG_BUFFER(level, tag, buffer, bufferSize)
 #define OIC_LOG_INIT()
-#endif //__ANDROID__
+
 #endif // TB_LOG
 
 
 #ifdef __cplusplus
 }
 #endif // __cplusplus
-#endif /* U_LOGGER_H_ */
-
+#endif /* U_LOGGER_H_ */
\ No newline at end of file