summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-04-26 14:54:52 +0200
committerLioncash <mathew1800@gmail.com>2018-04-26 15:32:45 +0200
commit08da0b7acc6e9a251a8505a0abf6deaf2276cde8 (patch)
tree7ec7e44647a567dbf8fd1407745eff8fe28e2dd1 /src/core
parentMerge pull request #396 from Subv/shader_ops (diff)
downloadyuzu-08da0b7acc6e9a251a8505a0abf6deaf2276cde8.tar
yuzu-08da0b7acc6e9a251a8505a0abf6deaf2276cde8.tar.gz
yuzu-08da0b7acc6e9a251a8505a0abf6deaf2276cde8.tar.bz2
yuzu-08da0b7acc6e9a251a8505a0abf6deaf2276cde8.tar.lz
yuzu-08da0b7acc6e9a251a8505a0abf6deaf2276cde8.tar.xz
yuzu-08da0b7acc6e9a251a8505a0abf6deaf2276cde8.tar.zst
yuzu-08da0b7acc6e9a251a8505a0abf6deaf2276cde8.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hw/hw.cpp10
-rw-r--r--src/core/hw/lcd.cpp8
2 files changed, 10 insertions, 8 deletions
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index 0db604c76..f8a40390a 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -33,7 +33,8 @@ inline void Read(T& var, const u32 addr) {
LCD::Read(var, addr);
break;
default:
- LOG_ERROR(HW_Memory, "unknown Read%lu @ 0x%08X", sizeof(var) * 8, addr);
+ NGLOG_ERROR(HW_Memory, "Unknown Read{} @ {:#010X}", sizeof(var) * 8, addr);
+ break;
}
}
@@ -61,7 +62,8 @@ inline void Write(u32 addr, const T data) {
LCD::Write(addr, data);
break;
default:
- LOG_ERROR(HW_Memory, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, addr);
+ NGLOG_ERROR(HW_Memory, "Unknown Write{} {:#010X} @ {:#010X}", sizeof(data) * 8, data, addr);
+ break;
}
}
@@ -83,12 +85,12 @@ void Update() {}
/// Initialize hardware
void Init() {
LCD::Init();
- LOG_DEBUG(HW, "initialized OK");
+ NGLOG_DEBUG(HW, "Initialized OK");
}
/// Shutdown hardware
void Shutdown() {
LCD::Shutdown();
- LOG_DEBUG(HW, "shutdown OK");
+ NGLOG_DEBUG(HW, "Shutdown OK");
}
} // namespace HW
diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp
index 690079b65..7d0046bf3 100644
--- a/src/core/hw/lcd.cpp
+++ b/src/core/hw/lcd.cpp
@@ -20,7 +20,7 @@ inline void Read(T& var, const u32 raw_addr) {
// Reads other than u32 are untested, so I'd rather have them abort than silently fail
if (index >= 0x400 || !std::is_same<T, u32>::value) {
- LOG_ERROR(HW_LCD, "unknown Read%lu @ 0x%08X", sizeof(var) * 8, addr);
+ NGLOG_ERROR(HW_LCD, "Unknown Read{} @ {:#010X}", sizeof(var) * 8, addr);
return;
}
@@ -34,7 +34,7 @@ inline void Write(u32 addr, const T data) {
// Writes other than u32 are untested, so I'd rather have them abort than silently fail
if (index >= 0x400 || !std::is_same<T, u32>::value) {
- LOG_ERROR(HW_LCD, "unknown Write%lu 0x%08X @ 0x%08X", sizeof(data) * 8, (u32)data, addr);
+ NGLOG_ERROR(HW_LCD, "Unknown Write{} {:#010X} @ {:#010X}", sizeof(data) * 8, data, addr);
return;
}
@@ -56,12 +56,12 @@ template void Write<u8>(u32 addr, const u8 data);
/// Initialize hardware
void Init() {
memset(&g_regs, 0, sizeof(g_regs));
- LOG_DEBUG(HW_LCD, "initialized OK");
+ NGLOG_DEBUG(HW_LCD, "Initialized OK");
}
/// Shutdown hardware
void Shutdown() {
- LOG_DEBUG(HW_LCD, "shutdown OK");
+ NGLOG_DEBUG(HW_LCD, "Shutdown OK");
}
} // namespace LCD