From 772abad77803809d8ee857efc0d7e29c36c6b2cb Mon Sep 17 00:00:00 2001
From: bunnei <ericbunnie@gmail.com>
Date: Sun, 18 May 2014 18:12:29 -0400
Subject: - moved Handle/Result definitions to kernel.h

- added ResetType enum
---
 src/core/hle/service/service.h | 12 +++++++-----
 src/core/hle/service/srv.cpp   |  2 +-
 src/core/hle/service/srv.h     |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/core/hle/service')

diff --git a/src/core/hle/service/service.h b/src/core/hle/service/service.h
index b260a290a..026e3d5de 100644
--- a/src/core/hle/service/service.h
+++ b/src/core/hle/service/service.h
@@ -11,6 +11,8 @@
 #include "common/common.h"
 #include "common/common_types.h"
 #include "core/mem_map.h"
+
+#include "core/hle/kernel/kernel.h"
 #include "core/hle/syscall.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -70,14 +72,14 @@ public:
     }
 
     /// Allocates a new handle for the service
-    Syscall::Handle NewHandle() {
-        Syscall::Handle handle = (m_handles.size() << 16) | m_uid;
+    Handle NewHandle() {
+        Handle handle = (m_handles.size() << 16) | m_uid;
         m_handles.push_back(handle);
         return handle;
     }
 
     /// Frees a handle from the service
-    void DeleteHandle(Syscall::Handle handle) {
+    void DeleteHandle(Handle handle) {
         for(auto iter = m_handles.begin(); iter != m_handles.end(); ++iter) {
             if(*iter == handle) {
                 m_handles.erase(iter);
@@ -90,7 +92,7 @@ public:
      * Called when svcSendSyncRequest is called, loads command buffer and executes comand
      * @return Return result of svcSendSyncRequest passed back to user app
      */
-    Syscall::Result Sync() {
+    Result Sync() {
         u32* cmd_buff = GetCommandBuffer();
         auto itr = m_functions.find(cmd_buff[0]);
 
@@ -124,7 +126,7 @@ protected:
 private:
     u32 m_uid;
     
-    std::vector<Syscall::Handle>    m_handles;
+    std::vector<Handle>    m_handles;
     std::map<u32, FunctionInfo>     m_functions;
 };
 
diff --git a/src/core/hle/service/srv.cpp b/src/core/hle/service/srv.cpp
index 303a943d4..a3d041176 100644
--- a/src/core/hle/service/srv.cpp
+++ b/src/core/hle/service/srv.cpp
@@ -23,7 +23,7 @@ void GetProcSemaphore(Service::Interface* self) {
 }
 
 void GetServiceHandle(Service::Interface* self) {
-    Syscall::Result res = 0;
+    Result res = 0;
     u32* cmd_buff = Service::GetCommandBuffer();
 
     std::string port_name = std::string((const char*)&cmd_buff[1], 0, Service::kMaxPortSize);
diff --git a/src/core/hle/service/srv.h b/src/core/hle/service/srv.h
index 760c976b4..f465ebc06 100644
--- a/src/core/hle/service/srv.h
+++ b/src/core/hle/service/srv.h
@@ -30,7 +30,7 @@ public:
      * Called when svcSendSyncRequest is called, loads command buffer and executes comand
      * @return Return result of svcSendSyncRequest passed back to user app
      */
-    Syscall::Result Sync();
+    Result Sync();
 
 };
 
-- 
cgit v1.2.3