2 Commits

Author SHA1 Message Date
e3a2bcfb47 fix padding 2023-06-06 18:16:26 -06:00
d2bb8b04ac Implement missing services for homebrew 2023-06-06 18:16:23 -06:00
7 changed files with 226 additions and 109 deletions

View File

@ -281,10 +281,10 @@ static_assert(sizeof(ProcessorState) == 0xE20, "ProcessorState is an invalid siz
// This is nn::irsensor::detail::DeviceFormat
struct DeviceFormat {
Core::IrSensor::IrCameraStatus camera_status{Core::IrSensor::IrCameraStatus::Available};
Core::IrSensor::IrCameraStatus camera_status{Core::IrSensor::IrCameraStatus::Unconnected};
Core::IrSensor::IrCameraInternalStatus camera_internal_status{
Core::IrSensor::IrCameraInternalStatus::Stopped};
Core::IrSensor::IrSensorMode mode{Core::IrSensor::IrSensorMode::ImageTransferProcessor};
Core::IrSensor::IrCameraInternalStatus::Ready};
Core::IrSensor::IrSensorMode mode{Core::IrSensor::IrSensorMode::None};
ProcessorState state{};
};
static_assert(sizeof(DeviceFormat) == 0xE30, "DeviceFormat is an invalid size");

View File

@ -296,7 +296,7 @@ void IRS::RunTeraPluginProcessor(HLERequestContext& ctx) {
if (result.IsSuccess()) {
auto& device = GetIrCameraSharedMemoryDeviceEntry(parameters.camera_handle);
MakeProcessorWithCoreContext<TeraPluginProcessor>(parameters.camera_handle, device);
MakeProcessor<TeraPluginProcessor>(parameters.camera_handle, device);
auto& image_transfer_processor =
GetProcessor<TeraPluginProcessor>(parameters.camera_handle);
image_transfer_processor.SetConfig(parameters.processor_config);

View File

@ -1,103 +1,29 @@
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
#include "core/hid/emulated_controller.h"
#include "core/hid/hid_core.h"
#include "core/hle/service/hid/irsensor/tera_plugin_processor.h"
namespace Service::IRS {
TeraPluginProcessor::TeraPluginProcessor(Core::HID::HIDCore& hid_core_,
Core::IrSensor::DeviceFormat& device_format,
std::size_t npad_index)
: device{device_format} {
npad_device = hid_core_.GetEmulatedControllerByIndex(npad_index);
TeraPluginProcessor::TeraPluginProcessor(Core::IrSensor::DeviceFormat& device_format)
: device(device_format) {
device.mode = Core::IrSensor::IrSensorMode::TeraPluginProcessor;
device.camera_status = Core::IrSensor::IrCameraStatus::Unconnected;
device.camera_internal_status = Core::IrSensor::IrCameraInternalStatus::Stopped;
shared_memory = std::construct_at(
reinterpret_cast<TeraSharedMemory*>(&device_format.state.processor_raw_data));
Core::HID::ControllerUpdateCallback engine_callback{
.on_change = [this](Core::HID::ControllerTriggerType type) { OnControllerUpdate(type); },
.is_npad_service = true,
};
callback_key = npad_device->SetCallback(engine_callback);
}
TeraPluginProcessor::~TeraPluginProcessor() {
npad_device->DeleteCallback(callback_key);
};
TeraPluginProcessor::~TeraPluginProcessor() = default;
void TeraPluginProcessor::StartProcessor() {
device.camera_status = Core::IrSensor::IrCameraStatus::Available;
device.camera_internal_status = Core::IrSensor::IrCameraInternalStatus::Ready;
}
void TeraPluginProcessor::StartProcessor() {}
void TeraPluginProcessor::SuspendProcessor() {}
void TeraPluginProcessor::StopProcessor() {}
void TeraPluginProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType type) {
if (type != Core::HID::ControllerTriggerType::IrSensor) {
return;
}
next_state = {};
const auto camera_data = npad_device->GetCamera();
auto filtered_image = camera_data.data;
memcpy(next_state.data.data(), filtered_image.data(), GetDataSize(format));
// These 4 bytes seem to control the brightness of a image
next_state.data[0] = 1;
next_state.data[1] = 2;
next_state.data[2] = 0xde;
next_state.data[3] = 0x07;
// Data from HW
/* next_state.data = {
0x01, 0x02, 0xde, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x48, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4,
0x41, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x13, 0x13, 0x00, 0x00, 0x06, 0x00, 0xc0, 0x28,
0x00, 0x00, 0x00, 0x00, 0x98, 0x00, 0x00, 0x3c, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00,
0x00, 0x00, 0x00, 0x20, 0xa8, 0x09, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x04,
0x12, 0x41, 0x00, 0x00, 0x13, 0x86, 0x02, 0x00, 0x00, 0x00, 0x1e, 0xc0, 0x02, 0x00, 0x00, 0x00,
0x40, 0x0f, 0x00, 0x00, 0x00, 0x30, 0xcd, 0x34, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00,
0x00, 0x10, 0xa4, 0x01, 0x00, 0x00, 0x00, 0x20, 0x00, 0x02, 0x00, 0x00, 0x80, 0xf3, 0x01, 0x00,
0x00, 0x00, 0x00, 0x36, 0x08, 0x04, 0x60, 0x02, 0x00, 0x76, 0x80, 0x09, 0x00, 0x00, 0x88, 0xd1,
0x20, 0x00, 0x00, 0x00, 0x65, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x80, 0x06, 0x00, 0x00, 0x00, 0x00,
0x28, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x00, 0x00, 0x40, 0x01, 0x68, 0x00, 0x00, 0x00,
0x80, 0xf2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x00, 0x00, 0x00,
0x04, 0x00, 0x00, 0x00, 0x04, 0x80, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x06, 0x06, 0x00,
0x00, 0x00, 0x04, 0xa0, 0x57, 0x02, 0x04, 0x40, 0x51, 0x02, 0x00, 0x40, 0xc1, 0x01, 0x00, 0x50,
0x86, 0x02, 0x00, 0x50, 0x0d, 0x04, 0x00, 0xb0, 0x05, 0x00, 0x00, 0x50, 0x04, 0x00, 0x00, 0xb0,
0x09, 0x00, 0x00, 0xb0, 0x01, 0xc0, 0x06, 0xc0, 0x0e, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0x20,
0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x20, 0x05, 0x00, 0x00, 0x80,
0x01, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x86, 0x01, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0x00,
0x00,
};*/
next_state.sampling_number = camera_data.sample;
next_state.timestamp = next_state.sampling_number + 131;
next_state.ambient_noise_level = Core::IrSensor::CameraAmbientNoiseLevel::Low;
shared_memory->tera_lifo.WriteNextEntry(next_state);
if (!IsProcessorActive()) {
StartProcessor();
}
}
void TeraPluginProcessor::SetConfig(Core::IrSensor::PackedTeraPluginProcessorConfig config) {
current_config.mode = config.mode;
current_config.unknown_1 = config.unknown_1;
current_config.unknown_2 = config.unknown_2;
current_config.unknown_3 = config.unknown_3;
LOG_ERROR(Service_IRS, "{} {} {} {}", config.mode, config.unknown_1, config.unknown_2,
config.unknown_3);
npad_device->SetCameraFormat(format);
}
} // namespace Service::IRS

View File

@ -3,21 +3,15 @@
#pragma once
#include "common/bit_field.h"
#include "common/common_types.h"
#include "core/hid/irs_types.h"
#include "core/hle/service/hid/irs_ring_lifo.h"
#include "core/hle/service/hid/irsensor/processor_base.h"
namespace Core::HID {
class EmulatedController;
} // namespace Core::HID
namespace Service::IRS {
class TeraPluginProcessor final : public ProcessorBase {
public:
explicit TeraPluginProcessor(Core::HID::HIDCore& hid_core_,
Core::IrSensor::DeviceFormat& device_format,
std::size_t npad_index);
explicit TeraPluginProcessor(Core::IrSensor::DeviceFormat& device_format);
~TeraPluginProcessor() override;
// Called when the processor is initialized
@ -33,10 +27,6 @@ public:
void SetConfig(Core::IrSensor::PackedTeraPluginProcessorConfig config);
private:
static constexpr auto format = Core::IrSensor::ImageTransferProcessorFormat::Size20x15;
static constexpr std::size_t width = 40;
static constexpr std::size_t height = 30;
// This is nn::irsensor::TeraPluginProcessorConfig
struct TeraPluginProcessorConfig {
u8 mode;
@ -56,22 +46,8 @@ private:
static_assert(sizeof(TeraPluginProcessorState) == 0x140,
"TeraPluginProcessorState is an invalid size");
struct TeraSharedMemory {
Service::IRS::Lifo<TeraPluginProcessorState, 6> tera_lifo;
static_assert(sizeof(tera_lifo) == 0x790, "tera_lifo is an invalid size");
INSERT_PADDING_WORDS(0x1A4);
};
static_assert(sizeof(TeraSharedMemory) == 0xE20, "TeraSharedMemory is an invalid size");
void OnControllerUpdate(Core::HID::ControllerTriggerType type);
TeraSharedMemory* shared_memory = nullptr;
TeraPluginProcessorState next_state{};
TeraPluginProcessorConfig current_config{};
Core::IrSensor::DeviceFormat& device;
Core::HID::EmulatedController* npad_device;
int callback_key{};
};
} // namespace Service::IRS

View File

@ -3,6 +3,7 @@
#include "common/logging/log.h"
#include "common/settings.h"
#include "common/uuid.h"
#include "core/core.h"
#include "core/file_sys/control_metadata.h"
#include "core/file_sys/patch_manager.h"
@ -548,6 +549,84 @@ IDownloadTaskInterface::IDownloadTaskInterface(Core::System& system_)
IDownloadTaskInterface::~IDownloadTaskInterface() = default;
IReadOnlyApplicationControlDataInterface::IReadOnlyApplicationControlDataInterface(
Core::System& system_)
: ServiceFramework{system_, "IReadOnlyApplicationControlDataInterface"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, &IReadOnlyApplicationControlDataInterface::GetApplicationControlData, "GetApplicationControlData"},
{1, nullptr, "GetApplicationDesiredLanguage"},
{2, nullptr, "ConvertApplicationLanguageToLanguageCode"},
{3, nullptr, "ConvertLanguageCodeToApplicationLanguage"},
{4, nullptr, "SelectApplicationDesiredLanguage"},
};
// clang-format on
RegisterHandlers(functions);
}
IReadOnlyApplicationControlDataInterface::~IReadOnlyApplicationControlDataInterface() = default;
void IReadOnlyApplicationControlDataInterface::GetApplicationControlData(
Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
const auto flag = rp.PopRaw<u64>();
LOG_DEBUG(Service_NS, "called with flag={:016X}", flag);
const auto title_id = rp.PopRaw<u64>();
const auto size = ctx.GetWriteBufferSize();
const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
system.GetContentProvider()};
const auto control = pm.GetControlMetadata();
std::vector<u8> out;
if (control.first != nullptr) {
if (size < 0x4000) {
LOG_ERROR(Service_NS,
"output buffer is too small! (actual={:016X}, expected_min=0x4000)", size);
IPC::ResponseBuilder rb{ctx, 2};
// TODO(DarkLordZach): Find a better error code for this.
rb.Push(ResultUnknown);
return;
}
out.resize(0x4000);
const auto bytes = control.first->GetRawBytes();
std::memcpy(out.data(), bytes.data(), bytes.size());
} else {
LOG_WARNING(Service_NS, "missing NACP data for title_id={:016X}, defaulting to zeros.",
title_id);
out.resize(std::min<u64>(0x4000, size));
}
if (control.second != nullptr) {
if (size < 0x4000 + control.second->GetSize()) {
LOG_ERROR(Service_NS,
"output buffer is too small! (actual={:016X}, expected_min={:016X})", size,
0x4000 + control.second->GetSize());
IPC::ResponseBuilder rb{ctx, 2};
// TODO(DarkLordZach): Find a better error code for this.
rb.Push(ResultUnknown);
return;
}
out.resize(0x4000 + control.second->GetSize());
control.second->Read(out.data() + 0x4000, control.second->GetSize());
} else {
LOG_WARNING(Service_NS, "missing icon data for title_id={:016X}, defaulting to zeros.",
title_id);
}
ctx.WriteBuffer(out);
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(ResultSuccess);
rb.Push<u32>(static_cast<u32>(out.size()));
}
IECommerceInterface::IECommerceInterface(Core::System& system_)
: ServiceFramework{system_, "IECommerceInterface"} {
// clang-format off
@ -785,6 +864,79 @@ private:
}
};
class PDM_QRY final : public ServiceFramework<PDM_QRY> {
public:
explicit PDM_QRY(Core::System& system_) : ServiceFramework{system_, "pdm:qry"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "QueryAppletEvent"},
{1, nullptr, "QueryPlayStatistics"},
{2, nullptr, "QueryPlayStatisticsByUserAccountId"},
{3, nullptr, "QueryPlayStatisticsByNetworkServiceAccountId"},
{4, nullptr, "QueryPlayStatisticsByApplicationId"},
{5, &PDM_QRY::QueryPlayStatisticsByApplicationIdAndUserAccountId, "QueryPlayStatisticsByApplicationIdAndUserAccountId"},
{6, nullptr, "QueryPlayStatisticsByApplicationIdAndNetworkServiceAccountId"},
{7, nullptr, "QueryLastPlayTimeV0"},
{8, nullptr, "QueryPlayEvent"},
{9, nullptr, "GetAvailablePlayEventRange"},
{10, nullptr, "QueryAccountEvent"},
{11, nullptr, "QueryAccountPlayEvent"},
{12, nullptr, "GetAvailableAccountPlayEventRange"},
{13, nullptr, "QueryApplicationPlayStatisticsForSystemV0"},
{14, nullptr, "QueryRecentlyPlayedApplication"},
{15, nullptr, "GetRecentlyPlayedApplicationUpdateEvent"},
{16, nullptr, "QueryApplicationPlayStatisticsByUserAccountIdForSystemV0"},
{17, nullptr, "QueryLastPlayTime"},
{18, nullptr, "QueryApplicationPlayStatisticsForSystem"},
{19, nullptr, "QueryApplicationPlayStatisticsByUserAccountIdForSystem"},
};
// clang-format on
RegisterHandlers(functions);
}
~PDM_QRY() override = default;
private:
struct PlayStadistics {
u64 application_id; ///< ApplicationId.
u32 first_entry_index; ///< Entry index for the first time the application was played.
u32 first_timestampUser; ///< See PdmAppletEvent::timestampUser
u32 first_timestampNetwork; ///< See PdmAppletEvent::timestampNetwork
u32 last_entry_index; ///< Entry index for the last time the application was played.
u32 last_timestampUser; ///< See PdmAppletEvent::timestampUser
u32 last_timestampNetwork; ///< See PdmAppletEvent::timestampNetwork
u32 play_time_in_minutes;
u32 total_launches;
};
static_assert(sizeof(PlayStadistics) == 0x28, "PlayStadistics is an invalid size");
void QueryPlayStatisticsByApplicationIdAndUserAccountId(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
const auto unknown = rp.Pop<bool>();
const auto unknown2 = rp.Pop<bool>();
const auto application_id = rp.Pop<u64>();
const auto user_account_uid = rp.PopRaw<Common::UUID>();
PlayStadistics stadistics{
.application_id = application_id,
.play_time_in_minutes = 120,
.total_launches = 15,
};
LOG_WARNING(Service_NS,
"(STUBBED) called. unknown={}. application_id=0x{:016X}, user_account_uid=0x{}",
unknown, application_id, user_account_uid.Format());
IPC::ResponseBuilder rb{ctx, 12};
rb.Push(ResultSuccess);
rb.PushRaw(stadistics);
}
};
void LoopProcess(Core::System& system) {
auto server_manager = std::make_unique<ServerManager>(system);

View File

@ -61,6 +61,16 @@ public:
~IDownloadTaskInterface() override;
};
class IReadOnlyApplicationControlDataInterface final
: public ServiceFramework<IReadOnlyApplicationControlDataInterface> {
public:
explicit IReadOnlyApplicationControlDataInterface(Core::System& system_);
~IReadOnlyApplicationControlDataInterface() override;
private:
void GetApplicationControlData(Kernel::HLERequestContext& ctx);
};
class IECommerceInterface final : public ServiceFramework<IECommerceInterface> {
public:
explicit IECommerceInterface(Core::System& system_);

View File

@ -169,4 +169,57 @@ void PSM::OpenSession(HLERequestContext& ctx) {
rb.PushIpcInterface<IPsmSession>(system);
}
} // namespace Service::PTM
enum class ChargerType : u32 {
Unplugged = 0,
RegularCharger = 1,
LowPowerCharger = 2,
Unknown = 3,
};
u32 battery_charge_percentage{100}; // 100%
ChargerType charger_type{ChargerType::RegularCharger};
};
class TS final : public ServiceFramework<TS> {
public:
explicit TS(Core::System& system_) : ServiceFramework{system_, "ts"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "GetTemperatureRange"},
{1, nullptr, "GetTemperature"},
{2, nullptr, "SetMeasurementMode"},
{3, &TS::GetTemperatureMilliC, "GetTemperatureMilliC"},
{4, nullptr, "Unknown"},
};
// clang-format on
RegisterHandlers(functions);
}
~TS() override = default;
private:
enum class Location : u8 {
Internal,
External,
};
void GetTemperatureMilliC(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
const auto location = rp.PopEnum<Location>();
s32 temperature = 25000;
LOG_WARNING(Service_PSM, "called location={}, temperature={}",location, temperature);
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(ResultSuccess);
rb.Push(temperature);
}
};
void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
std::make_shared<PSM>(system)->InstallAsService(sm);
std::make_shared<TS>(system)->InstallAsService(sm);
}
} // namespace Service::PSM