Compare commits
9 Commits
android-26
...
android-26
| Author | SHA1 | Date | |
|---|---|---|---|
| 2051b3d2d6 | |||
| 921d800d66 | |||
| 6ab071dfb1 | |||
| 49f77aae14 | |||
| 08f4877288 | |||
| 3ebc0de12f | |||
| 7f9ad00b63 | |||
| 257b0ac59a | |||
| e646ef45ac |
3
.github/workflows/verify.yml
vendored
3
.github/workflows/verify.yml
vendored
@ -81,7 +81,8 @@ jobs:
|
||||
fetch-depth: 0
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
brew install autoconf automake boost ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd
|
||||
# workaround for https://github.com/actions/setup-python/issues/577
|
||||
brew install autoconf automake boost@1.83 ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd || brew link --overwrite python@3.12
|
||||
- name: Build
|
||||
run: |
|
||||
mkdir build
|
||||
|
||||
@ -2,9 +2,12 @@
|
||||
|----|----|----|----|----|
|
||||
| [12461](https://github.com/yuzu-emu/yuzu//pull/12461) | [`2831f5dc6`](https://github.com/yuzu-emu/yuzu//pull/12461/files) | Rework Nvdec and VIC to fix out-of-order videos, and speed up decoding. | [Kelebek1](https://github.com/Kelebek1/) | Yes |
|
||||
| [12749](https://github.com/yuzu-emu/yuzu//pull/12749) | [`aad4b0d6f`](https://github.com/yuzu-emu/yuzu//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||
| [13073](https://github.com/yuzu-emu/yuzu//pull/13073) | [`b5a17b501`](https://github.com/yuzu-emu/yuzu//pull/13073/files) | fsp: Migrate remaining interfaces to cmif serialization | [FearlessTobi](https://github.com/FearlessTobi/) | Yes |
|
||||
| [13096](https://github.com/yuzu-emu/yuzu//pull/13096) | [`0a8759057`](https://github.com/yuzu-emu/yuzu//pull/13096/files) | texture_cache: use two-pass collection for costly load resources | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||
| [13122](https://github.com/yuzu-emu/yuzu//pull/13122) | [`5dc08c7fe`](https://github.com/yuzu-emu/yuzu//pull/13122/files) | vk_rasterizer: flip scissor y on lower left origin mode | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||
| [13159](https://github.com/yuzu-emu/yuzu//pull/13159) | [`dc50b95a4`](https://github.com/yuzu-emu/yuzu//pull/13159/files) | core: enable error applet, add stubs for web applet | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||
| [13100](https://github.com/yuzu-emu/yuzu//pull/13100) | [`c04567fad`](https://github.com/yuzu-emu/yuzu//pull/13100/files) | audio: move to new ipc | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||
| [13115](https://github.com/yuzu-emu/yuzu//pull/13115) | [`89c2fd3d2`](https://github.com/yuzu-emu/yuzu//pull/13115/files) | olsc, pctl: move to new ipc | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||
| [13116](https://github.com/yuzu-emu/yuzu//pull/13116) | [`54ed837ad`](https://github.com/yuzu-emu/yuzu//pull/13116/files) | android: Flip AB/XY for 8Bitdo controllers | [t895](https://github.com/t895/) | Yes |
|
||||
| [13117](https://github.com/yuzu-emu/yuzu//pull/13117) | [`e85466c1a`](https://github.com/yuzu-emu/yuzu//pull/13117/files) | psc: stub overlay notification channel | [liamwhite](https://github.com/liamwhite/) | Yes |
|
||||
|
||||
|
||||
End of merge log. You can find the original README.md below the break.
|
||||
|
||||
@ -146,15 +146,11 @@ public:
|
||||
break;
|
||||
}
|
||||
|
||||
if (released < tags.size()) {
|
||||
tags[released] = tag;
|
||||
}
|
||||
|
||||
released++;
|
||||
|
||||
if (released >= tags.size()) {
|
||||
break;
|
||||
}
|
||||
|
||||
tags[released++] = tag;
|
||||
}
|
||||
|
||||
return released;
|
||||
|
||||
@ -67,13 +67,9 @@ public:
|
||||
oboe::AudioStreamBuilder builder;
|
||||
|
||||
const auto result = ConfigureBuilder(builder, direction)->openStream(temp_stream);
|
||||
if (result == oboe::Result::OK) {
|
||||
return temp_stream->getChannelCount() >= 6 ? 6 : 2;
|
||||
}
|
||||
ASSERT(result == oboe::Result::OK);
|
||||
|
||||
LOG_ERROR(Audio_Sink, "Failed to open {} stream. Using default channel count 2",
|
||||
direction == oboe::Direction::Output ? "output" : "input");
|
||||
return 2;
|
||||
return temp_stream->getChannelCount() >= 6 ? 6 : 2;
|
||||
}
|
||||
|
||||
protected:
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
#include <atomic>
|
||||
#include <cstddef>
|
||||
#include <cstring>
|
||||
#include <limits>
|
||||
#include <new>
|
||||
#include <span>
|
||||
#include <type_traits>
|
||||
|
||||
@ -140,7 +140,7 @@ struct Values {
|
||||
Category::LibraryApplet};
|
||||
Setting<AppletMode> data_erase_applet_mode{linkage, AppletMode::HLE, "data_erase_applet_mode",
|
||||
Category::LibraryApplet};
|
||||
Setting<AppletMode> error_applet_mode{linkage, AppletMode::LLE, "error_applet_mode",
|
||||
Setting<AppletMode> error_applet_mode{linkage, AppletMode::HLE, "error_applet_mode",
|
||||
Category::LibraryApplet};
|
||||
Setting<AppletMode> net_connect_applet_mode{linkage, AppletMode::HLE, "net_connect_applet_mode",
|
||||
Category::LibraryApplet};
|
||||
|
||||
@ -486,10 +486,8 @@ add_library(core STATIC
|
||||
hle/service/am/service/system_applet_proxy.h
|
||||
hle/service/am/service/window_controller.cpp
|
||||
hle/service/am/service/window_controller.h
|
||||
hle/service/aoc/addon_content_manager.cpp
|
||||
hle/service/aoc/addon_content_manager.h
|
||||
hle/service/aoc/purchase_event_manager.cpp
|
||||
hle/service/aoc/purchase_event_manager.h
|
||||
hle/service/aoc/aoc_u.cpp
|
||||
hle/service/aoc/aoc_u.h
|
||||
hle/service/apm/apm.cpp
|
||||
hle/service/apm/apm.h
|
||||
hle/service/apm/apm_controller.cpp
|
||||
@ -625,8 +623,6 @@ add_library(core STATIC
|
||||
hle/service/filesystem/fsp/fsp_srv.cpp
|
||||
hle/service/filesystem/fsp/fsp_srv.h
|
||||
hle/service/filesystem/fsp/fsp_types.h
|
||||
hle/service/filesystem/fsp/save_data_transfer_prohibiter.cpp
|
||||
hle/service/filesystem/fsp/save_data_transfer_prohibiter.h
|
||||
hle/service/filesystem/romfs_controller.cpp
|
||||
hle/service/filesystem/romfs_controller.h
|
||||
hle/service/filesystem/save_data_controller.cpp
|
||||
@ -1047,12 +1043,9 @@ add_library(core STATIC
|
||||
hle/service/spl/spl_module.h
|
||||
hle/service/spl/spl_results.h
|
||||
hle/service/spl/spl_types.h
|
||||
hle/service/ssl/cert_store.cpp
|
||||
hle/service/ssl/cert_store.h
|
||||
hle/service/ssl/ssl.cpp
|
||||
hle/service/ssl/ssl.h
|
||||
hle/service/ssl/ssl_backend.h
|
||||
hle/service/ssl/ssl_types.h
|
||||
hle/service/usb/usb.cpp
|
||||
hle/service/usb/usb.h
|
||||
hle/service/vi/application_display_service.cpp
|
||||
|
||||
@ -164,19 +164,6 @@ static_assert(sizeof(SaveDataExtraData) == 0x200, "SaveDataExtraData has invalid
|
||||
static_assert(std::is_trivially_copyable_v<SaveDataExtraData>,
|
||||
"Data type must be trivially copyable.");
|
||||
|
||||
struct SaveDataFilter {
|
||||
bool use_program_id;
|
||||
bool use_save_data_type;
|
||||
bool use_user_id;
|
||||
bool use_save_data_id;
|
||||
bool use_index;
|
||||
SaveDataRank rank;
|
||||
SaveDataAttribute attribute;
|
||||
};
|
||||
static_assert(sizeof(SaveDataFilter) == 0x48, "SaveDataFilter has invalid size.");
|
||||
static_assert(std::is_trivially_copyable_v<SaveDataFilter>,
|
||||
"Data type must be trivially copyable.");
|
||||
|
||||
struct HashSalt {
|
||||
static constexpr size_t Size = 32;
|
||||
|
||||
|
||||
@ -25,8 +25,8 @@
|
||||
#include "core/hle/service/acc/async_context.h"
|
||||
#include "core/hle/service/acc/errors.h"
|
||||
#include "core/hle/service/acc/profile_manager.h"
|
||||
#include "core/hle/service/cmif_serialization.h"
|
||||
#include "core/hle/service/glue/glue_manager.h"
|
||||
#include "core/hle/service/ipc_helpers.h"
|
||||
#include "core/hle/service/server_manager.h"
|
||||
#include "core/loader/loader.h"
|
||||
|
||||
@ -74,12 +74,12 @@ static void SanitizeJPEGImageSize(std::vector<u8>& image) {
|
||||
|
||||
class IManagerForSystemService final : public ServiceFramework<IManagerForSystemService> {
|
||||
public:
|
||||
explicit IManagerForSystemService(Core::System& system_, Common::UUID uuid)
|
||||
: ServiceFramework{system_, "IManagerForSystemService"}, account_id{uuid} {
|
||||
explicit IManagerForSystemService(Core::System& system_, Common::UUID)
|
||||
: ServiceFramework{system_, "IManagerForSystemService"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, D<&IManagerForSystemService::CheckAvailability>, "CheckAvailability"},
|
||||
{1, D<&IManagerForSystemService::GetAccountId>, "GetAccountId"},
|
||||
{0, &IManagerForSystemService::CheckAvailability, "CheckAvailability"},
|
||||
{1, nullptr, "GetAccountId"},
|
||||
{2, nullptr, "EnsureIdTokenCacheAsync"},
|
||||
{3, nullptr, "LoadIdTokenCache"},
|
||||
{100, nullptr, "SetSystemProgramIdentification"},
|
||||
@ -109,18 +109,11 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
Result CheckAvailability() {
|
||||
void CheckAvailability(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_ACC, "(STUBBED) called");
|
||||
R_SUCCEED();
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
Result GetAccountId(Out<u64> out_account_id) {
|
||||
LOG_WARNING(Service_ACC, "(STUBBED) called");
|
||||
*out_account_id = account_id.Hash();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Common::UUID account_id;
|
||||
};
|
||||
|
||||
// 3.0.0+
|
||||
|
||||
@ -23,7 +23,7 @@ ACC_U1::ACC_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager>
|
||||
{99, nullptr, "DebugActivateOpenContextRetention"},
|
||||
{100, nullptr, "GetUserRegistrationNotifier"},
|
||||
{101, nullptr, "GetUserStateChangeNotifier"},
|
||||
{102, &ACC_U1::GetBaasAccountManagerForSystemService, "GetBaasAccountManagerForSystemService"},
|
||||
{102, nullptr, "GetBaasAccountManagerForSystemService"},
|
||||
{103, nullptr, "GetBaasUserAvailabilityChangeNotifier"},
|
||||
{104, nullptr, "GetProfileUpdateNotifier"},
|
||||
{105, nullptr, "CheckNetworkServiceAvailabilityAsync"},
|
||||
|
||||
@ -48,6 +48,11 @@ enum class SystemButtonType {
|
||||
CaptureButtonLongPressing,
|
||||
};
|
||||
|
||||
enum class SysPlatformRegion : s32 {
|
||||
Global = 1,
|
||||
Terra = 2,
|
||||
};
|
||||
|
||||
struct AppletProcessLaunchReason {
|
||||
u8 flag;
|
||||
INSERT_PADDING_BYTES(3);
|
||||
|
||||
@ -260,9 +260,9 @@ Result ICommonStateGetter::GetAppletLaunchedHistory(
|
||||
}
|
||||
|
||||
Result ICommonStateGetter::GetSettingsPlatformRegion(
|
||||
Out<Set::PlatformRegion> out_settings_platform_region) {
|
||||
Out<SysPlatformRegion> out_settings_platform_region) {
|
||||
LOG_INFO(Service_AM, "called");
|
||||
*out_settings_platform_region = Set::PlatformRegion::Global;
|
||||
*out_settings_platform_region = SysPlatformRegion::Global;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
|
||||
@ -8,7 +8,6 @@
|
||||
#include "core/hle/service/cmif_types.h"
|
||||
#include "core/hle/service/pm/pm.h"
|
||||
#include "core/hle/service/service.h"
|
||||
#include "core/hle/service/set/settings_types.h"
|
||||
|
||||
namespace Kernel {
|
||||
class KReadableEvent;
|
||||
@ -51,7 +50,7 @@ private:
|
||||
Result GetOperationModeSystemInfo(Out<u32> out_operation_mode_system_info);
|
||||
Result GetAppletLaunchedHistory(Out<s32> out_count,
|
||||
OutArray<AppletId, BufferAttr_HipcMapAlias> out_applet_ids);
|
||||
Result GetSettingsPlatformRegion(Out<Set::PlatformRegion> out_settings_platform_region);
|
||||
Result GetSettingsPlatformRegion(Out<SysPlatformRegion> out_settings_platform_region);
|
||||
Result SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled();
|
||||
|
||||
void SetCpuBoostMode(HLERequestContext& ctx);
|
||||
|
||||
@ -1,223 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include <algorithm>
|
||||
#include <numeric>
|
||||
#include <vector>
|
||||
|
||||
#include "common/logging/log.h"
|
||||
#include "common/settings.h"
|
||||
#include "core/core.h"
|
||||
#include "core/file_sys/common_funcs.h"
|
||||
#include "core/file_sys/content_archive.h"
|
||||
#include "core/file_sys/control_metadata.h"
|
||||
#include "core/file_sys/nca_metadata.h"
|
||||
#include "core/file_sys/patch_manager.h"
|
||||
#include "core/file_sys/registered_cache.h"
|
||||
#include "core/hle/kernel/k_event.h"
|
||||
#include "core/hle/service/aoc/addon_content_manager.h"
|
||||
#include "core/hle/service/aoc/purchase_event_manager.h"
|
||||
#include "core/hle/service/cmif_serialization.h"
|
||||
#include "core/hle/service/ipc_helpers.h"
|
||||
#include "core/hle/service/server_manager.h"
|
||||
#include "core/loader/loader.h"
|
||||
|
||||
namespace Service::AOC {
|
||||
|
||||
static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) {
|
||||
return FileSys::GetBaseTitleID(title_id) == base;
|
||||
}
|
||||
|
||||
static std::vector<u64> AccumulateAOCTitleIDs(Core::System& system) {
|
||||
std::vector<u64> add_on_content;
|
||||
const auto& rcu = system.GetContentProvider();
|
||||
const auto list =
|
||||
rcu.ListEntriesFilter(FileSys::TitleType::AOC, FileSys::ContentRecordType::Data);
|
||||
std::transform(list.begin(), list.end(), std::back_inserter(add_on_content),
|
||||
[](const FileSys::ContentProviderEntry& rce) { return rce.title_id; });
|
||||
add_on_content.erase(
|
||||
std::remove_if(
|
||||
add_on_content.begin(), add_on_content.end(),
|
||||
[&rcu](u64 tid) {
|
||||
return rcu.GetEntry(tid, FileSys::ContentRecordType::Data)->GetStatus() !=
|
||||
Loader::ResultStatus::Success;
|
||||
}),
|
||||
add_on_content.end());
|
||||
return add_on_content;
|
||||
}
|
||||
|
||||
IAddOnContentManager::IAddOnContentManager(Core::System& system_)
|
||||
: ServiceFramework{system_, "aoc:u"}, add_on_content{AccumulateAOCTitleIDs(system)},
|
||||
service_context{system_, "aoc:u"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, nullptr, "CountAddOnContentByApplicationId"},
|
||||
{1, nullptr, "ListAddOnContentByApplicationId"},
|
||||
{2, D<&IAddOnContentManager::CountAddOnContent>, "CountAddOnContent"},
|
||||
{3, D<&IAddOnContentManager::ListAddOnContent>, "ListAddOnContent"},
|
||||
{4, nullptr, "GetAddOnContentBaseIdByApplicationId"},
|
||||
{5, D<&IAddOnContentManager::GetAddOnContentBaseId>, "GetAddOnContentBaseId"},
|
||||
{6, nullptr, "PrepareAddOnContentByApplicationId"},
|
||||
{7, D<&IAddOnContentManager::PrepareAddOnContent>, "PrepareAddOnContent"},
|
||||
{8, D<&IAddOnContentManager::GetAddOnContentListChangedEvent>, "GetAddOnContentListChangedEvent"},
|
||||
{9, nullptr, "GetAddOnContentLostErrorCode"},
|
||||
{10, D<&IAddOnContentManager::GetAddOnContentListChangedEventWithProcessId>, "GetAddOnContentListChangedEventWithProcessId"},
|
||||
{11, D<&IAddOnContentManager::NotifyMountAddOnContent>, "NotifyMountAddOnContent"},
|
||||
{12, D<&IAddOnContentManager::NotifyUnmountAddOnContent>, "NotifyUnmountAddOnContent"},
|
||||
{13, nullptr, "IsAddOnContentMountedForDebug"},
|
||||
{50, D<&IAddOnContentManager::CheckAddOnContentMountStatus>, "CheckAddOnContentMountStatus"},
|
||||
{100, D<&IAddOnContentManager::CreateEcPurchasedEventManager>, "CreateEcPurchasedEventManager"},
|
||||
{101, D<&IAddOnContentManager::CreatePermanentEcPurchasedEventManager>, "CreatePermanentEcPurchasedEventManager"},
|
||||
{110, nullptr, "CreateContentsServiceManager"},
|
||||
{200, nullptr, "SetRequiredAddOnContentsOnContentsAvailabilityTransition"},
|
||||
{300, nullptr, "SetupHostAddOnContent"},
|
||||
{301, nullptr, "GetRegisteredAddOnContentPath"},
|
||||
{302, nullptr, "UpdateCachedList"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
RegisterHandlers(functions);
|
||||
|
||||
aoc_change_event = service_context.CreateEvent("GetAddOnContentListChanged:Event");
|
||||
}
|
||||
|
||||
IAddOnContentManager::~IAddOnContentManager() {
|
||||
service_context.CloseEvent(aoc_change_event);
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::CountAddOnContent(Out<u32> out_count, ClientProcessId process_id) {
|
||||
LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid);
|
||||
|
||||
const auto current = system.GetApplicationProcessProgramID();
|
||||
|
||||
const auto& disabled = Settings::values.disabled_addons[current];
|
||||
if (std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end()) {
|
||||
*out_count = 0;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
*out_count = static_cast<u32>(
|
||||
std::count_if(add_on_content.begin(), add_on_content.end(),
|
||||
[current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); }));
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::ListAddOnContent(Out<u32> out_count,
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_addons,
|
||||
u32 offset, u32 count, ClientProcessId process_id) {
|
||||
LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count,
|
||||
process_id.pid);
|
||||
|
||||
const auto current = FileSys::GetBaseTitleID(system.GetApplicationProcessProgramID());
|
||||
|
||||
std::vector<u32> out;
|
||||
const auto& disabled = Settings::values.disabled_addons[current];
|
||||
if (std::find(disabled.begin(), disabled.end(), "DLC") == disabled.end()) {
|
||||
for (u64 content_id : add_on_content) {
|
||||
if (FileSys::GetBaseTitleID(content_id) != current) {
|
||||
continue;
|
||||
}
|
||||
|
||||
out.push_back(static_cast<u32>(FileSys::GetAOCID(content_id)));
|
||||
}
|
||||
}
|
||||
|
||||
// TODO(DarkLordZach): Find the correct error code.
|
||||
R_UNLESS(out.size() >= offset, ResultUnknown);
|
||||
|
||||
*out_count = static_cast<u32>(std::min<size_t>(out.size() - offset, count));
|
||||
std::rotate(out.begin(), out.begin() + offset, out.end());
|
||||
|
||||
std::memcpy(out_addons.data(), out.data(), *out_count * sizeof(u32));
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::GetAddOnContentBaseId(Out<u64> out_title_id,
|
||||
ClientProcessId process_id) {
|
||||
LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid);
|
||||
|
||||
const auto title_id = system.GetApplicationProcessProgramID();
|
||||
const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
|
||||
system.GetContentProvider()};
|
||||
|
||||
const auto res = pm.GetControlMetadata();
|
||||
if (res.first == nullptr) {
|
||||
*out_title_id = FileSys::GetAOCBaseTitleID(title_id);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
*out_title_id = res.first->GetDLCBaseTitleId();
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::PrepareAddOnContent(s32 addon_index, ClientProcessId process_id) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called with addon_index={}, process_id={}", addon_index,
|
||||
process_id.pid);
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::GetAddOnContentListChangedEvent(
|
||||
OutCopyHandle<Kernel::KReadableEvent> out_event) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
*out_event = &aoc_change_event->GetReadableEvent();
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::GetAddOnContentListChangedEventWithProcessId(
|
||||
OutCopyHandle<Kernel::KReadableEvent> out_event, ClientProcessId process_id) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
*out_event = &aoc_change_event->GetReadableEvent();
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::NotifyMountAddOnContent() {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::NotifyUnmountAddOnContent() {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::CheckAddOnContentMountStatus() {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::CreateEcPurchasedEventManager(
|
||||
OutInterface<IPurchaseEventManager> out_interface) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
*out_interface = std::make_shared<IPurchaseEventManager>(system);
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IAddOnContentManager::CreatePermanentEcPurchasedEventManager(
|
||||
OutInterface<IPurchaseEventManager> out_interface) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
*out_interface = std::make_shared<IPurchaseEventManager>(system);
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
void LoopProcess(Core::System& system) {
|
||||
auto server_manager = std::make_unique<ServerManager>(system);
|
||||
server_manager->RegisterNamedService("aoc:u", std::make_shared<IAddOnContentManager>(system));
|
||||
ServerManager::RunServer(std::move(server_manager));
|
||||
}
|
||||
|
||||
} // namespace Service::AOC
|
||||
@ -1,51 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "core/hle/service/cmif_types.h"
|
||||
#include "core/hle/service/kernel_helpers.h"
|
||||
#include "core/hle/service/service.h"
|
||||
|
||||
namespace Core {
|
||||
class System;
|
||||
}
|
||||
|
||||
namespace Kernel {
|
||||
class KEvent;
|
||||
}
|
||||
|
||||
namespace Service::AOC {
|
||||
|
||||
class IPurchaseEventManager;
|
||||
|
||||
class IAddOnContentManager final : public ServiceFramework<IAddOnContentManager> {
|
||||
public:
|
||||
explicit IAddOnContentManager(Core::System& system);
|
||||
~IAddOnContentManager() override;
|
||||
|
||||
Result CountAddOnContent(Out<u32> out_count, ClientProcessId process_id);
|
||||
Result ListAddOnContent(Out<u32> out_count, OutBuffer<BufferAttr_HipcMapAlias> out_addons,
|
||||
u32 offset, u32 count, ClientProcessId process_id);
|
||||
Result GetAddOnContentBaseId(Out<u64> out_title_id, ClientProcessId process_id);
|
||||
Result PrepareAddOnContent(s32 addon_index, ClientProcessId process_id);
|
||||
Result GetAddOnContentListChangedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
|
||||
Result GetAddOnContentListChangedEventWithProcessId(
|
||||
OutCopyHandle<Kernel::KReadableEvent> out_event, ClientProcessId process_id);
|
||||
Result NotifyMountAddOnContent();
|
||||
Result NotifyUnmountAddOnContent();
|
||||
Result CheckAddOnContentMountStatus();
|
||||
Result CreateEcPurchasedEventManager(OutInterface<IPurchaseEventManager> out_interface);
|
||||
Result CreatePermanentEcPurchasedEventManager(
|
||||
OutInterface<IPurchaseEventManager> out_interface);
|
||||
|
||||
private:
|
||||
std::vector<u64> add_on_content;
|
||||
KernelHelpers::ServiceContext service_context;
|
||||
|
||||
Kernel::KEvent* aoc_change_event;
|
||||
};
|
||||
|
||||
void LoopProcess(Core::System& system);
|
||||
|
||||
} // namespace Service::AOC
|
||||
340
src/core/hle/service/aoc/aoc_u.cpp
Normal file
340
src/core/hle/service/aoc/aoc_u.cpp
Normal file
@ -0,0 +1,340 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include <algorithm>
|
||||
#include <numeric>
|
||||
#include <vector>
|
||||
|
||||
#include "common/logging/log.h"
|
||||
#include "common/settings.h"
|
||||
#include "core/core.h"
|
||||
#include "core/file_sys/common_funcs.h"
|
||||
#include "core/file_sys/content_archive.h"
|
||||
#include "core/file_sys/control_metadata.h"
|
||||
#include "core/file_sys/nca_metadata.h"
|
||||
#include "core/file_sys/patch_manager.h"
|
||||
#include "core/file_sys/registered_cache.h"
|
||||
#include "core/hle/kernel/k_event.h"
|
||||
#include "core/hle/service/aoc/aoc_u.h"
|
||||
#include "core/hle/service/ipc_helpers.h"
|
||||
#include "core/hle/service/server_manager.h"
|
||||
#include "core/loader/loader.h"
|
||||
|
||||
namespace Service::AOC {
|
||||
|
||||
constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400};
|
||||
|
||||
static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) {
|
||||
return FileSys::GetBaseTitleID(title_id) == base;
|
||||
}
|
||||
|
||||
static std::vector<u64> AccumulateAOCTitleIDs(Core::System& system) {
|
||||
std::vector<u64> add_on_content;
|
||||
const auto& rcu = system.GetContentProvider();
|
||||
const auto list =
|
||||
rcu.ListEntriesFilter(FileSys::TitleType::AOC, FileSys::ContentRecordType::Data);
|
||||
std::transform(list.begin(), list.end(), std::back_inserter(add_on_content),
|
||||
[](const FileSys::ContentProviderEntry& rce) { return rce.title_id; });
|
||||
add_on_content.erase(
|
||||
std::remove_if(
|
||||
add_on_content.begin(), add_on_content.end(),
|
||||
[&rcu](u64 tid) {
|
||||
return rcu.GetEntry(tid, FileSys::ContentRecordType::Data)->GetStatus() !=
|
||||
Loader::ResultStatus::Success;
|
||||
}),
|
||||
add_on_content.end());
|
||||
return add_on_content;
|
||||
}
|
||||
|
||||
class IPurchaseEventManager final : public ServiceFramework<IPurchaseEventManager> {
|
||||
public:
|
||||
explicit IPurchaseEventManager(Core::System& system_)
|
||||
: ServiceFramework{system_, "IPurchaseEventManager"}, service_context{
|
||||
system, "IPurchaseEventManager"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, &IPurchaseEventManager::SetDefaultDeliveryTarget, "SetDefaultDeliveryTarget"},
|
||||
{1, &IPurchaseEventManager::SetDeliveryTarget, "SetDeliveryTarget"},
|
||||
{2, &IPurchaseEventManager::GetPurchasedEventReadableHandle, "GetPurchasedEventReadableHandle"},
|
||||
{3, &IPurchaseEventManager::PopPurchasedProductInfo, "PopPurchasedProductInfo"},
|
||||
{4, &IPurchaseEventManager::PopPurchasedProductInfoWithUid, "PopPurchasedProductInfoWithUid"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
RegisterHandlers(functions);
|
||||
|
||||
purchased_event = service_context.CreateEvent("IPurchaseEventManager:PurchasedEvent");
|
||||
}
|
||||
|
||||
~IPurchaseEventManager() override {
|
||||
service_context.CloseEvent(purchased_event);
|
||||
}
|
||||
|
||||
private:
|
||||
void SetDefaultDeliveryTarget(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
|
||||
const auto unknown_1 = rp.Pop<u64>();
|
||||
[[maybe_unused]] const auto unknown_2 = ctx.ReadBuffer();
|
||||
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called, unknown_1={}", unknown_1);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void SetDeliveryTarget(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
|
||||
const auto unknown_1 = rp.Pop<u64>();
|
||||
[[maybe_unused]] const auto unknown_2 = ctx.ReadBuffer();
|
||||
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called, unknown_1={}", unknown_1);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void GetPurchasedEventReadableHandle(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_AOC, "called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.PushCopyObjects(purchased_event->GetReadableEvent());
|
||||
}
|
||||
|
||||
void PopPurchasedProductInfo(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_AOC, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultNoPurchasedProductInfoAvailable);
|
||||
}
|
||||
|
||||
void PopPurchasedProductInfoWithUid(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_AOC, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultNoPurchasedProductInfoAvailable);
|
||||
}
|
||||
|
||||
KernelHelpers::ServiceContext service_context;
|
||||
|
||||
Kernel::KEvent* purchased_event;
|
||||
};
|
||||
|
||||
AOC_U::AOC_U(Core::System& system_)
|
||||
: ServiceFramework{system_, "aoc:u"}, add_on_content{AccumulateAOCTitleIDs(system)},
|
||||
service_context{system_, "aoc:u"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, nullptr, "CountAddOnContentByApplicationId"},
|
||||
{1, nullptr, "ListAddOnContentByApplicationId"},
|
||||
{2, &AOC_U::CountAddOnContent, "CountAddOnContent"},
|
||||
{3, &AOC_U::ListAddOnContent, "ListAddOnContent"},
|
||||
{4, nullptr, "GetAddOnContentBaseIdByApplicationId"},
|
||||
{5, &AOC_U::GetAddOnContentBaseId, "GetAddOnContentBaseId"},
|
||||
{6, nullptr, "PrepareAddOnContentByApplicationId"},
|
||||
{7, &AOC_U::PrepareAddOnContent, "PrepareAddOnContent"},
|
||||
{8, &AOC_U::GetAddOnContentListChangedEvent, "GetAddOnContentListChangedEvent"},
|
||||
{9, nullptr, "GetAddOnContentLostErrorCode"},
|
||||
{10, &AOC_U::GetAddOnContentListChangedEventWithProcessId, "GetAddOnContentListChangedEventWithProcessId"},
|
||||
{11, &AOC_U::NotifyMountAddOnContent, "NotifyMountAddOnContent"},
|
||||
{12, &AOC_U::NotifyUnmountAddOnContent, "NotifyUnmountAddOnContent"},
|
||||
{13, nullptr, "IsAddOnContentMountedForDebug"},
|
||||
{50, &AOC_U::CheckAddOnContentMountStatus, "CheckAddOnContentMountStatus"},
|
||||
{100, &AOC_U::CreateEcPurchasedEventManager, "CreateEcPurchasedEventManager"},
|
||||
{101, &AOC_U::CreatePermanentEcPurchasedEventManager, "CreatePermanentEcPurchasedEventManager"},
|
||||
{110, nullptr, "CreateContentsServiceManager"},
|
||||
{200, nullptr, "SetRequiredAddOnContentsOnContentsAvailabilityTransition"},
|
||||
{300, nullptr, "SetupHostAddOnContent"},
|
||||
{301, nullptr, "GetRegisteredAddOnContentPath"},
|
||||
{302, nullptr, "UpdateCachedList"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
RegisterHandlers(functions);
|
||||
|
||||
aoc_change_event = service_context.CreateEvent("GetAddOnContentListChanged:Event");
|
||||
}
|
||||
|
||||
AOC_U::~AOC_U() {
|
||||
service_context.CloseEvent(aoc_change_event);
|
||||
}
|
||||
|
||||
void AOC_U::CountAddOnContent(HLERequestContext& ctx) {
|
||||
struct Parameters {
|
||||
u64 process_id;
|
||||
};
|
||||
static_assert(sizeof(Parameters) == 8);
|
||||
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto params = rp.PopRaw<Parameters>();
|
||||
|
||||
LOG_DEBUG(Service_AOC, "called. process_id={}", params.process_id);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
|
||||
const auto current = system.GetApplicationProcessProgramID();
|
||||
|
||||
const auto& disabled = Settings::values.disabled_addons[current];
|
||||
if (std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end()) {
|
||||
rb.Push<u32>(0);
|
||||
return;
|
||||
}
|
||||
|
||||
rb.Push<u32>(static_cast<u32>(
|
||||
std::count_if(add_on_content.begin(), add_on_content.end(),
|
||||
[current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); })));
|
||||
}
|
||||
|
||||
void AOC_U::ListAddOnContent(HLERequestContext& ctx) {
|
||||
struct Parameters {
|
||||
u32 offset;
|
||||
u32 count;
|
||||
u64 process_id;
|
||||
};
|
||||
static_assert(sizeof(Parameters) == 16);
|
||||
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto [offset, count, process_id] = rp.PopRaw<Parameters>();
|
||||
|
||||
LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count,
|
||||
process_id);
|
||||
|
||||
const auto current = FileSys::GetBaseTitleID(system.GetApplicationProcessProgramID());
|
||||
|
||||
std::vector<u32> out;
|
||||
const auto& disabled = Settings::values.disabled_addons[current];
|
||||
if (std::find(disabled.begin(), disabled.end(), "DLC") == disabled.end()) {
|
||||
for (u64 content_id : add_on_content) {
|
||||
if (FileSys::GetBaseTitleID(content_id) != current) {
|
||||
continue;
|
||||
}
|
||||
|
||||
out.push_back(static_cast<u32>(FileSys::GetAOCID(content_id)));
|
||||
}
|
||||
}
|
||||
|
||||
if (out.size() < offset) {
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
// TODO(DarkLordZach): Find the correct error code.
|
||||
rb.Push(ResultUnknown);
|
||||
return;
|
||||
}
|
||||
|
||||
const auto out_count = static_cast<u32>(std::min<size_t>(out.size() - offset, count));
|
||||
std::rotate(out.begin(), out.begin() + offset, out.end());
|
||||
out.resize(out_count);
|
||||
|
||||
ctx.WriteBuffer(out);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(out_count);
|
||||
}
|
||||
|
||||
void AOC_U::GetAddOnContentBaseId(HLERequestContext& ctx) {
|
||||
struct Parameters {
|
||||
u64 process_id;
|
||||
};
|
||||
static_assert(sizeof(Parameters) == 8);
|
||||
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto params = rp.PopRaw<Parameters>();
|
||||
|
||||
LOG_DEBUG(Service_AOC, "called. process_id={}", params.process_id);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 4};
|
||||
rb.Push(ResultSuccess);
|
||||
|
||||
const auto title_id = system.GetApplicationProcessProgramID();
|
||||
const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
|
||||
system.GetContentProvider()};
|
||||
|
||||
const auto res = pm.GetControlMetadata();
|
||||
if (res.first == nullptr) {
|
||||
rb.Push(FileSys::GetAOCBaseTitleID(title_id));
|
||||
return;
|
||||
}
|
||||
|
||||
rb.Push(res.first->GetDLCBaseTitleId());
|
||||
}
|
||||
|
||||
void AOC_U::PrepareAddOnContent(HLERequestContext& ctx) {
|
||||
struct Parameters {
|
||||
s32 addon_index;
|
||||
u64 process_id;
|
||||
};
|
||||
static_assert(sizeof(Parameters) == 16);
|
||||
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto [addon_index, process_id] = rp.PopRaw<Parameters>();
|
||||
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called with addon_index={}, process_id={}", addon_index,
|
||||
process_id);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void AOC_U::GetAddOnContentListChangedEvent(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.PushCopyObjects(aoc_change_event->GetReadableEvent());
|
||||
}
|
||||
|
||||
void AOC_U::GetAddOnContentListChangedEventWithProcessId(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.PushCopyObjects(aoc_change_event->GetReadableEvent());
|
||||
}
|
||||
|
||||
void AOC_U::NotifyMountAddOnContent(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void AOC_U::NotifyUnmountAddOnContent(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void AOC_U::CheckAddOnContentMountStatus(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void AOC_U::CreateEcPurchasedEventManager(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.PushIpcInterface<IPurchaseEventManager>(system);
|
||||
}
|
||||
|
||||
void AOC_U::CreatePermanentEcPurchasedEventManager(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.PushIpcInterface<IPurchaseEventManager>(system);
|
||||
}
|
||||
|
||||
void LoopProcess(Core::System& system) {
|
||||
auto server_manager = std::make_unique<ServerManager>(system);
|
||||
server_manager->RegisterNamedService("aoc:u", std::make_shared<AOC_U>(system));
|
||||
ServerManager::RunServer(std::move(server_manager));
|
||||
}
|
||||
|
||||
} // namespace Service::AOC
|
||||
45
src/core/hle/service/aoc/aoc_u.h
Normal file
45
src/core/hle/service/aoc/aoc_u.h
Normal file
@ -0,0 +1,45 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "core/hle/service/kernel_helpers.h"
|
||||
#include "core/hle/service/service.h"
|
||||
|
||||
namespace Core {
|
||||
class System;
|
||||
}
|
||||
|
||||
namespace Kernel {
|
||||
class KEvent;
|
||||
}
|
||||
|
||||
namespace Service::AOC {
|
||||
|
||||
class AOC_U final : public ServiceFramework<AOC_U> {
|
||||
public:
|
||||
explicit AOC_U(Core::System& system);
|
||||
~AOC_U() override;
|
||||
|
||||
private:
|
||||
void CountAddOnContent(HLERequestContext& ctx);
|
||||
void ListAddOnContent(HLERequestContext& ctx);
|
||||
void GetAddOnContentBaseId(HLERequestContext& ctx);
|
||||
void PrepareAddOnContent(HLERequestContext& ctx);
|
||||
void GetAddOnContentListChangedEvent(HLERequestContext& ctx);
|
||||
void GetAddOnContentListChangedEventWithProcessId(HLERequestContext& ctx);
|
||||
void NotifyMountAddOnContent(HLERequestContext& ctx);
|
||||
void NotifyUnmountAddOnContent(HLERequestContext& ctx);
|
||||
void CheckAddOnContentMountStatus(HLERequestContext& ctx);
|
||||
void CreateEcPurchasedEventManager(HLERequestContext& ctx);
|
||||
void CreatePermanentEcPurchasedEventManager(HLERequestContext& ctx);
|
||||
|
||||
std::vector<u64> add_on_content;
|
||||
KernelHelpers::ServiceContext service_context;
|
||||
|
||||
Kernel::KEvent* aoc_change_event;
|
||||
};
|
||||
|
||||
void LoopProcess(Core::System& system);
|
||||
|
||||
} // namespace Service::AOC
|
||||
@ -1,67 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "core/hle/service/aoc/purchase_event_manager.h"
|
||||
#include "core/hle/service/cmif_serialization.h"
|
||||
|
||||
namespace Service::AOC {
|
||||
|
||||
constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400};
|
||||
|
||||
IPurchaseEventManager::IPurchaseEventManager(Core::System& system_)
|
||||
: ServiceFramework{system_, "IPurchaseEventManager"}, service_context{system,
|
||||
"IPurchaseEventManager"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, D<&IPurchaseEventManager::SetDefaultDeliveryTarget>, "SetDefaultDeliveryTarget"},
|
||||
{1, D<&IPurchaseEventManager::SetDeliveryTarget>, "SetDeliveryTarget"},
|
||||
{2, D<&IPurchaseEventManager::GetPurchasedEvent>, "GetPurchasedEvent"},
|
||||
{3, D<&IPurchaseEventManager::PopPurchasedProductInfo>, "PopPurchasedProductInfo"},
|
||||
{4, D<&IPurchaseEventManager::PopPurchasedProductInfoWithUid>, "PopPurchasedProductInfoWithUid"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
RegisterHandlers(functions);
|
||||
|
||||
purchased_event = service_context.CreateEvent("IPurchaseEventManager:PurchasedEvent");
|
||||
}
|
||||
|
||||
IPurchaseEventManager::~IPurchaseEventManager() {
|
||||
service_context.CloseEvent(purchased_event);
|
||||
}
|
||||
|
||||
Result IPurchaseEventManager::SetDefaultDeliveryTarget(
|
||||
ClientProcessId process_id, InBuffer<BufferAttr_HipcMapAlias> in_buffer) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called, process_id={}", process_id.pid);
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IPurchaseEventManager::SetDeliveryTarget(u64 unknown,
|
||||
InBuffer<BufferAttr_HipcMapAlias> in_buffer) {
|
||||
LOG_WARNING(Service_AOC, "(STUBBED) called, unknown={}", unknown);
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IPurchaseEventManager::GetPurchasedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event) {
|
||||
LOG_WARNING(Service_AOC, "called");
|
||||
|
||||
*out_event = &purchased_event->GetReadableEvent();
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IPurchaseEventManager::PopPurchasedProductInfo() {
|
||||
LOG_DEBUG(Service_AOC, "(STUBBED) called");
|
||||
|
||||
R_RETURN(ResultNoPurchasedProductInfoAvailable);
|
||||
}
|
||||
|
||||
Result IPurchaseEventManager::PopPurchasedProductInfoWithUid() {
|
||||
LOG_DEBUG(Service_AOC, "(STUBBED) called");
|
||||
|
||||
R_RETURN(ResultNoPurchasedProductInfoAvailable);
|
||||
}
|
||||
|
||||
} // namespace Service::AOC
|
||||
@ -1,30 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "core/hle/service/cmif_types.h"
|
||||
#include "core/hle/service/kernel_helpers.h"
|
||||
#include "core/hle/service/os/event.h"
|
||||
#include "core/hle/service/service.h"
|
||||
|
||||
namespace Service::AOC {
|
||||
|
||||
class IPurchaseEventManager final : public ServiceFramework<IPurchaseEventManager> {
|
||||
public:
|
||||
explicit IPurchaseEventManager(Core::System& system_);
|
||||
~IPurchaseEventManager() override;
|
||||
|
||||
Result SetDefaultDeliveryTarget(ClientProcessId process_id,
|
||||
InBuffer<BufferAttr_HipcMapAlias> in_buffer);
|
||||
Result SetDeliveryTarget(u64 unknown, InBuffer<BufferAttr_HipcMapAlias> in_buffer);
|
||||
Result GetPurchasedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
|
||||
Result PopPurchasedProductInfo();
|
||||
Result PopPurchasedProductInfoWithUid();
|
||||
|
||||
private:
|
||||
KernelHelpers::ServiceContext service_context;
|
||||
Kernel::KEvent* purchased_event;
|
||||
};
|
||||
|
||||
} // namespace Service::AOC
|
||||
@ -138,7 +138,7 @@ Result IAudioController::SetOutputModeSetting(Set::AudioOutputModeTarget target,
|
||||
}
|
||||
|
||||
Result IAudioController::SetHeadphoneOutputLevelMode(HeadphoneOutputLevelMode output_level_mode) {
|
||||
LOG_WARNING(Audio, "(STUBBED) called, output_level_mode={}", output_level_mode);
|
||||
LOG_WARNING(Audio, "(STUBBED) called");
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
#include "core/core.h"
|
||||
#include "core/hle/kernel/k_event.h"
|
||||
#include "core/hle/service/btdrv/btdrv.h"
|
||||
#include "core/hle/service/cmif_serialization.h"
|
||||
#include "core/hle/service/ipc_helpers.h"
|
||||
#include "core/hle/service/kernel_helpers.h"
|
||||
#include "core/hle/service/server_manager.h"
|
||||
@ -14,9 +13,9 @@
|
||||
|
||||
namespace Service::BtDrv {
|
||||
|
||||
class IBluetoothUser final : public ServiceFramework<IBluetoothUser> {
|
||||
class Bt final : public ServiceFramework<Bt> {
|
||||
public:
|
||||
explicit IBluetoothUser(Core::System& system_)
|
||||
explicit Bt(Core::System& system_)
|
||||
: ServiceFramework{system_, "bt"}, service_context{system_, "bt"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
@ -29,7 +28,7 @@ public:
|
||||
{6, nullptr, "SetLeResponse"},
|
||||
{7, nullptr, "LeSendIndication"},
|
||||
{8, nullptr, "GetLeEventInfo"},
|
||||
{9, C<&IBluetoothUser::RegisterBleEvent>, "RegisterBleEvent"},
|
||||
{9, &Bt::RegisterBleEvent, "RegisterBleEvent"},
|
||||
};
|
||||
// clang-format on
|
||||
RegisterHandlers(functions);
|
||||
@ -37,16 +36,17 @@ public:
|
||||
register_event = service_context.CreateEvent("BT:RegisterEvent");
|
||||
}
|
||||
|
||||
~IBluetoothUser() override {
|
||||
~Bt() override {
|
||||
service_context.CloseEvent(register_event);
|
||||
}
|
||||
|
||||
private:
|
||||
Result RegisterBleEvent(OutCopyHandle<Kernel::KReadableEvent> out_event) {
|
||||
void RegisterBleEvent(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_BTM, "(STUBBED) called");
|
||||
|
||||
*out_event = ®ister_event->GetReadableEvent();
|
||||
R_SUCCEED();
|
||||
IPC::ResponseBuilder rb{ctx, 2, 1};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.PushCopyObjects(register_event->GetReadableEvent());
|
||||
}
|
||||
|
||||
KernelHelpers::ServiceContext service_context;
|
||||
@ -54,9 +54,9 @@ private:
|
||||
Kernel::KEvent* register_event;
|
||||
};
|
||||
|
||||
class IBluetoothDriver final : public ServiceFramework<IBluetoothDriver> {
|
||||
class BtDrv final : public ServiceFramework<BtDrv> {
|
||||
public:
|
||||
explicit IBluetoothDriver(Core::System& system_) : ServiceFramework{system_, "btdrv"} {
|
||||
explicit BtDrv(Core::System& system_) : ServiceFramework{system_, "btdrv"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, nullptr, "InitializeBluetoothDriver"},
|
||||
@ -93,7 +93,7 @@ public:
|
||||
{31, nullptr, "EnableMcMode"},
|
||||
{32, nullptr, "EnableLlrScan"},
|
||||
{33, nullptr, "DisableLlrScan"},
|
||||
{34, C<&IBluetoothDriver::EnableRadio>, "EnableRadio"},
|
||||
{34, nullptr, "EnableRadio"},
|
||||
{35, nullptr, "SetVisibility"},
|
||||
{36, nullptr, "EnableTbfcScan"},
|
||||
{37, nullptr, "RegisterHidReportEvent"},
|
||||
@ -195,19 +195,13 @@ public:
|
||||
|
||||
RegisterHandlers(functions);
|
||||
}
|
||||
|
||||
private:
|
||||
Result EnableRadio() {
|
||||
LOG_WARNING(Service_BTDRV, "(STUBBED) called");
|
||||
R_SUCCEED();
|
||||
}
|
||||
};
|
||||
|
||||
void LoopProcess(Core::System& system) {
|
||||
auto server_manager = std::make_unique<ServerManager>(system);
|
||||
|
||||
server_manager->RegisterNamedService("btdrv", std::make_shared<IBluetoothDriver>(system));
|
||||
server_manager->RegisterNamedService("bt", std::make_shared<IBluetoothUser>(system));
|
||||
server_manager->RegisterNamedService("btdrv", std::make_shared<BtDrv>(system));
|
||||
server_manager->RegisterNamedService("bt", std::make_shared<Bt>(system));
|
||||
ServerManager::RunServer(std::move(server_manager));
|
||||
}
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ public:
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, C<&ErrorReportContext::SubmitContext>, "SubmitContext"},
|
||||
{1, C<&ErrorReportContext::CreateReportV0>, "CreateReportV0"},
|
||||
{1, nullptr, "CreateReportV0"},
|
||||
{2, nullptr, "SetInitialLaunchSettingsCompletionTime"},
|
||||
{3, nullptr, "ClearInitialLaunchSettingsCompletionTime"},
|
||||
{4, nullptr, "UpdatePowerOnTime"},
|
||||
@ -28,8 +28,7 @@ public:
|
||||
{8, nullptr, "ClearApplicationLaunchTime"},
|
||||
{9, nullptr, "SubmitAttachment"},
|
||||
{10, nullptr, "CreateReportWithAttachments"},
|
||||
{11, C<&ErrorReportContext::CreateReportV1>, "CreateReportV1"},
|
||||
{12, C<&ErrorReportContext::CreateReport>, "CreateReport"},
|
||||
{11, nullptr, "CreateReport"},
|
||||
{20, nullptr, "RegisterRunningApplet"},
|
||||
{21, nullptr, "UnregisterRunningApplet"},
|
||||
{22, nullptr, "UpdateAppletSuspendedDuration"},
|
||||
@ -41,37 +40,10 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
Result SubmitContext(InBuffer<BufferAttr_HipcMapAlias> context_entry,
|
||||
InBuffer<BufferAttr_HipcMapAlias> field_list) {
|
||||
LOG_WARNING(Service_SET, "(STUBBED) called, context_entry_size={}, field_list_size={}",
|
||||
context_entry.size(), field_list.size());
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result CreateReportV0(u32 report_type, InBuffer<BufferAttr_HipcMapAlias> context_entry,
|
||||
InBuffer<BufferAttr_HipcMapAlias> report_list,
|
||||
InBuffer<BufferAttr_HipcMapAlias> report_meta_data) {
|
||||
LOG_WARNING(Service_SET, "(STUBBED) called, report_type={:#x}", report_type);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result CreateReportV1(u32 report_type, u32 unknown,
|
||||
InBuffer<BufferAttr_HipcMapAlias> context_entry,
|
||||
InBuffer<BufferAttr_HipcMapAlias> report_list,
|
||||
InBuffer<BufferAttr_HipcMapAlias> report_meta_data) {
|
||||
LOG_WARNING(Service_SET, "(STUBBED) called, report_type={:#x}, unknown={:#x}", report_type,
|
||||
unknown);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result CreateReport(u32 report_type, u32 unknown, u32 create_report_option_flag,
|
||||
InBuffer<BufferAttr_HipcMapAlias> context_entry,
|
||||
InBuffer<BufferAttr_HipcMapAlias> report_list,
|
||||
InBuffer<BufferAttr_HipcMapAlias> report_meta_data) {
|
||||
LOG_WARNING(
|
||||
Service_SET,
|
||||
"(STUBBED) called, report_type={:#x}, unknown={:#x}, create_report_option_flag={:#x}",
|
||||
report_type, unknown, create_report_option_flag);
|
||||
Result SubmitContext(InBuffer<BufferAttr_HipcMapAlias> buffer_a,
|
||||
InBuffer<BufferAttr_HipcMapAlias> buffer_b) {
|
||||
LOG_WARNING(Service_SET, "(STUBBED) called, buffer_a_size={}, buffer_b_size={}",
|
||||
buffer_a.size(), buffer_b.size());
|
||||
R_SUCCEED();
|
||||
}
|
||||
};
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
#include "core/hle/service/filesystem/fsp/fs_i_save_data_info_reader.h"
|
||||
#include "core/hle/service/filesystem/fsp/fs_i_storage.h"
|
||||
#include "core/hle/service/filesystem/fsp/fsp_srv.h"
|
||||
#include "core/hle/service/filesystem/fsp/save_data_transfer_prohibiter.h"
|
||||
#include "core/hle/service/filesystem/romfs_controller.h"
|
||||
#include "core/hle/service/filesystem/save_data_controller.h"
|
||||
#include "core/hle/service/hle_ipc.h"
|
||||
@ -71,7 +70,7 @@ FSP_SRV::FSP_SRV(Core::System& system_)
|
||||
{28, nullptr, "DeleteSaveDataFileSystemBySaveDataAttribute"},
|
||||
{30, nullptr, "OpenGameCardStorage"},
|
||||
{31, nullptr, "OpenGameCardFileSystem"},
|
||||
{32, D<&FSP_SRV::ExtendSaveDataFileSystem>, "ExtendSaveDataFileSystem"},
|
||||
{32, nullptr, "ExtendSaveDataFileSystem"},
|
||||
{33, nullptr, "DeleteCacheStorage"},
|
||||
{34, D<&FSP_SRV::GetCacheStorageSize>, "GetCacheStorageSize"},
|
||||
{35, nullptr, "CreateSaveDataFileSystemByHashSalt"},
|
||||
@ -79,24 +78,24 @@ FSP_SRV::FSP_SRV(Core::System& system_)
|
||||
{51, D<&FSP_SRV::OpenSaveDataFileSystem>, "OpenSaveDataFileSystem"},
|
||||
{52, D<&FSP_SRV::OpenSaveDataFileSystemBySystemSaveDataId>, "OpenSaveDataFileSystemBySystemSaveDataId"},
|
||||
{53, D<&FSP_SRV::OpenReadOnlySaveDataFileSystem>, "OpenReadOnlySaveDataFileSystem"},
|
||||
{57, D<&FSP_SRV::ReadSaveDataFileSystemExtraDataBySaveDataSpaceId>, "ReadSaveDataFileSystemExtraDataBySaveDataSpaceId"},
|
||||
{58, D<&FSP_SRV::ReadSaveDataFileSystemExtraData>, "ReadSaveDataFileSystemExtraData"},
|
||||
{59, D<&FSP_SRV::WriteSaveDataFileSystemExtraData>, "WriteSaveDataFileSystemExtraData"},
|
||||
{57, nullptr, "ReadSaveDataFileSystemExtraDataBySaveDataSpaceId"},
|
||||
{58, nullptr, "ReadSaveDataFileSystemExtraData"},
|
||||
{59, nullptr, "WriteSaveDataFileSystemExtraData"},
|
||||
{60, nullptr, "OpenSaveDataInfoReader"},
|
||||
{61, D<&FSP_SRV::OpenSaveDataInfoReaderBySaveDataSpaceId>, "OpenSaveDataInfoReaderBySaveDataSpaceId"},
|
||||
{62, D<&FSP_SRV::OpenSaveDataInfoReaderOnlyCacheStorage>, "OpenSaveDataInfoReaderOnlyCacheStorage"},
|
||||
{64, nullptr, "OpenSaveDataInternalStorageFileSystem"},
|
||||
{65, nullptr, "UpdateSaveDataMacForDebug"},
|
||||
{66, nullptr, "WriteSaveDataFileSystemExtraData2"},
|
||||
{67, D<&FSP_SRV::FindSaveDataWithFilter>, "FindSaveDataWithFilter"},
|
||||
{67, nullptr, "FindSaveDataWithFilter"},
|
||||
{68, nullptr, "OpenSaveDataInfoReaderBySaveDataFilter"},
|
||||
{69, D<&FSP_SRV::ReadSaveDataFileSystemExtraDataBySaveDataAttribute>, "ReadSaveDataFileSystemExtraDataBySaveDataAttribute"},
|
||||
{70, D<&FSP_SRV::WriteSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute>, "WriteSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute"},
|
||||
{69, nullptr, "ReadSaveDataFileSystemExtraDataBySaveDataAttribute"},
|
||||
{70, D<&FSP_SRV::WriteSaveDataFileSystemExtraDataBySaveDataAttribute>, "WriteSaveDataFileSystemExtraDataBySaveDataAttribute"},
|
||||
{71, D<&FSP_SRV::ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute>, "ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute"},
|
||||
{80, nullptr, "OpenSaveDataMetaFile"},
|
||||
{81, nullptr, "OpenSaveDataTransferManager"},
|
||||
{82, nullptr, "OpenSaveDataTransferManagerVersion2"},
|
||||
{83, D<&FSP_SRV::OpenSaveDataTransferProhibiter>, "OpenSaveDataTransferProhibiter"},
|
||||
{83, nullptr, "OpenSaveDataTransferProhibiterForCloudBackUp"},
|
||||
{84, nullptr, "ListApplicationAccessibleSaveDataOwnerId"},
|
||||
{85, nullptr, "OpenSaveDataTransferManagerForSaveDataRepair"},
|
||||
{86, nullptr, "OpenSaveDataMover"},
|
||||
@ -236,7 +235,7 @@ Result FSP_SRV::CreateSaveDataFileSystem(FileSys::SaveDataCreationInfo save_crea
|
||||
}
|
||||
|
||||
Result FSP_SRV::CreateSaveDataFileSystemBySystemSaveDataId(
|
||||
FileSys::SaveDataAttribute save_struct, FileSys::SaveDataCreationInfo save_create_struct) {
|
||||
FileSys::SaveDataCreationInfo save_create_struct, FileSys::SaveDataAttribute save_struct) {
|
||||
LOG_DEBUG(Service_FS, "called save_struct = {}", save_struct.DebugInfo());
|
||||
|
||||
FileSys::VirtualDir save_data_dir{};
|
||||
@ -309,31 +308,9 @@ Result FSP_SRV::OpenSaveDataInfoReaderOnlyCacheStorage(
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FSP_SRV::FindSaveDataWithFilter(Out<s64> out_count,
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_buffer,
|
||||
FileSys::SaveDataSpaceId space_id,
|
||||
FileSys::SaveDataFilter filter) {
|
||||
LOG_WARNING(Service_FS, "(STUBBED) called");
|
||||
R_THROW(FileSys::ResultTargetNotFound);
|
||||
}
|
||||
Result FSP_SRV::WriteSaveDataFileSystemExtraDataBySaveDataAttribute() {
|
||||
LOG_WARNING(Service_FS, "(STUBBED) called.");
|
||||
|
||||
Result FSP_SRV::WriteSaveDataFileSystemExtraData(InBuffer<BufferAttr_HipcMapAlias> buffer,
|
||||
FileSys::SaveDataSpaceId space_id,
|
||||
u64 save_data_id) {
|
||||
LOG_WARNING(Service_FS, "(STUBBED) called, space_id={}, save_data_id={:016X}", space_id,
|
||||
save_data_id);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FSP_SRV::WriteSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(
|
||||
InBuffer<BufferAttr_HipcMapAlias> buffer, InBuffer<BufferAttr_HipcMapAlias> mask_buffer,
|
||||
FileSys::SaveDataSpaceId space_id, FileSys::SaveDataAttribute attribute) {
|
||||
LOG_WARNING(Service_FS,
|
||||
"(STUBBED) called, space_id={}, attribute.program_id={:016X}\n"
|
||||
"attribute.user_id={:016X}{:016X}, attribute.save_id={:016X}\n"
|
||||
"attribute.type={}, attribute.rank={}, attribute.index={}",
|
||||
space_id, attribute.program_id, attribute.user_id[1], attribute.user_id[0],
|
||||
attribute.system_save_data_id, attribute.type, attribute.rank, attribute.index);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
@ -355,45 +332,6 @@ Result FSP_SRV::ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FSP_SRV::ReadSaveDataFileSystemExtraData(OutBuffer<BufferAttr_HipcMapAlias> out_buffer,
|
||||
u64 save_data_id) {
|
||||
// Stub, backend needs an impl to read/write the SaveDataExtraData
|
||||
LOG_WARNING(Service_FS, "(STUBBED) called, save_data_id={:016X}", save_data_id);
|
||||
std::memset(out_buffer.data(), 0, out_buffer.size());
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FSP_SRV::ReadSaveDataFileSystemExtraDataBySaveDataAttribute(
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_buffer, FileSys::SaveDataSpaceId space_id,
|
||||
FileSys::SaveDataAttribute attribute) {
|
||||
// Stub, backend needs an impl to read/write the SaveDataExtraData
|
||||
LOG_WARNING(Service_FS,
|
||||
"(STUBBED) called, space_id={}, attribute.program_id={:016X}\n"
|
||||
"attribute.user_id={:016X}{:016X}, attribute.save_id={:016X}\n"
|
||||
"attribute.type={}, attribute.rank={}, attribute.index={}",
|
||||
space_id, attribute.program_id, attribute.user_id[1], attribute.user_id[0],
|
||||
attribute.system_save_data_id, attribute.type, attribute.rank, attribute.index);
|
||||
std::memset(out_buffer.data(), 0, out_buffer.size());
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FSP_SRV::ReadSaveDataFileSystemExtraDataBySaveDataSpaceId(
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_buffer, FileSys::SaveDataSpaceId space_id,
|
||||
u64 save_data_id) {
|
||||
// Stub, backend needs an impl to read/write the SaveDataExtraData
|
||||
LOG_WARNING(Service_FS, "(STUBBED) called, space_id={}, save_data_id={:016X}", space_id,
|
||||
save_data_id);
|
||||
std::memset(out_buffer.data(), 0, out_buffer.size());
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FSP_SRV::OpenSaveDataTransferProhibiter(
|
||||
OutInterface<ISaveDataTransferProhibiter> out_prohibiter, u64 id) {
|
||||
LOG_WARNING(Service_FS, "(STUBBED) called, id={:016X}", id);
|
||||
*out_prohibiter = std::make_shared<ISaveDataTransferProhibiter>(system);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FSP_SRV::OpenDataStorageByCurrentProcess(OutInterface<IStorage> out_interface) {
|
||||
LOG_DEBUG(Service_FS, "called");
|
||||
|
||||
@ -522,16 +460,6 @@ Result FSP_SRV::FlushAccessLogOnSdCard() {
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FSP_SRV::ExtendSaveDataFileSystem(FileSys::SaveDataSpaceId space_id, u64 save_data_id,
|
||||
s64 available_size, s64 journal_size) {
|
||||
// We don't have an index of save data ids, so we can't implement this.
|
||||
LOG_WARNING(Service_FS,
|
||||
"(STUBBED) called, space_id={}, save_data_id={:016X}, available_size={:#x}, "
|
||||
"journal_size={:#x}",
|
||||
space_id, save_data_id, available_size, journal_size);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result FSP_SRV::GetCacheStorageSize(s32 index, Out<s64> out_data_size, Out<s64> out_journal_size) {
|
||||
LOG_WARNING(Service_FS, "(STUBBED) called with index={}", index);
|
||||
|
||||
|
||||
@ -25,7 +25,6 @@ class SaveDataController;
|
||||
|
||||
class IFileSystem;
|
||||
class ISaveDataInfoReader;
|
||||
class ISaveDataTransferProhibiter;
|
||||
class IStorage;
|
||||
class IMultiCommitManager;
|
||||
|
||||
@ -54,7 +53,7 @@ private:
|
||||
Result CreateSaveDataFileSystem(FileSys::SaveDataCreationInfo save_create_struct,
|
||||
FileSys::SaveDataAttribute save_struct, u128 uid);
|
||||
Result CreateSaveDataFileSystemBySystemSaveDataId(
|
||||
FileSys::SaveDataAttribute save_struct, FileSys::SaveDataCreationInfo save_create_struct);
|
||||
FileSys::SaveDataCreationInfo save_create_struct, FileSys::SaveDataAttribute save_struct);
|
||||
Result OpenSaveDataFileSystem(OutInterface<IFileSystem> out_interface,
|
||||
FileSys::SaveDataSpaceId space_id,
|
||||
FileSys::SaveDataAttribute attribute);
|
||||
@ -67,28 +66,11 @@ private:
|
||||
Result OpenSaveDataInfoReaderBySaveDataSpaceId(OutInterface<ISaveDataInfoReader> out_interface,
|
||||
FileSys::SaveDataSpaceId space);
|
||||
Result OpenSaveDataInfoReaderOnlyCacheStorage(OutInterface<ISaveDataInfoReader> out_interface);
|
||||
Result FindSaveDataWithFilter(Out<s64> out_count, OutBuffer<BufferAttr_HipcMapAlias> out_buffer,
|
||||
FileSys::SaveDataSpaceId space_id,
|
||||
FileSys::SaveDataFilter filter);
|
||||
Result WriteSaveDataFileSystemExtraData(InBuffer<BufferAttr_HipcMapAlias> buffer,
|
||||
FileSys::SaveDataSpaceId space_id, u64 save_data_id);
|
||||
Result WriteSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(
|
||||
InBuffer<BufferAttr_HipcMapAlias> buffer, InBuffer<BufferAttr_HipcMapAlias> mask_buffer,
|
||||
FileSys::SaveDataSpaceId space_id, FileSys::SaveDataAttribute attribute);
|
||||
Result ReadSaveDataFileSystemExtraData(OutBuffer<BufferAttr_HipcMapAlias> out_buffer,
|
||||
u64 save_data_id);
|
||||
Result ReadSaveDataFileSystemExtraDataBySaveDataAttribute(
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_buffer, FileSys::SaveDataSpaceId space_id,
|
||||
FileSys::SaveDataAttribute attribute);
|
||||
Result ReadSaveDataFileSystemExtraDataBySaveDataSpaceId(
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_buffer, FileSys::SaveDataSpaceId space_id,
|
||||
u64 save_data_id);
|
||||
Result WriteSaveDataFileSystemExtraDataBySaveDataAttribute();
|
||||
Result ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(
|
||||
FileSys::SaveDataSpaceId space_id, FileSys::SaveDataAttribute attribute,
|
||||
InBuffer<BufferAttr_HipcMapAlias> mask_buffer,
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_buffer);
|
||||
Result OpenSaveDataTransferProhibiter(OutInterface<ISaveDataTransferProhibiter> out_prohibiter,
|
||||
u64 id);
|
||||
Result OpenDataStorageByCurrentProcess(OutInterface<IStorage> out_interface);
|
||||
Result OpenDataStorageByDataId(OutInterface<IStorage> out_interface,
|
||||
FileSys::StorageId storage_id, u32 unknown, u64 title_id);
|
||||
@ -103,8 +85,6 @@ private:
|
||||
Result GetProgramIndexForAccessLog(Out<AccessLogVersion> out_access_log_version,
|
||||
Out<u32> out_access_log_program_index);
|
||||
Result OpenMultiCommitManager(OutInterface<IMultiCommitManager> out_interface);
|
||||
Result ExtendSaveDataFileSystem(FileSys::SaveDataSpaceId space_id, u64 save_data_id,
|
||||
s64 available_size, s64 journal_size);
|
||||
Result GetCacheStorageSize(s32 index, Out<s64> out_data_size, Out<s64> out_journal_size);
|
||||
|
||||
FileSystemController& fsc;
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "core/hle/service/filesystem/fsp/save_data_transfer_prohibiter.h"
|
||||
|
||||
namespace Service::FileSystem {
|
||||
|
||||
ISaveDataTransferProhibiter::ISaveDataTransferProhibiter(Core::System& system_)
|
||||
: ServiceFramework{system_, "ISaveDataTransferProhibiter"} {}
|
||||
|
||||
ISaveDataTransferProhibiter::~ISaveDataTransferProhibiter() = default;
|
||||
|
||||
} // namespace Service::FileSystem
|
||||
@ -1,16 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "core/hle/service/service.h"
|
||||
|
||||
namespace Service::FileSystem {
|
||||
|
||||
class ISaveDataTransferProhibiter : public ServiceFramework<ISaveDataTransferProhibiter> {
|
||||
public:
|
||||
explicit ISaveDataTransferProhibiter(Core::System& system_);
|
||||
~ISaveDataTransferProhibiter() override;
|
||||
};
|
||||
|
||||
} // namespace Service::FileSystem
|
||||
@ -42,13 +42,13 @@ public:
|
||||
{10701, nullptr, "GetPlayHistoryRegistrationKeyWithNetworkServiceAccountId"},
|
||||
{10702, nullptr, "AddPlayHistory"},
|
||||
{11000, nullptr, "GetProfileImageUrl"},
|
||||
{20100, &IFriendService::GetFriendCount, "GetFriendCount"},
|
||||
{20101, &IFriendService::GetNewlyFriendCount, "GetNewlyFriendCount"},
|
||||
{20100, nullptr, "GetFriendCount"},
|
||||
{20101, nullptr, "GetNewlyFriendCount"},
|
||||
{20102, nullptr, "GetFriendDetailedInfo"},
|
||||
{20103, nullptr, "SyncFriendList"},
|
||||
{20104, nullptr, "RequestSyncFriendList"},
|
||||
{20110, nullptr, "LoadFriendSetting"},
|
||||
{20200, &IFriendService::GetReceivedFriendRequestCount, "GetReceivedFriendRequestCount"},
|
||||
{20200, nullptr, "GetReceivedFriendRequestCount"},
|
||||
{20201, nullptr, "GetFriendRequestList"},
|
||||
{20300, nullptr, "GetFriendCandidateList"},
|
||||
{20301, nullptr, "GetNintendoNetworkIdInfo"},
|
||||
@ -61,14 +61,14 @@ public:
|
||||
{20501, nullptr, "GetRelationship"},
|
||||
{20600, nullptr, "GetUserPresenceView"},
|
||||
{20700, nullptr, "GetPlayHistoryList"},
|
||||
{20701, &IFriendService::GetPlayHistoryStatistics, "GetPlayHistoryStatistics"},
|
||||
{20701, nullptr, "GetPlayHistoryStatistics"},
|
||||
{20800, nullptr, "LoadUserSetting"},
|
||||
{20801, nullptr, "SyncUserSetting"},
|
||||
{20900, nullptr, "RequestListSummaryOverlayNotification"},
|
||||
{21000, nullptr, "GetExternalApplicationCatalog"},
|
||||
{22000, nullptr, "GetReceivedFriendInvitationList"},
|
||||
{22001, nullptr, "GetReceivedFriendInvitationDetailedInfo"},
|
||||
{22010, &IFriendService::GetReceivedFriendInvitationCountCache, "GetReceivedFriendInvitationCountCache"},
|
||||
{22010, nullptr, "GetReceivedFriendInvitationCountCache"},
|
||||
{30100, nullptr, "DropFriendNewlyFlags"},
|
||||
{30101, nullptr, "DeleteFriend"},
|
||||
{30110, nullptr, "DropFriendNewlyFlag"},
|
||||
@ -144,33 +144,6 @@ private:
|
||||
rb.PushCopyObjects(completion_event->GetReadableEvent());
|
||||
}
|
||||
|
||||
void GetFriendList(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto friend_offset = rp.Pop<u32>();
|
||||
const auto uuid = rp.PopRaw<Common::UUID>();
|
||||
[[maybe_unused]] const auto filter = rp.PopRaw<SizedFriendFilter>();
|
||||
const auto pid = rp.Pop<u64>();
|
||||
LOG_WARNING(Service_Friend, "(STUBBED) called, offset={}, uuid=0x{}, pid={}", friend_offset,
|
||||
uuid.RawString(), pid);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
|
||||
rb.Push<u32>(0); // Friend count
|
||||
// TODO(ogniK): Return a buffer of u64s which are the "NetworkServiceAccountId"
|
||||
}
|
||||
|
||||
void CheckFriendListAvailability(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto uuid{rp.PopRaw<Common::UUID>()};
|
||||
|
||||
LOG_WARNING(Service_Friend, "(STUBBED) called, uuid=0x{}", uuid.RawString());
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(true);
|
||||
}
|
||||
|
||||
void GetBlockedUserListIds(HLERequestContext& ctx) {
|
||||
// This is safe to stub, as there should be no adverse consequences from reporting no
|
||||
// blocked users.
|
||||
@ -180,17 +153,6 @@ private:
|
||||
rb.Push<u32>(0); // Indicates there are no blocked users
|
||||
}
|
||||
|
||||
void CheckBlockedUserListAvailability(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto uuid{rp.PopRaw<Common::UUID>()};
|
||||
|
||||
LOG_WARNING(Service_Friend, "(STUBBED) called, uuid=0x{}", uuid.RawString());
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(true);
|
||||
}
|
||||
|
||||
void DeclareCloseOnlinePlaySession(HLERequestContext& ctx) {
|
||||
// Stub used by Splatoon 2
|
||||
LOG_WARNING(Service_Friend, "(STUBBED) called");
|
||||
@ -217,43 +179,42 @@ private:
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void GetFriendCount(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_Friend, "(STUBBED) called");
|
||||
void GetFriendList(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto friend_offset = rp.Pop<u32>();
|
||||
const auto uuid = rp.PopRaw<Common::UUID>();
|
||||
[[maybe_unused]] const auto filter = rp.PopRaw<SizedFriendFilter>();
|
||||
const auto pid = rp.Pop<u64>();
|
||||
LOG_WARNING(Service_Friend, "(STUBBED) called, offset={}, uuid=0x{}, pid={}", friend_offset,
|
||||
uuid.RawString(), pid);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(0);
|
||||
|
||||
rb.Push<u32>(0); // Friend count
|
||||
// TODO(ogniK): Return a buffer of u64s which are the "NetworkServiceAccountId"
|
||||
}
|
||||
|
||||
void GetNewlyFriendCount(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_Friend, "(STUBBED) called");
|
||||
void CheckFriendListAvailability(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto uuid{rp.PopRaw<Common::UUID>()};
|
||||
|
||||
LOG_WARNING(Service_Friend, "(STUBBED) called, uuid=0x{}", uuid.RawString());
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(0);
|
||||
rb.Push(true);
|
||||
}
|
||||
|
||||
void GetReceivedFriendRequestCount(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_Friend, "(STUBBED) called");
|
||||
void CheckBlockedUserListAvailability(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto uuid{rp.PopRaw<Common::UUID>()};
|
||||
|
||||
LOG_WARNING(Service_Friend, "(STUBBED) called, uuid=0x{}", uuid.RawString());
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(0);
|
||||
}
|
||||
|
||||
void GetPlayHistoryStatistics(HLERequestContext& ctx) {
|
||||
LOG_ERROR(Service_Friend, "(STUBBED) called, check in out");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void GetReceivedFriendInvitationCountCache(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_Friend, "(STUBBED) called, check in out");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(0);
|
||||
rb.Push(true);
|
||||
}
|
||||
|
||||
KernelHelpers::ServiceContext service_context;
|
||||
|
||||
@ -51,17 +51,16 @@ s64 CalendarTimeToEpoch(Service::PSC::Time::CalendarTime calendar) {
|
||||
}
|
||||
|
||||
s64 GetEpochTimeFromInitialYear(std::shared_ptr<Service::Set::ISystemSettingsServer>& set_sys) {
|
||||
s32 year{2000};
|
||||
set_sys->GetSettingsItemValueImpl(year, "time", "standard_user_clock_initial_year");
|
||||
|
||||
Service::PSC::Time::CalendarTime calendar{
|
||||
.year = static_cast<s16>(year),
|
||||
.year = 2000,
|
||||
.month = 1,
|
||||
.day = 1,
|
||||
.hour = 0,
|
||||
.minute = 0,
|
||||
.second = 0,
|
||||
};
|
||||
set_sys->GetSettingsItemValueImpl<s16>(calendar.year, "time",
|
||||
"standard_user_clock_initial_year");
|
||||
return CalendarTimeToEpoch(calendar);
|
||||
}
|
||||
|
||||
|
||||
@ -26,9 +26,12 @@ Service::PSC::Time::SystemClockContext g_report_ephemeral_clock_context{};
|
||||
template <typename T>
|
||||
T GetSettingsItemValue(std::shared_ptr<Service::Set::ISystemSettingsServer>& set_sys,
|
||||
const char* category, const char* name) {
|
||||
T v{};
|
||||
auto res = set_sys->GetSettingsItemValueImpl(v, category, name);
|
||||
std::vector<u8> interval_buf;
|
||||
auto res = set_sys->GetSettingsItemValueImpl(interval_buf, category, name);
|
||||
ASSERT(res == ResultSuccess);
|
||||
|
||||
T v{};
|
||||
std::memcpy(&v, interval_buf.data(), sizeof(T));
|
||||
return v;
|
||||
}
|
||||
|
||||
|
||||
@ -201,7 +201,7 @@ IHidSystemServer::IHidSystemServer(Core::System& system_, std::shared_ptr<Resour
|
||||
{1269, nullptr, "DeleteButtonConfigStorageLeft"},
|
||||
{1270, nullptr, "DeleteButtonConfigStorageRight"},
|
||||
{1271, &IHidSystemServer::IsUsingCustomButtonConfig, "IsUsingCustomButtonConfig"},
|
||||
{1272, &IHidSystemServer::IsAnyCustomButtonConfigEnabled, "IsAnyCustomButtonConfigEnabled"},
|
||||
{1272, nullptr, "IsAnyCustomButtonConfigEnabled"},
|
||||
{1273, nullptr, "SetAllCustomButtonConfigEnabled"},
|
||||
{1274, nullptr, "SetDefaultButtonConfig"},
|
||||
{1275, nullptr, "SetAllDefaultButtonConfig"},
|
||||
@ -926,16 +926,6 @@ void IHidSystemServer::IsUsingCustomButtonConfig(HLERequestContext& ctx) {
|
||||
rb.Push(is_enabled);
|
||||
}
|
||||
|
||||
void IHidSystemServer::IsAnyCustomButtonConfigEnabled(HLERequestContext& ctx) {
|
||||
const bool is_enabled = false;
|
||||
|
||||
LOG_DEBUG(Service_HID, "(STUBBED) called, is_enabled={}", is_enabled);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(is_enabled);
|
||||
}
|
||||
|
||||
std::shared_ptr<ResourceManager> IHidSystemServer::GetResourceManager() {
|
||||
resource_manager->Initialize();
|
||||
return resource_manager;
|
||||
|
||||
@ -77,7 +77,6 @@ private:
|
||||
void GetTouchScreenDefaultConfiguration(HLERequestContext& ctx);
|
||||
void SetForceHandheldStyleVibration(HLERequestContext& ctx);
|
||||
void IsUsingCustomButtonConfig(HLERequestContext& ctx);
|
||||
void IsAnyCustomButtonConfigEnabled(HLERequestContext& ctx);
|
||||
|
||||
std::shared_ptr<ResourceManager> GetResourceManager();
|
||||
|
||||
|
||||
@ -18,8 +18,8 @@ public:
|
||||
explicit LBL(Core::System& system_) : ServiceFramework{system_, "lbl"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, &LBL::SaveCurrentSetting, "SaveCurrentSetting"},
|
||||
{1, &LBL::LoadCurrentSetting, "LoadCurrentSetting"},
|
||||
{0, nullptr, "SaveCurrentSetting"},
|
||||
{1, nullptr, "LoadCurrentSetting"},
|
||||
{2, &LBL::SetCurrentBrightnessSetting, "SetCurrentBrightnessSetting"},
|
||||
{3, &LBL::GetCurrentBrightnessSetting, "GetCurrentBrightnessSetting"},
|
||||
{4, nullptr, "ApplyCurrentBrightnessSettingToBacklight"},
|
||||
@ -47,7 +47,7 @@ public:
|
||||
{26, &LBL::EnableVrMode, "EnableVrMode"},
|
||||
{27, &LBL::DisableVrMode, "DisableVrMode"},
|
||||
{28, &LBL::IsVrModeEnabled, "IsVrModeEnabled"},
|
||||
{29, &LBL::IsAutoBrightnessControlSupported, "IsAutoBrightnessControlSupported"},
|
||||
{29, nullptr, "IsAutoBrightnessControlSupported"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
@ -60,20 +60,6 @@ private:
|
||||
On = 1,
|
||||
};
|
||||
|
||||
void SaveCurrentSetting(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_LBL, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void LoadCurrentSetting(HLERequestContext& ctx) {
|
||||
LOG_WARNING(Service_LBL, "(STUBBED) called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
void SetCurrentBrightnessSetting(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
auto brightness = rp.Pop<float>();
|
||||
@ -324,14 +310,6 @@ private:
|
||||
rb.Push(vr_mode_enabled);
|
||||
}
|
||||
|
||||
void IsAutoBrightnessControlSupported(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_LBL, "called");
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push<u8>(auto_brightness_supported);
|
||||
}
|
||||
|
||||
bool vr_mode_enabled = false;
|
||||
float current_brightness = 1.0f;
|
||||
float ambient_light_value = 0.0f;
|
||||
@ -339,8 +317,7 @@ private:
|
||||
bool dimming = true;
|
||||
bool backlight_enabled = true;
|
||||
bool update_instantly = false;
|
||||
bool auto_brightness = false;
|
||||
bool auto_brightness_supported = true; // TODO(ogniK): Move to system settings
|
||||
bool auto_brightness = false; // TODO(ogniK): Move to system settings
|
||||
};
|
||||
|
||||
void LoopProcess(Core::System& system) {
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
#include "core/hle/service/cmif_serialization.h"
|
||||
#include "core/hle/service/ldn/ldn_results.h"
|
||||
#include "core/hle/service/ldn/monitor_service.h"
|
||||
|
||||
namespace Service::LDN {
|
||||
@ -18,7 +17,7 @@ IMonitorService::IMonitorService(Core::System& system_)
|
||||
{4, nullptr, "GetSecurityParameterForMonitor"},
|
||||
{5, nullptr, "GetNetworkConfigForMonitor"},
|
||||
{100, C<&IMonitorService::InitializeMonitor>, "InitializeMonitor"},
|
||||
{101, C<&IMonitorService::FinalizeMonitor>, "FinalizeMonitor"},
|
||||
{101, nullptr, "FinalizeMonitor"},
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
@ -28,18 +27,16 @@ IMonitorService::IMonitorService(Core::System& system_)
|
||||
IMonitorService::~IMonitorService() = default;
|
||||
|
||||
Result IMonitorService::GetStateForMonitor(Out<State> out_state) {
|
||||
LOG_WARNING(Service_LDN, "(STUBBED) called");
|
||||
*out_state = State::None;
|
||||
LOG_INFO(Service_LDN, "called");
|
||||
|
||||
*out_state = state;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IMonitorService::InitializeMonitor() {
|
||||
LOG_INFO(Service_LDN, "called");
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result IMonitorService::FinalizeMonitor() {
|
||||
LOG_INFO(Service_LDN, "called");
|
||||
state = State::Initialized;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
|
||||
@ -21,7 +21,6 @@ public:
|
||||
private:
|
||||
Result GetStateForMonitor(Out<State> out_state);
|
||||
Result InitializeMonitor();
|
||||
Result FinalizeMonitor();
|
||||
|
||||
State state{State::None};
|
||||
};
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
#include "core/hle/service/nfc/nfc_result.h"
|
||||
#include "core/hle/service/psc/time/steady_clock.h"
|
||||
#include "core/hle/service/service.h"
|
||||
#include "core/hle/service/set/system_settings_server.h"
|
||||
#include "core/hle/service/sm/sm.h"
|
||||
#include "hid_core/hid_types.h"
|
||||
#include "hid_core/hid_util.h"
|
||||
@ -33,9 +32,6 @@ DeviceManager::DeviceManager(Core::System& system_, KernelHelpers::ServiceContex
|
||||
}
|
||||
|
||||
is_initialized = false;
|
||||
|
||||
m_set_sys =
|
||||
system.ServiceManager().GetService<Service::Set::ISystemSettingsServer>("set:sys", true);
|
||||
}
|
||||
|
||||
DeviceManager ::~DeviceManager() {
|
||||
@ -778,8 +774,8 @@ Result DeviceManager::CheckDeviceState(std::shared_ptr<NfcDevice> device) const
|
||||
}
|
||||
|
||||
Result DeviceManager::IsNfcEnabled() const {
|
||||
bool is_enabled{};
|
||||
R_TRY(m_set_sys->GetNfcEnableFlag(&is_enabled));
|
||||
// TODO: This calls nn::settings::detail::GetNfcEnableFlag
|
||||
const bool is_enabled = true;
|
||||
if (!is_enabled) {
|
||||
return ResultNfcDisabled;
|
||||
}
|
||||
|
||||
@ -15,10 +15,6 @@
|
||||
#include "core/hle/service/service.h"
|
||||
#include "hid_core/hid_types.h"
|
||||
|
||||
namespace Service::Set {
|
||||
class ISystemSettingsServer;
|
||||
}
|
||||
|
||||
namespace Service::NFC {
|
||||
class NfcDevice;
|
||||
|
||||
@ -102,7 +98,6 @@ private:
|
||||
Core::System& system;
|
||||
KernelHelpers::ServiceContext service_context;
|
||||
Kernel::KEvent* availability_change_event;
|
||||
std::shared_ptr<Service::Set::ISystemSettingsServer> m_set_sys;
|
||||
};
|
||||
|
||||
} // namespace Service::NFC
|
||||
|
||||
@ -57,7 +57,7 @@ public:
|
||||
{1, &NfcInterface::Finalize, "FinalizeOld"},
|
||||
{2, &NfcInterface::GetState, "GetStateOld"},
|
||||
{3, &NfcInterface::IsNfcEnabled, "IsNfcEnabledOld"},
|
||||
{100, &NfcInterface::SetNfcEnabled, "SetNfcEnabledOld"},
|
||||
{100, nullptr, "SetNfcEnabledOld"},
|
||||
{400, &NfcInterface::Initialize, "Initialize"},
|
||||
{401, &NfcInterface::Finalize, "Finalize"},
|
||||
{402, &NfcInterface::GetState, "GetState"},
|
||||
@ -71,7 +71,7 @@ public:
|
||||
{410, &NfcInterface::GetTagInfo, "GetTagInfo"},
|
||||
{411, &NfcInterface::AttachActivateEvent, "AttachActivateEvent"},
|
||||
{412, &NfcInterface::AttachDeactivateEvent, "AttachDeactivateEvent"},
|
||||
{500, &NfcInterface::SetNfcEnabled, "SetNfcEnabled"},
|
||||
{500, nullptr, "SetNfcEnabled"},
|
||||
{510, nullptr, "OutputTestWave"},
|
||||
{1000, &NfcInterface::ReadMifare, "ReadMifare"},
|
||||
{1001, &NfcInterface::WriteMifare, "WriteMifare"},
|
||||
|
||||
@ -13,18 +13,13 @@
|
||||
#include "core/hle/service/nfc/nfc_result.h"
|
||||
#include "core/hle/service/nfc/nfc_types.h"
|
||||
#include "core/hle/service/nfp/nfp_result.h"
|
||||
#include "core/hle/service/set/system_settings_server.h"
|
||||
#include "core/hle/service/sm/sm.h"
|
||||
#include "hid_core/hid_types.h"
|
||||
|
||||
namespace Service::NFC {
|
||||
|
||||
NfcInterface::NfcInterface(Core::System& system_, const char* name, BackendType service_backend)
|
||||
: ServiceFramework{system_, name}, service_context{system_, service_name},
|
||||
backend_type{service_backend} {
|
||||
m_set_sys =
|
||||
system.ServiceManager().GetService<Service::Set::ISystemSettingsServer>("set:sys", true);
|
||||
}
|
||||
backend_type{service_backend} {}
|
||||
|
||||
NfcInterface ::~NfcInterface() = default;
|
||||
|
||||
@ -70,11 +65,11 @@ void NfcInterface::GetState(HLERequestContext& ctx) {
|
||||
void NfcInterface::IsNfcEnabled(HLERequestContext& ctx) {
|
||||
LOG_DEBUG(Service_NFC, "called");
|
||||
|
||||
bool is_enabled{};
|
||||
const auto result = m_set_sys->GetNfcEnableFlag(&is_enabled);
|
||||
// TODO: This calls nn::settings::detail::GetNfcEnableFlag
|
||||
const bool is_enabled = true;
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 3};
|
||||
rb.Push(result);
|
||||
rb.Push(ResultSuccess);
|
||||
rb.Push(is_enabled);
|
||||
}
|
||||
|
||||
@ -217,17 +212,6 @@ void NfcInterface::AttachDeactivateEvent(HLERequestContext& ctx) {
|
||||
rb.PushCopyObjects(out_event);
|
||||
}
|
||||
|
||||
void NfcInterface::SetNfcEnabled(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto is_enabled{rp.Pop<bool>()};
|
||||
LOG_DEBUG(Service_NFC, "called, is_enabled={}", is_enabled);
|
||||
|
||||
const auto result = m_set_sys->SetNfcEnableFlag(is_enabled);
|
||||
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(result);
|
||||
}
|
||||
|
||||
void NfcInterface::ReadMifare(HLERequestContext& ctx) {
|
||||
IPC::RequestParser rp{ctx};
|
||||
const auto device_handle{rp.Pop<u64>()};
|
||||
|
||||
@ -7,10 +7,6 @@
|
||||
#include "core/hle/service/nfc/nfc_types.h"
|
||||
#include "core/hle/service/service.h"
|
||||
|
||||
namespace Service::Set {
|
||||
class ISystemSettingsServer;
|
||||
}
|
||||
|
||||
namespace Service::NFC {
|
||||
class DeviceManager;
|
||||
|
||||
@ -33,7 +29,6 @@ public:
|
||||
void AttachActivateEvent(HLERequestContext& ctx);
|
||||
void AttachDeactivateEvent(HLERequestContext& ctx);
|
||||
void ReadMifare(HLERequestContext& ctx);
|
||||
void SetNfcEnabled(HLERequestContext& ctx);
|
||||
void WriteMifare(HLERequestContext& ctx);
|
||||
void SendCommandByPassThrough(HLERequestContext& ctx);
|
||||
|
||||
@ -49,7 +44,6 @@ protected:
|
||||
BackendType backend_type;
|
||||
State state{State::NonInitialized};
|
||||
std::shared_ptr<DeviceManager> device_manager = nullptr;
|
||||
std::shared_ptr<Service::Set::ISystemSettingsServer> m_set_sys;
|
||||
};
|
||||
|
||||
} // namespace Service::NFC
|
||||
|
||||
@ -3,26 +3,22 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "core/hle/kernel/k_event.h"
|
||||
#include "core/hle/service/cmif_serialization.h"
|
||||
#include "core/hle/service/kernel_helpers.h"
|
||||
#include "core/hle/service/npns/npns.h"
|
||||
#include "core/hle/service/server_manager.h"
|
||||
#include "core/hle/service/service.h"
|
||||
|
||||
namespace Service::NPNS {
|
||||
|
||||
class INpnsSystem final : public ServiceFramework<INpnsSystem> {
|
||||
class NPNS_S final : public ServiceFramework<NPNS_S> {
|
||||
public:
|
||||
explicit INpnsSystem(Core::System& system_)
|
||||
: ServiceFramework{system_, "npns:s"}, service_context{system, "npns:s"} {
|
||||
explicit NPNS_S(Core::System& system_) : ServiceFramework{system_, "npns:s"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{1, nullptr, "ListenAll"},
|
||||
{2, C<&INpnsSystem::ListenTo>, "ListenTo"},
|
||||
{2, nullptr, "ListenTo"},
|
||||
{3, nullptr, "Receive"},
|
||||
{4, nullptr, "ReceiveRaw"},
|
||||
{5, C<&INpnsSystem::GetReceiveEvent>, "GetReceiveEvent"},
|
||||
{5, nullptr, "GetReceiveEvent"},
|
||||
{6, nullptr, "ListenUndelivered"},
|
||||
{7, nullptr, "GetStateChangeEVent"},
|
||||
{11, nullptr, "SubscribeTopic"},
|
||||
@ -63,34 +59,12 @@ public:
|
||||
// clang-format on
|
||||
|
||||
RegisterHandlers(functions);
|
||||
|
||||
get_receive_event = service_context.CreateEvent("npns:s:GetReceiveEvent");
|
||||
}
|
||||
|
||||
~INpnsSystem() override {
|
||||
service_context.CloseEvent(get_receive_event);
|
||||
}
|
||||
|
||||
private:
|
||||
Result ListenTo(u32 program_id) {
|
||||
LOG_WARNING(Service_AM, "(STUBBED) called, program_id={}", program_id);
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result GetReceiveEvent(OutCopyHandle<Kernel::KReadableEvent> out_event) {
|
||||
LOG_WARNING(Service_AM, "(STUBBED) called");
|
||||
|
||||
*out_event = &get_receive_event->GetReadableEvent();
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
KernelHelpers::ServiceContext service_context;
|
||||
Kernel::KEvent* get_receive_event;
|
||||
};
|
||||
|
||||
class INpnsUser final : public ServiceFramework<INpnsUser> {
|
||||
class NPNS_U final : public ServiceFramework<NPNS_U> {
|
||||
public:
|
||||
explicit INpnsUser(Core::System& system_) : ServiceFramework{system_, "npns:u"} {
|
||||
explicit NPNS_U(Core::System& system_) : ServiceFramework{system_, "npns:u"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{1, nullptr, "ListenAll"},
|
||||
@ -123,8 +97,8 @@ public:
|
||||
void LoopProcess(Core::System& system) {
|
||||
auto server_manager = std::make_unique<ServerManager>(system);
|
||||
|
||||
server_manager->RegisterNamedService("npns:s", std::make_shared<INpnsSystem>(system));
|
||||
server_manager->RegisterNamedService("npns:u", std::make_shared<INpnsUser>(system));
|
||||
server_manager->RegisterNamedService("npns:s", std::make_shared<NPNS_S>(system));
|
||||
server_manager->RegisterNamedService("npns:u", std::make_shared<NPNS_U>(system));
|
||||
ServerManager::RunServer(std::move(server_manager));
|
||||
}
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
#include "core/hle/service/acc/acc.h"
|
||||
#include "core/hle/service/am/am.h"
|
||||
#include "core/hle/service/aoc/addon_content_manager.h"
|
||||
#include "core/hle/service/aoc/aoc_u.h"
|
||||
#include "core/hle/service/apm/apm.h"
|
||||
#include "core/hle/service/audio/audio.h"
|
||||
#include "core/hle/service/bcat/bcat.h"
|
||||
|
||||
@ -52,10 +52,6 @@ SystemSettings DefaultSystemSettings() {
|
||||
settings.battery_percentage_flag = true;
|
||||
settings.chinese_traditional_input_method = ChineseTraditionalInputMethod::Unknown0;
|
||||
settings.vibration_master_volume = 1.0f;
|
||||
settings.touch_screen_mode = TouchScreenMode::Standard;
|
||||
settings.nfc_enable_flag = true;
|
||||
settings.bluetooth_enable_flag = true;
|
||||
settings.wireless_lan_enable_flag = true;
|
||||
|
||||
const auto language_code =
|
||||
available_language_codes[static_cast<s32>(::Settings::values.language_index.GetValue())];
|
||||
|
||||
@ -243,11 +243,6 @@ enum class TvResolution : u32 {
|
||||
Resolution480p,
|
||||
};
|
||||
|
||||
enum class PlatformRegion : s32 {
|
||||
Global = 1,
|
||||
Terra = 2,
|
||||
};
|
||||
|
||||
constexpr std::array<LanguageCode, 18> available_language_codes = {{
|
||||
LanguageCode::JA,
|
||||
LanguageCode::EN_US,
|
||||
@ -410,7 +405,8 @@ struct EulaVersion {
|
||||
SystemRegionCode region_code;
|
||||
EulaVersionClockType clock_type;
|
||||
INSERT_PADDING_BYTES(0x4);
|
||||
Service::PSC::Time::SystemClockContext system_clock_context;
|
||||
s64 posix_time;
|
||||
Service::PSC::Time::SteadyClockTimePoint timestamp;
|
||||
};
|
||||
static_assert(sizeof(EulaVersion) == 0x30, "EulaVersion is incorrect size");
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
namespace Service::Set {
|
||||
|
||||
namespace {
|
||||
constexpr u32 SETTINGS_VERSION{4u};
|
||||
constexpr u32 SETTINGS_VERSION{3u};
|
||||
constexpr auto SETTINGS_MAGIC = Common::MakeMagic('y', 'u', 'z', 'u', '_', 's', 'e', 't');
|
||||
struct SettingsHeader {
|
||||
u64 magic;
|
||||
@ -272,8 +272,8 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_)
|
||||
{180, nullptr, "SetZoomFlag"},
|
||||
{181, nullptr, "GetT"},
|
||||
{182, nullptr, "SetT"},
|
||||
{183, C<&ISystemSettingsServer::GetPlatformRegion>, "GetPlatformRegion"},
|
||||
{184, C<&ISystemSettingsServer::SetPlatformRegion>, "SetPlatformRegion"},
|
||||
{183, nullptr, "GetPlatformRegion"},
|
||||
{184, nullptr, "SetPlatformRegion"},
|
||||
{185, C<&ISystemSettingsServer::GetHomeMenuSchemeModel>, "GetHomeMenuSchemeModel"},
|
||||
{186, nullptr, "GetMemoryUsageRateFlag"},
|
||||
{187, C<&ISystemSettingsServer::GetTouchScreenMode>, "GetTouchScreenMode"},
|
||||
@ -306,20 +306,6 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_)
|
||||
RegisterHandlers(functions);
|
||||
|
||||
SetupSettings();
|
||||
|
||||
m_system_settings.region_code =
|
||||
static_cast<SystemRegionCode>(::Settings::values.region_index.GetValue());
|
||||
|
||||
// TODO: Remove this when starter applet is fully functional
|
||||
EulaVersion eula_version{
|
||||
.version = 0x10000,
|
||||
.region_code = m_system_settings.region_code,
|
||||
.clock_type = EulaVersionClockType::SteadyClock,
|
||||
.system_clock_context = m_system_settings.user_system_clock_context,
|
||||
};
|
||||
m_system_settings.eula_versions[0] = eula_version;
|
||||
m_system_settings.eula_version_count = 1;
|
||||
|
||||
m_save_thread =
|
||||
std::jthread([this](std::stop_token stop_token) { StoreSettingsThreadFunc(stop_token); });
|
||||
}
|
||||
@ -715,7 +701,7 @@ Result ISystemSettingsServer::GetSettingsItemValueSize(
|
||||
}
|
||||
|
||||
Result ISystemSettingsServer::GetSettingsItemValue(
|
||||
Out<u64> out_size, OutBuffer<BufferAttr_HipcMapAlias> out_data,
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_data,
|
||||
InLargeData<SettingItemName, BufferAttr_HipcPointer> setting_category_buffer,
|
||||
InLargeData<SettingItemName, BufferAttr_HipcPointer> setting_name_buffer) {
|
||||
const std::string setting_category{Common::StringFromBuffer(*setting_category_buffer)};
|
||||
@ -723,7 +709,7 @@ Result ISystemSettingsServer::GetSettingsItemValue(
|
||||
|
||||
LOG_INFO(Service_SET, "called, category={}, name={}", setting_category, setting_name);
|
||||
|
||||
R_RETURN(GetSettingsItemValueImpl(out_data, *out_size, setting_category, setting_name));
|
||||
R_RETURN(GetSettingsItemValueImpl(out_data, setting_category, setting_name));
|
||||
}
|
||||
|
||||
Result ISystemSettingsServer::GetTvSettings(Out<TvSettings> out_tv_settings) {
|
||||
@ -1250,18 +1236,6 @@ Result ISystemSettingsServer::GetHomeMenuScheme(Out<HomeMenuScheme> out_home_men
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ISystemSettingsServer::GetPlatformRegion(Out<PlatformRegion> out_platform_region) {
|
||||
LOG_WARNING(Service_SET, "(STUBBED) called");
|
||||
|
||||
*out_platform_region = PlatformRegion::Global;
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ISystemSettingsServer::SetPlatformRegion(PlatformRegion platform_region) {
|
||||
LOG_WARNING(Service_SET, "(STUBBED) called");
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result ISystemSettingsServer::GetHomeMenuSchemeModel(Out<u32> out_home_menu_scheme_model) {
|
||||
LOG_WARNING(Service_SET, "(STUBBED) called");
|
||||
|
||||
@ -1375,16 +1349,13 @@ void ISystemSettingsServer::SetSaveNeeded() {
|
||||
m_save_needed = true;
|
||||
}
|
||||
|
||||
Result ISystemSettingsServer::GetSettingsItemValueImpl(std::span<u8> out_value, u64& out_size,
|
||||
Result ISystemSettingsServer::GetSettingsItemValueImpl(std::vector<u8>& out_value,
|
||||
const std::string& category,
|
||||
const std::string& name) {
|
||||
auto settings{GetSettings()};
|
||||
R_UNLESS(settings.contains(category) && settings[category].contains(name), ResultUnknown);
|
||||
|
||||
ASSERT_MSG(out_value.size() >= settings[category][name].size(),
|
||||
"Stored type is bigger than requested type");
|
||||
out_size = std::min<u64>(settings[category][name].size(), out_value.size());
|
||||
std::memcpy(out_value.data(), settings[category][name].data(), out_size);
|
||||
out_value = settings[category][name];
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
|
||||
@ -34,17 +34,20 @@ public:
|
||||
explicit ISystemSettingsServer(Core::System& system_);
|
||||
~ISystemSettingsServer() override;
|
||||
|
||||
Result GetSettingsItemValueImpl(std::span<u8> out_value, u64& out_size,
|
||||
const std::string& category, const std::string& name);
|
||||
Result GetSettingsItemValueImpl(std::vector<u8>& out_value, const std::string& category,
|
||||
const std::string& name);
|
||||
|
||||
template <typename T>
|
||||
Result GetSettingsItemValueImpl(T& out_value, const std::string& category,
|
||||
Result GetSettingsItemValueImpl(T& value, const std::string& category,
|
||||
const std::string& name) {
|
||||
u64 data_size{};
|
||||
std::vector<u8> data(sizeof(T));
|
||||
R_TRY(GetSettingsItemValueImpl(data, data_size, category, name));
|
||||
std::memcpy(&out_value, data.data(), data_size);
|
||||
R_SUCCEED();
|
||||
std::vector<u8> data;
|
||||
const auto result = GetSettingsItemValueImpl(data, category, name);
|
||||
if (result.IsError()) {
|
||||
return result;
|
||||
}
|
||||
ASSERT(data.size() >= sizeof(T));
|
||||
std::memcpy(&value, data.data(), sizeof(T));
|
||||
return result;
|
||||
}
|
||||
|
||||
public:
|
||||
@ -81,7 +84,7 @@ public:
|
||||
InLargeData<SettingItemName, BufferAttr_HipcPointer> setting_category_buffer,
|
||||
InLargeData<SettingItemName, BufferAttr_HipcPointer> setting_name_buf);
|
||||
Result GetSettingsItemValue(
|
||||
Out<u64> out_size, OutBuffer<BufferAttr_HipcMapAlias> out_data,
|
||||
OutBuffer<BufferAttr_HipcMapAlias> out_data,
|
||||
InLargeData<SettingItemName, BufferAttr_HipcPointer> setting_category_buffer,
|
||||
InLargeData<SettingItemName, BufferAttr_HipcPointer> setting_name_buffer);
|
||||
Result GetTvSettings(Out<TvSettings> out_tv_settings);
|
||||
@ -149,8 +152,6 @@ public:
|
||||
Result GetHomeMenuScheme(Out<HomeMenuScheme> out_home_menu_scheme);
|
||||
Result GetHomeMenuSchemeModel(Out<u32> out_home_menu_scheme_model);
|
||||
Result GetTouchScreenMode(Out<TouchScreenMode> out_touch_screen_mode);
|
||||
Result GetPlatformRegion(Out<PlatformRegion> out_platform_region);
|
||||
Result SetPlatformRegion(PlatformRegion platform_region);
|
||||
Result SetTouchScreenMode(TouchScreenMode touch_screen_mode);
|
||||
Result GetFieldTestingFlag(Out<bool> out_field_testing_flag);
|
||||
Result GetPanelCrcMode(Out<s32> out_panel_crc_mode);
|
||||
|
||||
@ -1,156 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "common/alignment.h"
|
||||
#include "core/core.h"
|
||||
#include "core/file_sys/content_archive.h"
|
||||
#include "core/file_sys/nca_metadata.h"
|
||||
#include "core/file_sys/registered_cache.h"
|
||||
#include "core/file_sys/romfs.h"
|
||||
#include "core/hle/service/filesystem/filesystem.h"
|
||||
#include "core/hle/service/ssl/cert_store.h"
|
||||
|
||||
namespace Service::SSL {
|
||||
|
||||
// https://switchbrew.org/wiki/SSL_services#CertStore
|
||||
|
||||
CertStore::CertStore(Core::System& system) {
|
||||
constexpr u64 CertStoreDataId = 0x0100000000000800ULL;
|
||||
|
||||
auto& fsc = system.GetFileSystemController();
|
||||
|
||||
// Attempt to load certificate data from storage
|
||||
const auto nca =
|
||||
fsc.GetSystemNANDContents()->GetEntry(CertStoreDataId, FileSys::ContentRecordType::Data);
|
||||
if (!nca) {
|
||||
return;
|
||||
}
|
||||
const auto romfs = nca->GetRomFS();
|
||||
if (!romfs) {
|
||||
return;
|
||||
}
|
||||
const auto extracted = FileSys::ExtractRomFS(romfs);
|
||||
if (!extracted) {
|
||||
LOG_ERROR(Service_SSL, "CertStore could not be extracted, corrupt RomFS?");
|
||||
return;
|
||||
}
|
||||
const auto cert_store_file = extracted->GetFile("ssl_TrustedCerts.bdf");
|
||||
if (!cert_store_file) {
|
||||
LOG_ERROR(Service_SSL, "Failed to find trusted certificates in CertStore");
|
||||
return;
|
||||
}
|
||||
|
||||
// Read and verify the header.
|
||||
CertStoreHeader header;
|
||||
cert_store_file->ReadObject(std::addressof(header));
|
||||
|
||||
if (header.magic != Common::MakeMagic('s', 's', 'l', 'T')) {
|
||||
LOG_ERROR(Service_SSL, "Invalid certificate store magic");
|
||||
return;
|
||||
}
|
||||
|
||||
// Ensure the file can contains the number of entries it says it does.
|
||||
const u64 expected_size = sizeof(header) + sizeof(CertStoreEntry) * header.num_entries;
|
||||
const u64 actual_size = cert_store_file->GetSize();
|
||||
if (actual_size < expected_size) {
|
||||
LOG_ERROR(Service_SSL, "Size mismatch, expected at least {} bytes, got {}", expected_size,
|
||||
actual_size);
|
||||
return;
|
||||
}
|
||||
|
||||
// Read entries.
|
||||
std::vector<CertStoreEntry> entries(header.num_entries);
|
||||
cert_store_file->ReadArray(entries.data(), header.num_entries, sizeof(header));
|
||||
|
||||
// Insert into memory store.
|
||||
for (const auto& entry : entries) {
|
||||
m_certs.emplace(entry.certificate_id,
|
||||
Certificate{
|
||||
.status = entry.certificate_status,
|
||||
.der_data = cert_store_file->ReadBytes(
|
||||
entry.der_size, entry.der_offset + sizeof(header)),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
CertStore::~CertStore() = default;
|
||||
|
||||
template <typename F>
|
||||
void CertStore::ForEachCertificate(std::span<const CaCertificateId> certificate_ids, F&& f) {
|
||||
if (certificate_ids.size() == 1 && certificate_ids.front() == CaCertificateId::All) {
|
||||
for (const auto& entry : m_certs) {
|
||||
f(entry);
|
||||
}
|
||||
} else {
|
||||
for (const auto certificate_id : certificate_ids) {
|
||||
const auto entry = m_certs.find(certificate_id);
|
||||
if (entry == m_certs.end()) {
|
||||
continue;
|
||||
}
|
||||
f(*entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Result CertStore::GetCertificates(u32* out_num_entries, std::span<u8> out_data,
|
||||
std::span<const CaCertificateId> certificate_ids) {
|
||||
// Ensure the buffer is large enough to hold the output.
|
||||
u32 required_size;
|
||||
R_TRY(this->GetCertificateBufSize(std::addressof(required_size), out_num_entries,
|
||||
certificate_ids));
|
||||
R_UNLESS(out_data.size_bytes() >= required_size, ResultUnknown);
|
||||
|
||||
// Make parallel arrays.
|
||||
std::vector<BuiltInCertificateInfo> cert_infos;
|
||||
std::vector<u8> der_datas;
|
||||
|
||||
const u32 der_data_offset = (*out_num_entries + 1) * sizeof(BuiltInCertificateInfo);
|
||||
u32 cur_der_offset = der_data_offset;
|
||||
|
||||
// Fill output.
|
||||
this->ForEachCertificate(certificate_ids, [&](auto& entry) {
|
||||
const auto& [status, cur_der_data] = entry.second;
|
||||
BuiltInCertificateInfo cert_info{
|
||||
.cert_id = entry.first,
|
||||
.status = status,
|
||||
.der_size = cur_der_data.size(),
|
||||
.der_offset = cur_der_offset,
|
||||
};
|
||||
|
||||
cert_infos.push_back(cert_info);
|
||||
der_datas.insert(der_datas.end(), cur_der_data.begin(), cur_der_data.end());
|
||||
cur_der_offset += static_cast<u32>(cur_der_data.size());
|
||||
});
|
||||
|
||||
// Append terminator entry.
|
||||
cert_infos.push_back(BuiltInCertificateInfo{
|
||||
.cert_id = CaCertificateId::All,
|
||||
.status = TrustedCertStatus::Invalid,
|
||||
.der_size = 0,
|
||||
.der_offset = 0,
|
||||
});
|
||||
|
||||
// Write to output span.
|
||||
std::memcpy(out_data.data(), cert_infos.data(),
|
||||
cert_infos.size() * sizeof(BuiltInCertificateInfo));
|
||||
std::memcpy(out_data.data() + der_data_offset, der_datas.data(), der_datas.size());
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
Result CertStore::GetCertificateBufSize(u32* out_size, u32* out_num_entries,
|
||||
std::span<const CaCertificateId> certificate_ids) {
|
||||
// Output size is at least the size of the terminator entry.
|
||||
*out_size = sizeof(BuiltInCertificateInfo);
|
||||
*out_num_entries = 0;
|
||||
|
||||
this->ForEachCertificate(certificate_ids, [&](auto& entry) {
|
||||
*out_size += sizeof(BuiltInCertificateInfo);
|
||||
*out_size += Common::AlignUp(static_cast<u32>(entry.second.der_data.size()), 4);
|
||||
(*out_num_entries)++;
|
||||
});
|
||||
|
||||
R_SUCCEED();
|
||||
}
|
||||
|
||||
} // namespace Service::SSL
|
||||
@ -1,42 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <map>
|
||||
#include <span>
|
||||
#include <vector>
|
||||
|
||||
#include "core/hle/result.h"
|
||||
#include "core/hle/service/ssl/ssl_types.h"
|
||||
|
||||
namespace Core {
|
||||
class System;
|
||||
}
|
||||
|
||||
namespace Service::SSL {
|
||||
|
||||
class CertStore {
|
||||
public:
|
||||
explicit CertStore(Core::System& system);
|
||||
~CertStore();
|
||||
|
||||
Result GetCertificates(u32* out_num_entries, std::span<u8> out_data,
|
||||
std::span<const CaCertificateId> certificate_ids);
|
||||
Result GetCertificateBufSize(u32* out_size, u32* out_num_entries,
|
||||
std::span<const CaCertificateId> certificate_ids);
|
||||
|
||||
private:
|
||||
template <typename F>
|
||||
void ForEachCertificate(std::span<const CaCertificateId> certs, F&& f);
|
||||
|
||||
private:
|
||||
struct Certificate {
|
||||
TrustedCertStatus status;
|
||||
std::vector<u8> der_data;
|
||||
};
|
||||
|
||||
std::map<CaCertificateId, Certificate> m_certs;
|
||||
};
|
||||
|
||||
} // namespace Service::SSL
|
||||
@ -5,13 +5,11 @@
|
||||
|
||||
#include "core/core.h"
|
||||
#include "core/hle/result.h"
|
||||
#include "core/hle/service/cmif_serialization.h"
|
||||
#include "core/hle/service/ipc_helpers.h"
|
||||
#include "core/hle/service/server_manager.h"
|
||||
#include "core/hle/service/service.h"
|
||||
#include "core/hle/service/sm/sm.h"
|
||||
#include "core/hle/service/sockets/bsd.h"
|
||||
#include "core/hle/service/ssl/cert_store.h"
|
||||
#include "core/hle/service/ssl/ssl.h"
|
||||
#include "core/hle/service/ssl/ssl_backend.h"
|
||||
#include "core/internal_network/network.h"
|
||||
@ -494,14 +492,13 @@ private:
|
||||
|
||||
class ISslService final : public ServiceFramework<ISslService> {
|
||||
public:
|
||||
explicit ISslService(Core::System& system_)
|
||||
: ServiceFramework{system_, "ssl"}, cert_store{system} {
|
||||
explicit ISslService(Core::System& system_) : ServiceFramework{system_, "ssl"} {
|
||||
// clang-format off
|
||||
static const FunctionInfo functions[] = {
|
||||
{0, &ISslService::CreateContext, "CreateContext"},
|
||||
{1, nullptr, "GetContextCount"},
|
||||
{2, D<&ISslService::GetCertificates>, "GetCertificates"},
|
||||
{3, D<&ISslService::GetCertificateBufSize>, "GetCertificateBufSize"},
|
||||
{2, nullptr, "GetCertificates"},
|
||||
{3, nullptr, "GetCertificateBufSize"},
|
||||
{4, nullptr, "DebugIoctl"},
|
||||
{5, &ISslService::SetInterfaceVersion, "SetInterfaceVersion"},
|
||||
{6, nullptr, "FlushSessionCache"},
|
||||
@ -543,22 +540,6 @@ private:
|
||||
IPC::ResponseBuilder rb{ctx, 2};
|
||||
rb.Push(ResultSuccess);
|
||||
}
|
||||
|
||||
Result GetCertificateBufSize(
|
||||
Out<u32> out_size, InArray<CaCertificateId, BufferAttr_HipcMapAlias> certificate_ids) {
|
||||
LOG_INFO(Service_SSL, "called");
|
||||
u32 num_entries;
|
||||
R_RETURN(cert_store.GetCertificateBufSize(out_size, &num_entries, certificate_ids));
|
||||
}
|
||||
|
||||
Result GetCertificates(Out<u32> out_num_entries, OutBuffer<BufferAttr_HipcMapAlias> out_buffer,
|
||||
InArray<CaCertificateId, BufferAttr_HipcMapAlias> certificate_ids) {
|
||||
LOG_INFO(Service_SSL, "called");
|
||||
R_RETURN(cert_store.GetCertificates(out_num_entries, out_buffer, certificate_ids));
|
||||
}
|
||||
|
||||
private:
|
||||
CertStore cert_store;
|
||||
};
|
||||
|
||||
void LoopProcess(Core::System& system) {
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "common/common_types.h"
|
||||
|
||||
namespace Service::SSL {
|
||||
|
||||
enum class CaCertificateId : s32 {
|
||||
All = -1,
|
||||
NintendoCAG3 = 1,
|
||||
NintendoClass2CAG3 = 2,
|
||||
NintendoRootCAG4 = 3,
|
||||
AmazonRootCA1 = 1000,
|
||||
StarfieldServicesRootCertificateAuthorityG2 = 1001,
|
||||
AddTrustExternalCARoot = 1002,
|
||||
COMODOCertificationAuthority = 1003,
|
||||
UTNDATACorpSGC = 1004,
|
||||
UTNUSERFirstHardware = 1005,
|
||||
BaltimoreCyberTrustRoot = 1006,
|
||||
CybertrustGlobalRoot = 1007,
|
||||
VerizonGlobalRootCA = 1008,
|
||||
DigiCertAssuredIDRootCA = 1009,
|
||||
DigiCertAssuredIDRootG2 = 1010,
|
||||
DigiCertGlobalRootCA = 1011,
|
||||
DigiCertGlobalRootG2 = 1012,
|
||||
DigiCertHighAssuranceEVRootCA = 1013,
|
||||
EntrustnetCertificationAuthority2048 = 1014,
|
||||
EntrustRootCertificationAuthority = 1015,
|
||||
EntrustRootCertificationAuthorityG2 = 1016,
|
||||
GeoTrustGlobalCA2 = 1017,
|
||||
GeoTrustGlobalCA = 1018,
|
||||
GeoTrustPrimaryCertificationAuthorityG3 = 1019,
|
||||
GeoTrustPrimaryCertificationAuthority = 1020,
|
||||
GlobalSignRootCA = 1021,
|
||||
GlobalSignRootCAR2 = 1022,
|
||||
GlobalSignRootCAR3 = 1023,
|
||||
GoDaddyClass2CertificationAuthority = 1024,
|
||||
GoDaddyRootCertificateAuthorityG2 = 1025,
|
||||
StarfieldClass2CertificationAuthority = 1026,
|
||||
StarfieldRootCertificateAuthorityG2 = 1027,
|
||||
thawtePrimaryRootCAG3 = 1028,
|
||||
thawtePrimaryRootCA = 1029,
|
||||
VeriSignClass3PublicPrimaryCertificationAuthorityG3 = 1030,
|
||||
VeriSignClass3PublicPrimaryCertificationAuthorityG5 = 1031,
|
||||
VeriSignUniversalRootCertificationAuthority = 1032,
|
||||
DSTRootCAX3 = 1033,
|
||||
USERTrustRsaCertificationAuthority = 1034,
|
||||
ISRGRootX10 = 1035,
|
||||
USERTrustEccCertificationAuthority = 1036,
|
||||
COMODORsaCertificationAuthority = 1037,
|
||||
COMODOEccCertificationAuthority = 1038,
|
||||
AmazonRootCA2 = 1039,
|
||||
AmazonRootCA3 = 1040,
|
||||
AmazonRootCA4 = 1041,
|
||||
DigiCertAssuredIDRootG3 = 1042,
|
||||
DigiCertGlobalRootG3 = 1043,
|
||||
DigiCertTrustedRootG4 = 1044,
|
||||
EntrustRootCertificationAuthorityEC1 = 1045,
|
||||
EntrustRootCertificationAuthorityG4 = 1046,
|
||||
GlobalSignECCRootCAR4 = 1047,
|
||||
GlobalSignECCRootCAR5 = 1048,
|
||||
GlobalSignECCRootCAR6 = 1049,
|
||||
GTSRootR1 = 1050,
|
||||
GTSRootR2 = 1051,
|
||||
GTSRootR3 = 1052,
|
||||
GTSRootR4 = 1053,
|
||||
SecurityCommunicationRootCA = 1054,
|
||||
GlobalSignRootE4 = 1055,
|
||||
GlobalSignRootR4 = 1056,
|
||||
TTeleSecGlobalRootClass2 = 1057,
|
||||
DigiCertTLSECCP384RootG5 = 1058,
|
||||
DigiCertTLSRSA4096RootG5 = 1059,
|
||||
};
|
||||
|
||||
enum class TrustedCertStatus : s32 {
|
||||
Invalid = -1,
|
||||
Removed = 0,
|
||||
EnabledTrusted = 1,
|
||||
EnabledNotTrusted = 2,
|
||||
Revoked = 3,
|
||||
};
|
||||
|
||||
struct BuiltInCertificateInfo {
|
||||
CaCertificateId cert_id;
|
||||
TrustedCertStatus status;
|
||||
u64 der_size;
|
||||
u64 der_offset;
|
||||
};
|
||||
static_assert(sizeof(BuiltInCertificateInfo) == 0x18, "BuiltInCertificateInfo has incorrect size.");
|
||||
|
||||
struct CertStoreHeader {
|
||||
u32 magic;
|
||||
u32 num_entries;
|
||||
};
|
||||
static_assert(sizeof(CertStoreHeader) == 0x8, "CertStoreHeader has incorrect size.");
|
||||
|
||||
struct CertStoreEntry {
|
||||
CaCertificateId certificate_id;
|
||||
TrustedCertStatus certificate_status;
|
||||
u32 der_size;
|
||||
u32 der_offset;
|
||||
};
|
||||
static_assert(sizeof(CertStoreEntry) == 0x10, "CertStoreEntry has incorrect size.");
|
||||
|
||||
} // namespace Service::SSL
|
||||
@ -10,8 +10,6 @@
|
||||
#include "common/polyfill_thread.h"
|
||||
#include "common/thread.h"
|
||||
|
||||
#include "core/hle/service/vi/vsync_manager.h"
|
||||
|
||||
namespace Core {
|
||||
class System;
|
||||
}
|
||||
@ -28,6 +26,7 @@ namespace Service::VI {
|
||||
|
||||
class Container;
|
||||
class DisplayList;
|
||||
class VsyncManager;
|
||||
|
||||
class Conductor {
|
||||
public:
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
#include <common/scope_exit.h>
|
||||
|
||||
#include "common/polyfill_ranges.h"
|
||||
@ -176,9 +175,10 @@ void EmulatedController::LoadDevices() {
|
||||
if (npad_id_type == NpadIdType::Player1 || npad_id_type == NpadIdType::Handheld) {
|
||||
camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
|
||||
nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"};
|
||||
#ifndef ANDROID
|
||||
#ifdef HAVE_LIBUSB
|
||||
ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
|
||||
#else
|
||||
#endif
|
||||
#ifdef ANDROID
|
||||
android_params = Common::ParamPackage{"engine:android,port:100"};
|
||||
#endif
|
||||
}
|
||||
@ -1287,22 +1287,6 @@ bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationV
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!Settings::values.enable_accurate_vibrations.GetValue()) {
|
||||
using std::chrono::duration_cast;
|
||||
using std::chrono::milliseconds;
|
||||
using std::chrono::steady_clock;
|
||||
|
||||
const auto now = steady_clock::now();
|
||||
|
||||
// Filter out non-zero vibrations that are within 15ms of each other.
|
||||
if ((vibration.low_amplitude != 0.0f || vibration.high_amplitude != 0.0f) &&
|
||||
duration_cast<milliseconds>(now - last_vibration_timepoint[index]) < milliseconds(15)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
last_vibration_timepoint[index] = now;
|
||||
}
|
||||
|
||||
// Exponential amplification is too strong at low amplitudes. Switch to a linear
|
||||
// amplification if strength is set below 0.7f
|
||||
const Common::Input::VibrationAmplificationType type =
|
||||
|
||||
@ -583,7 +583,6 @@ private:
|
||||
std::size_t nfc_handles{0};
|
||||
std::array<VibrationValue, 2> last_vibration_value{DEFAULT_VIBRATION_VALUE,
|
||||
DEFAULT_VIBRATION_VALUE};
|
||||
std::array<std::chrono::steady_clock::time_point, 2> last_vibration_timepoint{};
|
||||
|
||||
// Temporary values to avoid doing changes while the controller is in configuring mode
|
||||
NpadStyleIndex tmp_npad_type{NpadStyleIndex::None};
|
||||
|
||||
@ -638,11 +638,7 @@ struct VibrationValue {
|
||||
if (low_amplitude != b.low_amplitude || high_amplitude != b.high_amplitude) {
|
||||
return false;
|
||||
}
|
||||
// Changes in frequency without amplitude don't have any effect
|
||||
if (low_amplitude == 0 && high_amplitude == 0) {
|
||||
return true;
|
||||
}
|
||||
if (low_frequency != b.low_frequency || high_frequency != b.high_frequency) {
|
||||
if (low_frequency != b.low_amplitude || high_frequency != b.high_frequency) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <chrono>
|
||||
#include <cstring>
|
||||
|
||||
#include "common/assert.h"
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
|
||||
#include <set>
|
||||
#include <common/settings_input.h>
|
||||
#include <common/thread.h>
|
||||
#include <jni.h>
|
||||
#include "common/android/android_common.h"
|
||||
#include "common/android/id_cache.h"
|
||||
@ -11,18 +10,7 @@
|
||||
|
||||
namespace InputCommon {
|
||||
|
||||
Android::Android(std::string input_engine_) : InputEngine(std::move(input_engine_)) {
|
||||
vibration_thread = std::jthread([this](std::stop_token token) {
|
||||
Common::SetCurrentThreadName("Android_Vibration");
|
||||
auto env = Common::Android::GetEnvForThread();
|
||||
using namespace std::chrono_literals;
|
||||
while (!token.stop_requested()) {
|
||||
SendVibrations(env, token);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Android::~Android() = default;
|
||||
Android::Android(std::string input_engine_) : InputEngine(std::move(input_engine_)) {}
|
||||
|
||||
void Android::RegisterController(jobject j_input_device) {
|
||||
auto env = Common::Android::GetEnvForThread();
|
||||
@ -69,11 +57,17 @@ void Android::SetMotionState(std::string guid, size_t port, u64 delta_timestamp,
|
||||
Common::Input::DriverResult Android::SetVibration(
|
||||
[[maybe_unused]] const PadIdentifier& identifier,
|
||||
[[maybe_unused]] const Common::Input::VibrationStatus& vibration) {
|
||||
vibration_queue.Push(VibrationRequest{
|
||||
.identifier = identifier,
|
||||
.vibration = vibration,
|
||||
});
|
||||
return Common::Input::DriverResult::Success;
|
||||
auto device = input_devices.find(identifier);
|
||||
if (device != input_devices.end()) {
|
||||
Common::Android::RunJNIOnFiber<void>([&](JNIEnv* env) {
|
||||
float average_intensity =
|
||||
static_cast<float>((vibration.high_amplitude + vibration.low_amplitude) / 2.0);
|
||||
env->CallVoidMethod(device->second, Common::Android::GetYuzuDeviceVibrate(),
|
||||
average_intensity);
|
||||
});
|
||||
return Common::Input::DriverResult::Success;
|
||||
}
|
||||
return Common::Input::DriverResult::NotSupported;
|
||||
}
|
||||
|
||||
bool Android::IsVibrationEnabled([[maybe_unused]] const PadIdentifier& identifier) {
|
||||
@ -353,15 +347,4 @@ PadIdentifier Android::GetIdentifier(const std::string& guid, size_t port) const
|
||||
};
|
||||
}
|
||||
|
||||
void Android::SendVibrations(JNIEnv* env, std::stop_token token) {
|
||||
VibrationRequest request = vibration_queue.PopWait(token);
|
||||
auto device = input_devices.find(request.identifier);
|
||||
if (device != input_devices.end()) {
|
||||
float average_intensity = static_cast<float>(
|
||||
(request.vibration.high_amplitude + request.vibration.low_amplitude) / 2.0);
|
||||
env->CallVoidMethod(device->second, Common::Android::GetYuzuDeviceVibrate(),
|
||||
average_intensity);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace InputCommon
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <set>
|
||||
#include <common/threadsafe_queue.h>
|
||||
#include <jni.h>
|
||||
#include "input_common/input_engine.h"
|
||||
|
||||
@ -17,8 +16,6 @@ class Android final : public InputEngine {
|
||||
public:
|
||||
explicit Android(std::string input_engine_);
|
||||
|
||||
~Android() override;
|
||||
|
||||
/**
|
||||
* Registers controller number to accept new inputs.
|
||||
* @param j_input_device YuzuInputDevice object from the Android frontend to register.
|
||||
@ -92,9 +89,6 @@ private:
|
||||
/// Returns the correct identifier corresponding to the player index
|
||||
PadIdentifier GetIdentifier(const std::string& guid, size_t port) const;
|
||||
|
||||
/// Takes all vibrations from the queue and sends the command to the controller
|
||||
void SendVibrations(JNIEnv* env, std::stop_token token);
|
||||
|
||||
static constexpr s32 AXIS_X = 0;
|
||||
static constexpr s32 AXIS_Y = 1;
|
||||
static constexpr s32 AXIS_Z = 11;
|
||||
@ -135,14 +129,12 @@ private:
|
||||
const std::string redmagic_vid{"3537"};
|
||||
const std::string backbone_labs_vid{"358a"};
|
||||
const std::string xbox_vid{"045e"};
|
||||
const std::vector<std::string> flipped_ab_vids{sony_vid, nintendo_vid, razer_vid,
|
||||
redmagic_vid, backbone_labs_vid, xbox_vid};
|
||||
const std::vector<std::string> flipped_xy_vids{sony_vid, razer_vid, redmagic_vid,
|
||||
backbone_labs_vid, xbox_vid};
|
||||
|
||||
/// Queue of vibration request to controllers
|
||||
Common::SPSCQueue<VibrationRequest> vibration_queue;
|
||||
std::jthread vibration_thread;
|
||||
const std::string eightbitdo_vid{"2dc8"};
|
||||
const std::vector<std::string> flipped_ab_vids{sony_vid, nintendo_vid, razer_vid,
|
||||
redmagic_vid, backbone_labs_vid, xbox_vid,
|
||||
eightbitdo_vid};
|
||||
const std::vector<std::string> flipped_xy_vids{sony_vid, razer_vid, redmagic_vid,
|
||||
backbone_labs_vid, xbox_vid, eightbitdo_vid};
|
||||
};
|
||||
|
||||
} // namespace InputCommon
|
||||
|
||||
@ -69,6 +69,11 @@ public:
|
||||
bool IsVibrationEnabled(const PadIdentifier& identifier) override;
|
||||
|
||||
private:
|
||||
struct VibrationRequest {
|
||||
PadIdentifier identifier;
|
||||
Common::Input::VibrationStatus vibration;
|
||||
};
|
||||
|
||||
void InitJoystick(int joystick_index);
|
||||
void CloseJoystick(SDL_Joystick* sdl_joystick);
|
||||
|
||||
|
||||
@ -46,11 +46,6 @@ enum class EngineInputType {
|
||||
Nfc,
|
||||
};
|
||||
|
||||
struct VibrationRequest {
|
||||
PadIdentifier identifier;
|
||||
Common::Input::VibrationStatus vibration;
|
||||
};
|
||||
|
||||
namespace std {
|
||||
// Hash used to create lists from PadIdentifier data
|
||||
template <>
|
||||
|
||||
@ -216,11 +216,14 @@ void DrawManager::DrawTexture() {
|
||||
const bool lower_left{regs.window_origin.mode !=
|
||||
Maxwell3D::Regs::WindowOrigin::Mode::UpperLeft};
|
||||
if (lower_left) {
|
||||
draw_texture_state.dst_y0 =
|
||||
static_cast<f32>(regs.surface_clip.height) - draw_texture_state.dst_y0;
|
||||
draw_texture_state.dst_y0 -= dst_height;
|
||||
}
|
||||
draw_texture_state.dst_x1 = draw_texture_state.dst_x0 + dst_width;
|
||||
draw_texture_state.dst_y1 = draw_texture_state.dst_y0 + dst_height;
|
||||
draw_texture_state.dst_x1 =
|
||||
draw_texture_state.dst_x0 +
|
||||
static_cast<f32>(Settings::values.resolution_info.ScaleUp(static_cast<u32>(dst_width)));
|
||||
draw_texture_state.dst_y1 =
|
||||
draw_texture_state.dst_y0 +
|
||||
static_cast<f32>(Settings::values.resolution_info.ScaleUp(static_cast<u32>(dst_height)));
|
||||
draw_texture_state.src_x0 = static_cast<float>(regs.draw_texture.src_x0) / 4096.f;
|
||||
draw_texture_state.src_y0 = static_cast<float>(regs.draw_texture.src_y0) / 4096.f;
|
||||
draw_texture_state.src_x1 =
|
||||
|
||||
@ -370,32 +370,27 @@ void RasterizerOpenGL::DrawTexture() {
|
||||
const auto& sampler = texture_cache.GetGraphicsSampler(draw_texture_state.src_sampler);
|
||||
const auto& texture = texture_cache.GetImageView(draw_texture_state.src_texture);
|
||||
|
||||
const auto Scale = [&](auto dim) -> s32 {
|
||||
return Settings::values.resolution_info.ScaleUp(static_cast<s32>(dim));
|
||||
};
|
||||
|
||||
Region2D dst_region = {
|
||||
Offset2D{.x = Scale(draw_texture_state.dst_x0), .y = Scale(draw_texture_state.dst_y0)},
|
||||
Offset2D{.x = Scale(draw_texture_state.dst_x1), .y = Scale(draw_texture_state.dst_y1)}};
|
||||
Region2D src_region = {
|
||||
Offset2D{.x = Scale(draw_texture_state.src_x0), .y = Scale(draw_texture_state.src_y0)},
|
||||
Offset2D{.x = Scale(draw_texture_state.src_x1), .y = Scale(draw_texture_state.src_y1)}};
|
||||
Extent3D src_size = {static_cast<u32>(Scale(texture.size.width)),
|
||||
static_cast<u32>(Scale(texture.size.height)), texture.size.depth};
|
||||
|
||||
if (device.HasDrawTexture()) {
|
||||
state_tracker.BindFramebuffer(texture_cache.GetFramebuffer()->Handle());
|
||||
|
||||
glDrawTextureNV(texture.DefaultHandle(), sampler->Handle(),
|
||||
static_cast<f32>(dst_region.start.x), static_cast<f32>(dst_region.start.y),
|
||||
static_cast<f32>(dst_region.end.x), static_cast<f32>(dst_region.end.y), 0,
|
||||
glDrawTextureNV(texture.DefaultHandle(), sampler->Handle(), draw_texture_state.dst_x0,
|
||||
draw_texture_state.dst_y0, draw_texture_state.dst_x1,
|
||||
draw_texture_state.dst_y1, 0,
|
||||
draw_texture_state.src_x0 / static_cast<float>(texture.size.width),
|
||||
draw_texture_state.src_y0 / static_cast<float>(texture.size.height),
|
||||
draw_texture_state.src_x1 / static_cast<float>(texture.size.width),
|
||||
draw_texture_state.src_y1 / static_cast<float>(texture.size.height));
|
||||
} else {
|
||||
Region2D dst_region = {Offset2D{.x = static_cast<s32>(draw_texture_state.dst_x0),
|
||||
.y = static_cast<s32>(draw_texture_state.dst_y0)},
|
||||
Offset2D{.x = static_cast<s32>(draw_texture_state.dst_x1),
|
||||
.y = static_cast<s32>(draw_texture_state.dst_y1)}};
|
||||
Region2D src_region = {Offset2D{.x = static_cast<s32>(draw_texture_state.src_x0),
|
||||
.y = static_cast<s32>(draw_texture_state.src_y0)},
|
||||
Offset2D{.x = static_cast<s32>(draw_texture_state.src_x1),
|
||||
.y = static_cast<s32>(draw_texture_state.src_y1)}};
|
||||
blit_image.BlitColor(texture_cache.GetFramebuffer()->Handle(), texture.DefaultHandle(),
|
||||
sampler->Handle(), dst_region, src_region, src_size);
|
||||
sampler->Handle(), dst_region, src_region, texture.size);
|
||||
state_tracker.InvalidateState();
|
||||
}
|
||||
|
||||
|
||||
@ -125,23 +125,11 @@ VkRect2D GetScissorState(const Maxwell& regs, size_t index, u32 up_scale = 1, u3
|
||||
return value < 0 ? std::min<s32>(converted_value - acumm, -1)
|
||||
: std::max<s32>(converted_value + acumm, 1);
|
||||
};
|
||||
|
||||
const bool lower_left = regs.window_origin.mode != Maxwell::WindowOrigin::Mode::UpperLeft;
|
||||
const s32 clip_height = regs.surface_clip.height;
|
||||
|
||||
// Flip coordinates if lower left
|
||||
s32 min_y = lower_left ? (clip_height - src.max_y) : src.min_y.Value();
|
||||
s32 max_y = lower_left ? (clip_height - src.min_y) : src.max_y.Value();
|
||||
|
||||
// Bound to render area
|
||||
min_y = std::max(min_y, 0);
|
||||
max_y = std::max(max_y, 0);
|
||||
|
||||
if (src.enable) {
|
||||
scissor.offset.x = scale_up(src.min_x);
|
||||
scissor.offset.y = scale_up(min_y);
|
||||
scissor.offset.x = scale_up(static_cast<s32>(src.min_x));
|
||||
scissor.offset.y = scale_up(static_cast<s32>(src.min_y));
|
||||
scissor.extent.width = scale_up(src.max_x - src.min_x);
|
||||
scissor.extent.height = scale_up(max_y - min_y);
|
||||
scissor.extent.height = scale_up(src.max_y - src.min_y);
|
||||
} else {
|
||||
scissor.offset.x = 0;
|
||||
scissor.offset.y = 0;
|
||||
@ -320,33 +308,17 @@ void RasterizerVulkan::DrawTexture() {
|
||||
const auto& draw_texture_state = maxwell3d->draw_manager->GetDrawTextureState();
|
||||
const auto& sampler = texture_cache.GetGraphicsSampler(draw_texture_state.src_sampler);
|
||||
const auto& texture = texture_cache.GetImageView(draw_texture_state.src_texture);
|
||||
const auto* framebuffer = texture_cache.GetFramebuffer();
|
||||
|
||||
const bool src_rescaling = texture_cache.IsRescaling() && texture.IsRescaled();
|
||||
const bool dst_rescaling = texture_cache.IsRescaling() && framebuffer->IsRescaled();
|
||||
|
||||
const auto ScaleSrc = [&](auto dim_f) -> s32 {
|
||||
auto dim = static_cast<s32>(dim_f);
|
||||
return src_rescaling ? Settings::values.resolution_info.ScaleUp(dim) : dim;
|
||||
};
|
||||
|
||||
const auto ScaleDst = [&](auto dim_f) -> s32 {
|
||||
auto dim = static_cast<s32>(dim_f);
|
||||
return dst_rescaling ? Settings::values.resolution_info.ScaleUp(dim) : dim;
|
||||
};
|
||||
|
||||
Region2D dst_region = {Offset2D{.x = ScaleDst(draw_texture_state.dst_x0),
|
||||
.y = ScaleDst(draw_texture_state.dst_y0)},
|
||||
Offset2D{.x = ScaleDst(draw_texture_state.dst_x1),
|
||||
.y = ScaleDst(draw_texture_state.dst_y1)}};
|
||||
Region2D src_region = {Offset2D{.x = ScaleSrc(draw_texture_state.src_x0),
|
||||
.y = ScaleSrc(draw_texture_state.src_y0)},
|
||||
Offset2D{.x = ScaleSrc(draw_texture_state.src_x1),
|
||||
.y = ScaleSrc(draw_texture_state.src_y1)}};
|
||||
Extent3D src_size = {static_cast<u32>(ScaleSrc(texture.size.width)),
|
||||
static_cast<u32>(ScaleSrc(texture.size.height)), texture.size.depth};
|
||||
blit_image.BlitColor(framebuffer, texture.RenderTarget(), texture.ImageHandle(),
|
||||
sampler->Handle(), dst_region, src_region, src_size);
|
||||
Region2D dst_region = {Offset2D{.x = static_cast<s32>(draw_texture_state.dst_x0),
|
||||
.y = static_cast<s32>(draw_texture_state.dst_y0)},
|
||||
Offset2D{.x = static_cast<s32>(draw_texture_state.dst_x1),
|
||||
.y = static_cast<s32>(draw_texture_state.dst_y1)}};
|
||||
Region2D src_region = {Offset2D{.x = static_cast<s32>(draw_texture_state.src_x0),
|
||||
.y = static_cast<s32>(draw_texture_state.src_y0)},
|
||||
Offset2D{.x = static_cast<s32>(draw_texture_state.src_x1),
|
||||
.y = static_cast<s32>(draw_texture_state.src_y1)}};
|
||||
blit_image.BlitColor(texture_cache.GetFramebuffer(), texture.RenderTarget(),
|
||||
texture.ImageHandle(), sampler->Handle(), dst_region, src_region,
|
||||
texture.size);
|
||||
}
|
||||
|
||||
void RasterizerVulkan::Clear(u32 layer_count) {
|
||||
|
||||
@ -1962,22 +1962,21 @@ Framebuffer::Framebuffer(TextureCacheRuntime& runtime, std::span<ImageView*, NUM
|
||||
}
|
||||
|
||||
Framebuffer::Framebuffer(TextureCacheRuntime& runtime, ImageView* color_buffer,
|
||||
ImageView* depth_buffer, VkExtent2D extent, bool is_rescaled_)
|
||||
ImageView* depth_buffer, VkExtent2D extent, bool is_rescaled)
|
||||
: render_area{extent} {
|
||||
std::array<ImageView*, NUM_RT> color_buffers{color_buffer};
|
||||
CreateFramebuffer(runtime, color_buffers, depth_buffer, is_rescaled_);
|
||||
CreateFramebuffer(runtime, color_buffers, depth_buffer, is_rescaled);
|
||||
}
|
||||
|
||||
Framebuffer::~Framebuffer() = default;
|
||||
|
||||
void Framebuffer::CreateFramebuffer(TextureCacheRuntime& runtime,
|
||||
std::span<ImageView*, NUM_RT> color_buffers,
|
||||
ImageView* depth_buffer, bool is_rescaled_) {
|
||||
ImageView* depth_buffer, bool is_rescaled) {
|
||||
boost::container::small_vector<VkImageView, NUM_RT + 1> attachments;
|
||||
RenderPassKey renderpass_key{};
|
||||
s32 num_layers = 1;
|
||||
|
||||
is_rescaled = is_rescaled_;
|
||||
const auto& resolution = runtime.resolution;
|
||||
|
||||
u32 width = std::numeric_limits<u32>::max();
|
||||
|
||||
@ -361,10 +361,6 @@ public:
|
||||
return has_stencil;
|
||||
}
|
||||
|
||||
[[nodiscard]] bool IsRescaled() const noexcept {
|
||||
return is_rescaled;
|
||||
}
|
||||
|
||||
private:
|
||||
vk::Framebuffer framebuffer;
|
||||
VkRenderPass renderpass{};
|
||||
@ -377,7 +373,6 @@ private:
|
||||
std::array<size_t, NUM_RT> rt_map{};
|
||||
bool has_depth{};
|
||||
bool has_stencil{};
|
||||
bool is_rescaled{};
|
||||
};
|
||||
|
||||
struct TextureCacheParams {
|
||||
|
||||
@ -59,7 +59,9 @@ void ConfigureApplets::Setup(const ConfigurationShared::Builder& builder) {
|
||||
|
||||
// Untested applets
|
||||
if (setting->Id() == Settings::values.data_erase_applet_mode.Id() ||
|
||||
setting->Id() == Settings::values.error_applet_mode.Id() ||
|
||||
setting->Id() == Settings::values.net_connect_applet_mode.Id() ||
|
||||
setting->Id() == Settings::values.web_applet_mode.Id() ||
|
||||
setting->Id() == Settings::values.shop_applet_mode.Id() ||
|
||||
setting->Id() == Settings::values.login_share_applet_mode.Id() ||
|
||||
setting->Id() == Settings::values.wifi_web_auth_applet_mode.Id() ||
|
||||
|
||||
@ -3010,6 +3010,9 @@ bool GMainWindow::MakeShortcutIcoPath(const u64 program_id, const std::string_vi
|
||||
|
||||
void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& game_path,
|
||||
GameListShortcutTarget target) {
|
||||
std::string game_title;
|
||||
QString qt_game_title;
|
||||
std::filesystem::path out_icon_path;
|
||||
// Get path to yuzu executable
|
||||
const QStringList args = QApplication::arguments();
|
||||
std::filesystem::path yuzu_command = args[0].toStdString();
|
||||
@ -3026,51 +3029,48 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga
|
||||
shortcut_path =
|
||||
QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation).toStdString();
|
||||
}
|
||||
|
||||
if (!std::filesystem::exists(shortcut_path)) {
|
||||
GMainWindow::CreateShortcutMessagesGUI(
|
||||
this, GMainWindow::CREATE_SHORTCUT_MSGBOX_ERROR,
|
||||
QString::fromStdString(shortcut_path.generic_string()));
|
||||
LOG_ERROR(Frontend, "Invalid shortcut target {}", shortcut_path.generic_string());
|
||||
// Icon path and title
|
||||
if (std::filesystem::exists(shortcut_path)) {
|
||||
// Get title from game file
|
||||
const FileSys::PatchManager pm{program_id, system->GetFileSystemController(),
|
||||
system->GetContentProvider()};
|
||||
const auto control = pm.GetControlMetadata();
|
||||
const auto loader =
|
||||
Loader::GetLoader(*system, vfs->OpenFile(game_path, FileSys::OpenMode::Read));
|
||||
game_title = fmt::format("{:016X}", program_id);
|
||||
if (control.first != nullptr) {
|
||||
game_title = control.first->GetApplicationName();
|
||||
} else {
|
||||
loader->ReadTitle(game_title);
|
||||
}
|
||||
// Delete illegal characters from title
|
||||
const std::string illegal_chars = "<>:\"/\\|?*.";
|
||||
for (auto it = game_title.rbegin(); it != game_title.rend(); ++it) {
|
||||
if (illegal_chars.find(*it) != std::string::npos) {
|
||||
game_title.erase(it.base() - 1);
|
||||
}
|
||||
}
|
||||
qt_game_title = QString::fromStdString(game_title);
|
||||
// Get icon from game file
|
||||
std::vector<u8> icon_image_file{};
|
||||
if (control.second != nullptr) {
|
||||
icon_image_file = control.second->ReadAllBytes();
|
||||
} else if (loader->ReadIcon(icon_image_file) != Loader::ResultStatus::Success) {
|
||||
LOG_WARNING(Frontend, "Could not read icon from {:s}", game_path);
|
||||
}
|
||||
QImage icon_data =
|
||||
QImage::fromData(icon_image_file.data(), static_cast<int>(icon_image_file.size()));
|
||||
if (GMainWindow::MakeShortcutIcoPath(program_id, game_title, out_icon_path)) {
|
||||
if (!SaveIconToFile(out_icon_path, icon_data)) {
|
||||
LOG_ERROR(Frontend, "Could not write icon to file");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
GMainWindow::CreateShortcutMessagesGUI(this, GMainWindow::CREATE_SHORTCUT_MSGBOX_ERROR,
|
||||
qt_game_title);
|
||||
LOG_ERROR(Frontend, "Invalid shortcut target");
|
||||
return;
|
||||
}
|
||||
|
||||
// Get title from game file
|
||||
const FileSys::PatchManager pm{program_id, system->GetFileSystemController(),
|
||||
system->GetContentProvider()};
|
||||
const auto control = pm.GetControlMetadata();
|
||||
const auto loader =
|
||||
Loader::GetLoader(*system, vfs->OpenFile(game_path, FileSys::OpenMode::Read));
|
||||
std::string game_title = fmt::format("{:016X}", program_id);
|
||||
if (control.first != nullptr) {
|
||||
game_title = control.first->GetApplicationName();
|
||||
} else {
|
||||
loader->ReadTitle(game_title);
|
||||
}
|
||||
// Delete illegal characters from title
|
||||
const std::string illegal_chars = "<>:\"/\\|?*.";
|
||||
for (auto it = game_title.rbegin(); it != game_title.rend(); ++it) {
|
||||
if (illegal_chars.find(*it) != std::string::npos) {
|
||||
game_title.erase(it.base() - 1);
|
||||
}
|
||||
}
|
||||
const QString qt_game_title = QString::fromStdString(game_title);
|
||||
// Get icon from game file
|
||||
std::vector<u8> icon_image_file{};
|
||||
if (control.second != nullptr) {
|
||||
icon_image_file = control.second->ReadAllBytes();
|
||||
} else if (loader->ReadIcon(icon_image_file) != Loader::ResultStatus::Success) {
|
||||
LOG_WARNING(Frontend, "Could not read icon from {:s}", game_path);
|
||||
}
|
||||
QImage icon_data =
|
||||
QImage::fromData(icon_image_file.data(), static_cast<int>(icon_image_file.size()));
|
||||
std::filesystem::path out_icon_path;
|
||||
if (GMainWindow::MakeShortcutIcoPath(program_id, game_title, out_icon_path)) {
|
||||
if (!SaveIconToFile(out_icon_path, icon_data)) {
|
||||
LOG_ERROR(Frontend, "Could not write icon to file");
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(__linux__)
|
||||
// Special case for AppImages
|
||||
// Warn once if we are making a shortcut to a volatile AppImage
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/bash -ex
|
||||
|
||||
# SPDX-FileCopyrightText: 2024 yuzu Emulator Project
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
git submodule sync
|
||||
git submodule foreach --recursive git reset --hard
|
||||
git submodule update --init --recursive
|
||||
Reference in New Issue
Block a user