piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-26 07:39:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

IOS: Move DoStateForMessage from BTEmu to BTBase.

Browse Source
This commit is contained in:
Jordan Woyak
2025-06-11 07:07:55 -05:00
parent b3e349b4df
commit 541dbdfead
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/Core/IOS/USB/Bluetooth/BTBase.h
View File

@ -3,9 +3,6 @@
#pragma once #pragma once
#include <cstddef>
#include <string>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/IOS/Device.h" #include "Core/IOS/Device.h"
#include "Core/IOS/IOS.h" #include "Core/IOS/IOS.h"
@ -15,6 +12,18 @@ class SysConf;
namespace IOS::HLE namespace IOS::HLE
{ {
template <typename T>
static void DoStateForMessage(EmulationKernel& ios, PointerWrap& p, std::unique_ptr<T>& message)
{
u32 request_address = (message != nullptr) ? message->ios_request.address : 0;
p.Do(request_address);
if (request_address != 0)
{
IOCtlVRequest request{ios.GetSystem(), request_address};
message = std::make_unique<T>(ios, request);
}
}
void BackUpBTInfoSection(const SysConf* sysconf); void BackUpBTInfoSection(const SysConf* sysconf);
void RestoreBTInfoSection(SysConf* sysconf); void RestoreBTInfoSection(SysConf* sysconf);

12
Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
View File

@ -79,18 +79,6 @@ BluetoothEmuDevice::BluetoothEmuDevice(EmulationKernel& ios, const std::string&
BluetoothEmuDevice::~BluetoothEmuDevice() = default; BluetoothEmuDevice::~BluetoothEmuDevice() = default;
template <typename T>
static void DoStateForMessage(EmulationKernel& ios, PointerWrap& p, std::unique_ptr<T>& message)
{
u32 request_address = (message != nullptr) ? message->ios_request.address : 0;
p.Do(request_address);
if (request_address != 0)
{
IOCtlVRequest request{ios.GetSystem(), request_address};
message = std::make_unique<T>(ios, request);
}
}
void BluetoothEmuDevice::DoState(PointerWrap& p) void BluetoothEmuDevice::DoState(PointerWrap& p)
{ {
bool passthrough_bluetooth = false; bool passthrough_bluetooth = false;