From 3bd041f5b0cd481ded892594d569462492679e39 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 10 Apr 2014 22:15:07 -0400 Subject: changed some naming/misc cleanups --- src/core/hle/hle.h | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'src/core/hle/hle.h') diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h index 6648c787..35c8a462 100644 --- a/src/core/hle/hle.h +++ b/src/core/hle/hle.h @@ -9,29 +9,31 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -typedef void (*HLEFunc)(); +#define PARAM(n) Core::g_app_core->GetReg(n) +#define RETURN(n) Core::g_app_core->SetReg(0, n) + +//////////////////////////////////////////////////////////////////////////////////////////////////// + +namespace HLE { -struct HLEFunction { +typedef void (*Func)(); + +struct FunctionDef { u32 id; - HLEFunc func; - const char* name; + Func func; + std::string name; }; -struct HLEModule { - const char* name; +struct ModuleDef { + std::string name; int num_funcs; - const HLEFunction* func_table; + const FunctionDef* func_table; }; -#define PARAM(n) Core::g_app_core->GetReg(n) -#define RETURN(n) Core::g_app_core->SetReg(0, n) - -namespace HLE { - void Init(); void Shutdown(); -void RegisterModule(const char *name, int num_functions, const HLEFunction *func_table); +void RegisterModule(std::string name, int num_functions, const FunctionDef *func_table); } // namespace -- cgit v1.2.3