summaryrefslogtreecommitdiffstats
path: root/src/common/log.h
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2014-10-28 08:36:00 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2014-12-13 04:59:52 +0100
commit616d87444313db865c60fbeee36ebe5250ef301e (patch)
treefb99bf8bebfdf8c825c5d3e4f01fb4779ceaba68 /src/common/log.h
parentAdd SCOPE_EXIT macro to conveniently execute cleanup actions (diff)
downloadyuzu-616d87444313db865c60fbeee36ebe5250ef301e.tar
yuzu-616d87444313db865c60fbeee36ebe5250ef301e.tar.gz
yuzu-616d87444313db865c60fbeee36ebe5250ef301e.tar.bz2
yuzu-616d87444313db865c60fbeee36ebe5250ef301e.tar.lz
yuzu-616d87444313db865c60fbeee36ebe5250ef301e.tar.xz
yuzu-616d87444313db865c60fbeee36ebe5250ef301e.tar.zst
yuzu-616d87444313db865c60fbeee36ebe5250ef301e.zip
Diffstat (limited to '')
-rw-r--r--src/common/log.h78
1 files changed, 43 insertions, 35 deletions
diff --git a/src/common/log.h b/src/common/log.h
index 78f0dae4d..105db9802 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -6,6 +6,7 @@
#include "common/common_funcs.h"
#include "common/msg_handler.h"
+#include "common/logging/log.h"
#ifndef LOGGING
#define LOGGING
@@ -24,45 +25,45 @@ namespace LogTypes
{
enum LOG_TYPE {
- ACTIONREPLAY,
- AUDIO,
- AUDIO_INTERFACE,
+ //ACTIONREPLAY,
+ //AUDIO,
+ //AUDIO_INTERFACE,
BOOT,
- COMMANDPROCESSOR,
+ //COMMANDPROCESSOR,
COMMON,
- CONSOLE,
+ //CONSOLE,
CONFIG,
- DISCIO,
- FILEMON,
- DSPHLE,
- DSPLLE,
- DSP_MAIL,
- DSPINTERFACE,
- DVDINTERFACE,
- DYNA_REC,
- EXPANSIONINTERFACE,
- GDB_STUB,
+ //DISCIO,
+ //FILEMON,
+ //DSPHLE,
+ //DSPLLE,
+ //DSP_MAIL,
+ //DSPINTERFACE,
+ //DVDINTERFACE,
+ //DYNA_REC,
+ //EXPANSIONINTERFACE,
+ //GDB_STUB,
ARM11,
GSP,
OSHLE,
MASTER_LOG,
MEMMAP,
- MEMCARD_MANAGER,
- OSREPORT,
- PAD,
- PROCESSORINTERFACE,
- PIXELENGINE,
- SERIALINTERFACE,
- SP1,
- STREAMINGINTERFACE,
+ //MEMCARD_MANAGER,
+ //OSREPORT,
+ //PAD,
+ //PROCESSORINTERFACE,
+ //PIXELENGINE,
+ //SERIALINTERFACE,
+ //SP1,
+ //STREAMINGINTERFACE,
VIDEO,
- VIDEOINTERFACE,
+ //VIDEOINTERFACE,
LOADER,
FILESYS,
- WII_IPC_DVD,
- WII_IPC_ES,
- WII_IPC_FILEIO,
- WII_IPC_HID,
+ //WII_IPC_DVD,
+ //WII_IPC_ES,
+ //WII_IPC_FILEIO,
+ //WII_IPC_HID,
KERNEL,
SVC,
HLE,
@@ -70,7 +71,7 @@ enum LOG_TYPE {
GPU,
HW,
TIME,
- NETPLAY,
+ //NETPLAY,
GUI,
NUMBER_OF_LOGS // Must be last
@@ -118,12 +119,19 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int
GenericLog(v, t, __FILE__, __LINE__, __func__, __VA_ARGS__); \
}
-#define OS_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LOS, __VA_ARGS__) } while (0)
-#define ERROR_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LERROR, __VA_ARGS__) } while (0)
-#define WARN_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, __VA_ARGS__) } while (0)
-#define NOTICE_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LNOTICE, __VA_ARGS__) } while (0)
-#define INFO_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__) } while (0)
-#define DEBUG_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__) } while (0)
+//#define OS_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LOS, __VA_ARGS__) } while (0)
+//#define ERROR_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LERROR, __VA_ARGS__) } while (0)
+//#define WARN_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, __VA_ARGS__) } while (0)
+//#define NOTICE_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LNOTICE, __VA_ARGS__) } while (0)
+//#define INFO_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__) } while (0)
+//#define DEBUG_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__) } while (0)
+
+#define OS_LOG(t,...) LOG_INFO(Common, __VA_ARGS__)
+#define ERROR_LOG(t,...) LOG_ERROR(Common_Filesystem, __VA_ARGS__)
+#define WARN_LOG(t,...) LOG_WARNING(Kernel_SVC, __VA_ARGS__)
+#define NOTICE_LOG(t,...) LOG_INFO(Service, __VA_ARGS__)
+#define INFO_LOG(t,...) LOG_INFO(Service_FS, __VA_ARGS__)
+#define DEBUG_LOG(t,...) LOG_DEBUG(Common, __VA_ARGS__)
#if MAX_LOGLEVEL >= DEBUG_LEVEL
#define _dbg_assert_(_t_, _a_) \