From d4cb2aab63d4739db6b09a821a9e715985e615be Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 10 Apr 2014 22:43:48 -0400 Subject: added logger for generic HLE --- src/common/log.h | 2 +- src/common/log_manager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common') diff --git a/src/common/log.h b/src/common/log.h index 432a307f0..2eacf05f2 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -56,7 +56,7 @@ enum LOG_TYPE { WII_IPC_HLE, WII_IPC_NET, WII_IPC_WC24, - WII_IPC_SSL, + HLE, RENDER, LCD, HW, diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index 245760d0d..b2dbbbdac 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp @@ -68,8 +68,8 @@ LogManager::LogManager() m_Log[LogTypes::LCD] = new LogContainer("LCD", "LCD"); m_Log[LogTypes::WII_IPC_NET] = new LogContainer("WII_IPC_NET", "WII IPC NET"); m_Log[LogTypes::WII_IPC_WC24] = new LogContainer("WII_IPC_WC24", "WII IPC WC24"); - m_Log[LogTypes::WII_IPC_SSL] = new LogContainer("WII_IPC_SSL", "WII IPC SSL"); - m_Log[LogTypes::HW] = new LogContainer("HARDWARE", "HARDWARE"); + m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation"); + m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware"); m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); m_Log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager"); m_Log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay"); -- cgit v1.2.3 From cb504e236bb21816b5794a14c4dc57d93766e5a8 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 14 Apr 2014 21:25:46 -0400 Subject: added helper functions for upper/lowercase strings --- src/common/string_util.cpp | 16 ++++++++++++++++ src/common/string_util.h | 6 ++++++ 2 files changed, 22 insertions(+) (limited to 'src/common') diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index a99644f11..e5a9ba322 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -17,6 +17,22 @@ #include #endif +/// Make a string lowercase +void LowerStr(char* str) { + for (int i = 0; str[i]; i++) { + str[i] = tolower(str[ i ]); + } +} + +/// Make a string uppercase +void UpperStr(char* str) { + for (int i=0; i < strlen(str); i++) { + if(str[i] >= 'a' && str[i] <= 'z') { + str[i] &= 0xDF; + } + } +} + // faster than sscanf bool AsciiToHex(const char* _szValue, u32& result) { diff --git a/src/common/string_util.h b/src/common/string_util.h index 6b7e84797..b3c99a807 100644 --- a/src/common/string_util.h +++ b/src/common/string_util.h @@ -14,6 +14,12 @@ #include "common/common.h" +/// Make a string lowercase +void LowerStr(char* str); + +/// Make a string uppercase +void UpperStr(char* str); + std::string StringFromFormat(const char* format, ...); // Cheap! bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list args); -- cgit v1.2.3 From c3a4b4bfca154f3f27830fe747c0fd74f8459d84 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 17 Apr 2014 23:43:55 -0400 Subject: added NDMA hardware interface --- src/common/log.h | 2 +- src/common/log_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common') diff --git a/src/common/log.h b/src/common/log.h index 2eacf05f2..02db8bd55 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -55,7 +55,7 @@ enum LOG_TYPE { WII_IPC_HID, WII_IPC_HLE, WII_IPC_NET, - WII_IPC_WC24, + NDMA, HLE, RENDER, LCD, diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index b2dbbbdac..8e56deb8f 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp @@ -67,7 +67,7 @@ LogManager::LogManager() m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER"); m_Log[LogTypes::LCD] = new LogContainer("LCD", "LCD"); m_Log[LogTypes::WII_IPC_NET] = new LogContainer("WII_IPC_NET", "WII IPC NET"); - m_Log[LogTypes::WII_IPC_WC24] = new LogContainer("WII_IPC_WC24", "WII IPC WC24"); + m_Log[LogTypes::NDMA] = new LogContainer("NDMA", "NDMA"); m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation"); m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware"); m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay"); -- cgit v1.2.3