From f6c328cf37fe6e0250c20fcbf128f301b3d71d36 Mon Sep 17 00:00:00 2001
From: bunnei
Date: Fri, 11 Apr 2014 18:07:49 -0400
Subject: moved hle.cpp into hle folder (due to mistake earlier)

---
 src/core/core.vcxproj         |  2 +-
 src/core/core.vcxproj.filters |  2 +-
 src/core/hle.cpp              | 57 -------------------------------------------
 src/core/hle/hle.cpp          | 57 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 src/core/hle.cpp
 create mode 100644 src/core/hle/hle.cpp

(limited to 'src')

diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 8097a47d3..89795ce63 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -152,7 +152,7 @@
     <ClCompile Include="elf\elf_reader.cpp" />
     <ClCompile Include="file_sys\directory_file_system.cpp" />
     <ClCompile Include="file_sys\meta_file_system.cpp" />
-    <ClCompile Include="hle.cpp" />
+    <ClCompile Include="hle\hle.cpp" />
     <ClCompile Include="hle\hle_syscall.cpp" />
     <ClCompile Include="hw\hw.cpp" />
     <ClCompile Include="hw\hw_lcd.cpp" />
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
index 79bddf09a..eece5d486 100644
--- a/src/core/core.vcxproj.filters
+++ b/src/core/core.vcxproj.filters
@@ -81,7 +81,7 @@
     <ClCompile Include="hle\hle_syscall.cpp">
       <Filter>hle</Filter>
     </ClCompile>
-    <ClCompile Include="hle.cpp">
+    <ClCompile Include="hle\hle.cpp">
       <Filter>hle</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/src/core/hle.cpp b/src/core/hle.cpp
deleted file mode 100644
index d62d2d0ce..000000000
--- a/src/core/hle.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.  
-
-#include <vector>
-
-#include "core/hle/hle.h"
-#include "core/hle/hle_syscall.h"
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace HLE {
-
-static std::vector<ModuleDef> g_module_db;
-
-const FunctionDef* GetSyscallInfo(u32 opcode) {
-    u32 func_num = opcode & 0xFFFFFF; // 8 bits
-    if (func_num > 0xFF) {
-        ERROR_LOG(HLE,"Unknown syscall: 0x%02X", func_num); 
-        return NULL;
-    }
-    return &g_module_db[0].func_table[func_num];
-}
-
-void CallSyscall(u32 opcode) {
-    const FunctionDef *info = GetSyscallInfo(opcode);
-
-    if (!info) {
-        return;
-    }
-    if (info->func) {
-        info->func();
-    } else {
-        ERROR_LOG(HLE, "Unimplemented HLE function %s", info->name);
-    }
-}
-
-void RegisterModule(std::string name, int num_functions, const FunctionDef* func_table) {
-    ModuleDef module = {name, num_functions, func_table};
-    g_module_db.push_back(module);
-}
-
-void RegisterAllModules() {
-    Register_Syscall();
-}
-
-void Init() {
-    RegisterAllModules();
-    NOTICE_LOG(HLE, "initialized OK");
-}
-
-void Shutdown() {
-    g_module_db.clear();
-    NOTICE_LOG(HLE, "shutdown OK");
-}
-
-} // namespace
diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp
new file mode 100644
index 000000000..d62d2d0ce
--- /dev/null
+++ b/src/core/hle/hle.cpp
@@ -0,0 +1,57 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2
+// Refer to the license.txt file included.  
+
+#include <vector>
+
+#include "core/hle/hle.h"
+#include "core/hle/hle_syscall.h"
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+namespace HLE {
+
+static std::vector<ModuleDef> g_module_db;
+
+const FunctionDef* GetSyscallInfo(u32 opcode) {
+    u32 func_num = opcode & 0xFFFFFF; // 8 bits
+    if (func_num > 0xFF) {
+        ERROR_LOG(HLE,"Unknown syscall: 0x%02X", func_num); 
+        return NULL;
+    }
+    return &g_module_db[0].func_table[func_num];
+}
+
+void CallSyscall(u32 opcode) {
+    const FunctionDef *info = GetSyscallInfo(opcode);
+
+    if (!info) {
+        return;
+    }
+    if (info->func) {
+        info->func();
+    } else {
+        ERROR_LOG(HLE, "Unimplemented HLE function %s", info->name);
+    }
+}
+
+void RegisterModule(std::string name, int num_functions, const FunctionDef* func_table) {
+    ModuleDef module = {name, num_functions, func_table};
+    g_module_db.push_back(module);
+}
+
+void RegisterAllModules() {
+    Register_Syscall();
+}
+
+void Init() {
+    RegisterAllModules();
+    NOTICE_LOG(HLE, "initialized OK");
+}
+
+void Shutdown() {
+    g_module_db.clear();
+    NOTICE_LOG(HLE, "shutdown OK");
+}
+
+} // namespace
-- 
cgit v1.2.3