Merge branch 'hle-interface'

4 files changed, 27 insertions, 5 deletions

diff --git a/src/common/log.h b/src/common/log.h
index 432a307f0..02db8bd55 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -55,8 +55,8 @@ enum LOG_TYPE {
     WII_IPC_HID,
     WII_IPC_HLE,
     WII_IPC_NET,
-    WII_IPC_WC24,
-    WII_IPC_SSL,
+    NDMA,
+    HLE,
     RENDER,
     LCD,
     HW,
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp
index 245760d0d..8e56deb8f 100644
--- a/src/common/log_manager.cpp
+++ b/src/common/log_manager.cpp
@@ -67,9 +67,9 @@ 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::WII_IPC_SSL]        = new LogContainer("WII_IPC_SSL",       "WII IPC SSL");
-    m_Log[LogTypes::HW]                 = new LogContainer("HARDWARE",          "HARDWARE");
+    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");
     m_Log[LogTypes::MEMCARD_MANAGER]    = new LogContainer("MemCard Manager",   "MemCard Manager");
     m_Log[LogTypes::NETPLAY]            = new LogContainer("NETPLAY",           "Netplay");
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 <errno.h>
 #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);