Add /dev/dolphin for homebrew to get information about Dolphin

Adds a /dev/dolphin interface that can be used by
Dolphin-aware software to get information like the
real system time and the Dolphin version.
This commit is contained in:
Florian Bach 2019-11-01 23:30:30 +01:00
parent a7d4be79ae
commit 2d55a6b0b7
8 changed files with 189 additions and 2 deletions

View File

@ -212,6 +212,11 @@ void ConfigCache::RestoreConfig(SConfig* config)
static ConfigCache config_cache; static ConfigCache config_cache;
void SetEmulationSpeedReset(bool value)
{
config_cache.bSetEmulationSpeed = value;
}
static GPUDeterminismMode ParseGPUDeterminismMode(const std::string& mode) static GPUDeterminismMode ParseGPUDeterminismMode(const std::string& mode)
{ {
if (mode == "auto") if (mode == "auto")

View File

@ -12,6 +12,7 @@ struct WindowSystemInfo;
namespace BootManager namespace BootManager
{ {
bool BootCore(std::unique_ptr<BootParameters> parameters, const WindowSystemInfo& wsi); bool BootCore(std::unique_ptr<BootParameters> parameters, const WindowSystemInfo& wsi);
void SetEmulationSpeedReset(bool value);
// Synchronise Dolphin's configuration with the SYSCONF (which may have changed during emulation), // Synchronise Dolphin's configuration with the SYSCONF (which may have changed during emulation),
// and restore settings that were overriden by per-game INIs or for some other reason. // and restore settings that were overriden by per-game INIs or for some other reason.

View File

@ -320,6 +320,8 @@ add_library(core
IOS/Device.h IOS/Device.h
IOS/DeviceStub.cpp IOS/DeviceStub.cpp
IOS/DeviceStub.h IOS/DeviceStub.h
IOS/DolphinDevice.cpp
IOS/DolphinDevice.h
IOS/IOS.cpp IOS/IOS.cpp
IOS/IOS.h IOS/IOS.h
IOS/IOSC.cpp IOS/IOSC.cpp

View File

@ -197,6 +197,7 @@
<ClCompile Include="HW\WiiSave.cpp" /> <ClCompile Include="HW\WiiSave.cpp" />
<ClCompile Include="IOS\Device.cpp" /> <ClCompile Include="IOS\Device.cpp" />
<ClCompile Include="IOS\DeviceStub.cpp" /> <ClCompile Include="IOS\DeviceStub.cpp" />
<ClCompile Include="IOS\DolphinDevice.cpp" />
<ClCompile Include="IOS\IOS.cpp" /> <ClCompile Include="IOS\IOS.cpp" />
<ClCompile Include="IOS\IOSC.cpp" /> <ClCompile Include="IOS\IOSC.cpp" />
<ClCompile Include="IOS\MIOS.cpp" /> <ClCompile Include="IOS\MIOS.cpp" />
@ -473,6 +474,7 @@
<ClInclude Include="HW\WII_IPC.h" /> <ClInclude Include="HW\WII_IPC.h" />
<ClInclude Include="IOS\Device.h" /> <ClInclude Include="IOS\Device.h" />
<ClInclude Include="IOS\DeviceStub.h" /> <ClInclude Include="IOS\DeviceStub.h" />
<ClInclude Include="IOS\DolphinDevice.h" />
<ClInclude Include="IOS\IOS.h" /> <ClInclude Include="IOS\IOS.h" />
<ClInclude Include="IOS\IOSC.h" /> <ClInclude Include="IOS\IOSC.h" />
<ClInclude Include="IOS\MIOS.h" /> <ClInclude Include="IOS\MIOS.h" />
@ -629,4 +631,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

View File

@ -707,6 +707,9 @@
<ClCompile Include="IOS\DeviceStub.cpp"> <ClCompile Include="IOS\DeviceStub.cpp">
<Filter>IOS</Filter> <Filter>IOS</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="IOS\DolphinDevice.cpp">
<Filter>IOS</Filter>
</ClCompile>
<ClCompile Include="IOS\DI\DI.cpp"> <ClCompile Include="IOS\DI\DI.cpp">
<Filter>IOS\DI</Filter> <Filter>IOS\DI</Filter>
</ClCompile> </ClCompile>
@ -1435,6 +1438,9 @@
<ClInclude Include="IOS\DeviceStub.h"> <ClInclude Include="IOS\DeviceStub.h">
<Filter>IOS</Filter> <Filter>IOS</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="IOS\DolphinDevice.h">
<Filter>IOS</Filter>
</ClInclude>
<ClInclude Include="IOS\DI\DI.h"> <ClInclude Include="IOS\DI\DI.h">
<Filter>IOS\DI</Filter> <Filter>IOS\DI</Filter>
</ClInclude> </ClInclude>
@ -1668,4 +1674,4 @@
<ItemGroup> <ItemGroup>
<Text Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -0,0 +1,151 @@
// Copyright 2019 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include <algorithm>
#include <cstring>
#include "Common/Logging/Log.h"
#include "Common/Timer.h"
#include "Common/scmrev.h"
#include "Core/BootManager.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/HW/Memmap.h"
#include "Core/IOS/DolphinDevice.h"
namespace IOS::HLE::Device
{
namespace
{
enum
{
IOCTL_DOLPHIN_GET_SYSTEM_TIME = 0x01,
IOCTL_DOLPHIN_GET_VERSION = 0x02,
IOCTL_DOLPHIN_GET_SPEED_LIMIT = 0x03,
IOCTL_DOLPHIN_SET_SPEED_LIMIT = 0x04,
IOCTL_DOLPHIN_GET_CPU_SPEED = 0x05,
};
IPCCommandResult GetSystemTime(const IOCtlVRequest& request)
{
if (!request.HasNumberOfValidVectors(0, 1))
{
return DolphinDevice::GetDefaultReply(IPC_EINVAL);
}
if (request.io_vectors[0].size != 4)
{
return DolphinDevice::GetDefaultReply(IPC_EINVAL);
}
const u32 milliseconds = Common::Timer::GetTimeMs();
Memory::Write_U32(milliseconds, request.io_vectors[0].address);
return DolphinDevice::GetDefaultReply(IPC_SUCCESS);
}
IPCCommandResult GetVersion(const IOCtlVRequest& request)
{
if (!request.HasNumberOfValidVectors(0, 1))
{
return DolphinDevice::GetDefaultReply(IPC_EINVAL);
}
const auto length = std::min(size_t(request.io_vectors[0].size), std::strlen(SCM_DESC_STR));
Memory::Memset(request.io_vectors[0].address, 0, request.io_vectors[0].size);
Memory::CopyToEmu(request.io_vectors[0].address, SCM_DESC_STR, length);
return DolphinDevice::GetDefaultReply(IPC_SUCCESS);
}
IPCCommandResult GetCPUSpeed(const IOCtlVRequest& request)
{
if (!request.HasNumberOfValidVectors(0, 1))
{
return DolphinDevice::GetDefaultReply(IPC_EINVAL);
}
if (request.io_vectors[0].size != 4)
{
return DolphinDevice::GetDefaultReply(IPC_EINVAL);
}
const SConfig& config = SConfig::GetInstance();
const float oc = config.m_OCEnable ? config.m_OCFactor : 1.0f;
const u32 core_clock = u32(float(SystemTimers::GetTicksPerSecond()) * oc);
Memory::Write_U32(core_clock, request.io_vectors[0].address);
return DolphinDevice::GetDefaultReply(IPC_SUCCESS);
}
IPCCommandResult GetSpeedLimit(const IOCtlVRequest& request)
{
// get current speed limit
if (!request.HasNumberOfValidVectors(0, 1))
{
return DolphinDevice::GetDefaultReply(IPC_EINVAL);
}
if (request.io_vectors[0].size != 4)
{
return DolphinDevice::GetDefaultReply(IPC_EINVAL);
}
const SConfig& config = SConfig::GetInstance();
const u32 speed_percent = config.m_EmulationSpeed * 100;
Memory::Write_U32(speed_percent, request.io_vectors[0].address);
return DolphinDevice::GetDefaultReply(IPC_SUCCESS);
}
IPCCommandResult SetSpeedLimit(const IOCtlVRequest& request)
{
// set current speed limit
if (!request.HasNumberOfValidVectors(1, 0))
{
return DolphinDevice::GetDefaultReply(IPC_EINVAL);
}
if (request.in_vectors[0].size != 4)
{
return DolphinDevice::GetDefaultReply(IPC_EINVAL);
}
const float speed = float(Memory::Read_U32(request.in_vectors[0].address)) / 100.0f;
SConfig::GetInstance().m_EmulationSpeed = speed;
BootManager::SetEmulationSpeedReset(true);
return DolphinDevice::GetDefaultReply(IPC_SUCCESS);
}
} // namespace
IPCCommandResult DolphinDevice::IOCtlV(const IOCtlVRequest& request)
{
if (Core::WantsDeterminism())
{
return DolphinDevice::GetDefaultReply(IPC_EACCES);
}
switch (request.request)
{
case IOCTL_DOLPHIN_GET_SYSTEM_TIME:
return GetSystemTime(request);
case IOCTL_DOLPHIN_GET_VERSION:
return GetVersion(request);
case IOCTL_DOLPHIN_GET_SPEED_LIMIT:
return GetSpeedLimit(request);
case IOCTL_DOLPHIN_SET_SPEED_LIMIT:
return SetSpeedLimit(request);
case IOCTL_DOLPHIN_GET_CPU_SPEED:
return GetCPUSpeed(request);
default:
return GetDefaultReply(IPC_EINVAL);
}
}
} // namespace IOS::HLE::Device

View File

@ -0,0 +1,18 @@
// Copyright 2019 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#pragma once
#include "Core/IOS/Device.h"
namespace IOS::HLE::Device
{
class DolphinDevice final : public Device
{
public:
// Inherit the constructor from the Device class, since we don't need to do anything special.
using Device::Device;
IPCCommandResult IOCtlV(const IOCtlVRequest& request) override;
};
} // namespace IOS::HLE::Device

View File

@ -30,6 +30,7 @@
#include "Core/IOS/DI/DI.h" #include "Core/IOS/DI/DI.h"
#include "Core/IOS/Device.h" #include "Core/IOS/Device.h"
#include "Core/IOS/DeviceStub.h" #include "Core/IOS/DeviceStub.h"
#include "Core/IOS/DolphinDevice.h"
#include "Core/IOS/ES/ES.h" #include "Core/IOS/ES/ES.h"
#include "Core/IOS/FS/FileSystem.h" #include "Core/IOS/FS/FileSystem.h"
#include "Core/IOS/FS/FileSystemProxy.h" #include "Core/IOS/FS/FileSystemProxy.h"
@ -372,6 +373,7 @@ void Kernel::AddCoreDevices()
std::lock_guard<std::mutex> lock(m_device_map_mutex); std::lock_guard<std::mutex> lock(m_device_map_mutex);
AddDevice(std::make_unique<Device::FS>(*this, "/dev/fs")); AddDevice(std::make_unique<Device::FS>(*this, "/dev/fs"));
AddDevice(std::make_unique<Device::ES>(*this, "/dev/es")); AddDevice(std::make_unique<Device::ES>(*this, "/dev/es"));
AddDevice(std::make_unique<Device::DolphinDevice>(*this, "/dev/dolphin"));
} }
void Kernel::AddStaticDevices() void Kernel::AddStaticDevices()