debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-10-08 22:44:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix windows

Browse Source
This commit is contained in:
Maufeat
2026-10-08 21:22:09 +02:00
parent 06b2579e89
commit 60e0d5ab73
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/hle/service/service.cpp
+11 -4
View File
@@ -76,8 +76,9 @@ void ServiceFrameworkBase::ReportUnimplementedFunction(HLERequestContext& ctx, c
u32 const c_min = FirmwareManager::GetFirmwareVersion(system).first.minor;
u32 const c_pat = FirmwareManager::GetFirmwareVersion(system).first.micro;
u32 const cg = (c_pat << 0) | (c_min << 4) | (c_maj << 8);
u32 const sg = vg & 0xfff;
u32 const ug = (vg >> 12) & 0xfff;
u32 const sg = (vg >> 16) & 0xffff;
u32 const ug = vg & 0xffff;
LOG_ERROR(Service, "sg: {}, cg: {}, ug: {}", sg, cg, ug);
// feature available after current
if (sg && cg < sg)
return false;
@@ -91,8 +92,11 @@ void ServiceFrameworkBase::InvokeRequest(HLERequestContext& ctx) {
if (!info.has_value() || info->handler_callback == nullptr)
return ReportUnimplementedFunction(ctx, &*info, false);
if (VersionGateCheck(system, info->version_gating))
LOG_ERROR(Service, "check for {} version_gating: {}", info->name, info->version_gating);
if (!VersionGateCheck(system, info->version_gating))
{
return ReportUnimplementedFunction(ctx, &*info, true);
}
LOG_TRACE(Service, "{}", MakeFunctionString(info->name, GetServiceName(), ctx.CommandBuffer()));
handler_invoker(this, info->handler_callback, ctx);
@@ -109,8 +113,11 @@ void ServiceFrameworkBase::InvokeRequestTipc(HLERequestContext& ctx) {
if (!info.has_value() || info->handler_callback == nullptr)
return ReportUnimplementedFunction(ctx, &*info, false);
if (VersionGateCheck(system, info->version_gating))
LOG_ERROR(Service, "check for {} version_gating: {}", info->name, info->version_gating);
if (!VersionGateCheck(system, info->version_gating))
{
return ReportUnimplementedFunction(ctx, &*info, true);
}
LOG_TRACE(Service, "{}", MakeFunctionString(info->name, GetServiceName(), ctx.CommandBuffer()));
handler_invoker(this, info->handler_callback, ctx);
src/core/hle/service/service.h
+9 -5
View File
@@ -86,7 +86,7 @@ protected:
auto const [s_maj, s_min, s_pat] = since;
auto const [u_maj, u_min, u_pat] = until;
return (u_pat << 0) | (u_min << 4) | (u_maj << 8)
| (s_pat << 12) | (s_min << 16) | (s_maj << 20);
| (s_pat << 16) | (s_min << 20) | (s_maj << 24);
}
struct FunctionInfoBase {
@@ -153,10 +153,12 @@ protected:
/// @param name_ human-friendly name for the request. Used mostly for logging purposes.
explicit constexpr FunctionInfoTyped(u32 expected_header_, HandlerFnP<T> handler_callback_, const char* name_, u32 version_gating_ = 0)
: handler_callback{handler_callback_}
, name{name_}
, version_gating{version_gating_}
, expected_header{expected_header_}
{}
HandlerFnP<T> handler_callback;
const char* name;
u32 version_gating;
u32 expected_header;
};
@@ -165,11 +167,13 @@ protected:
// expected_header serves as a key to 'address' function handlers, thus only include the minimal
template <typename T>
struct FunctionValueInfo {
explicit constexpr FunctionValueInfo(HandlerFnP<T> handler_callback_, u32 version_gating_)
explicit constexpr FunctionValueInfo(HandlerFnP<T> handler_callback_, const char* name_, u32 version_gating_)
: handler_callback{handler_callback_}
, name{name_}
, version_gating{version_gating_}
{}
HandlerFnP<T> handler_callback;
const char* name;
u32 version_gating;
};
@@ -177,7 +181,7 @@ protected:
//requires (std::same_as<Ts, FunctionInfo> && ...)
[[nodiscard]] static consteval frozen::map<u32, FunctionValueInfo<Self>, sizeof...(Ts)> CreateStaticMap(Ts... args) {
return frozen::map<u32, FunctionValueInfo<Self>, sizeof...(args)>{
{args.expected_header, FunctionValueInfo<Self>{args.handler_callback, args.version_gating}}...
{args.expected_header, FunctionValueInfo<Self>{args.handler_callback, args.name, args.version_gating}}...
};
}
@@ -186,7 +190,7 @@ protected:
//requires (std::same_as<Ts, FunctionInfoTyped<T>> && ...)
[[nodiscard]] static consteval frozen::map<u32, FunctionValueInfo<T>, sizeof...(Ts)> CreateStaticMapWithClass(Ts... args) {
return frozen::map<u32, FunctionValueInfo<T>, sizeof...(args)>{
{args.expected_header, FunctionValueInfo<T>{args.handler_callback, args.version_gating}}...
{args.expected_header, FunctionValueInfo<T>{args.handler_callback, args.name, args.version_gating}}...
};
}
@@ -197,7 +201,7 @@ protected:
auto const r = it->second;
return std::optional<FunctionInfoBase>{{
HandlerFnP<ServiceFrameworkBase>(r.handler_callback),
nullptr,
r.name,
r.version_gating
}};
}