Skip to content
Permalink
Browse files

WiimoteEmu: Add game quirk report for reading of EXT/IR input directl…

…y, which will fail with TAS/NetPlay.
  • Loading branch information...
jordan-woyak committed Apr 29, 2019
1 parent 6f6c7e5 commit f055d37346de574635e1fd280f104d5b51e9b3a1
@@ -139,7 +139,8 @@ void DolphinAnalytics::ReportGameStart()

// Keep in sync with enum class GameQuirk definition.
static const char* GAME_QUIRKS_NAMES[] = {
"icache-matters", // ICACHE_MATTERS
"icache-matters",
"directly-reads-wiimote-input",
};
static_assert(sizeof(GAME_QUIRKS_NAMES) / sizeof(GAME_QUIRKS_NAMES[0]) ==
static_cast<u32>(GameQuirk::COUNT),
@@ -24,6 +24,10 @@ enum class GameQuirk
// Sometimes code run from ICache is different from its mirror in RAM.
ICACHE_MATTERS = 0,

// The Wii remote hardware makes it possible to bypass normal data reporting and directly
// "read" extension or IR data. This would break our current TAS/NetPlay implementation.
DIRECTLY_READS_WIIMOTE_INPUT,

COUNT,
};

@@ -75,6 +75,7 @@ class CameraLogic : public I2CSlave
void SetEnabled(bool is_enabled);

static constexpr u8 I2C_ADDR = 0x58;
static constexpr int CAMERA_DATA_BYTES = 36;

private:
// TODO: some of this memory is write-only and should return error 7.
@@ -89,7 +90,7 @@ class CameraLogic : public I2CSlave
u8 mode;
u8 unk[3];
// addr: 0x37
u8 camera_data[36];
u8 camera_data[CAMERA_DATA_BYTES];
u8 unk2[165];
};
#pragma pack(pop)
@@ -12,6 +12,7 @@
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
#include "Common/Swap.h"
#include "Core/Analytics.h"
#include "Core/Core.h"
#include "Core/HW/WiimoteCommon/WiimoteHid.h"
#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
@@ -507,6 +508,19 @@ bool Wiimote::ProcessReadDataRequest()
break;
}

// It is possible to bypass data reporting and directly read extension input.
// While I am not aware of any games that actually do this,
// our NetPlay and TAS methods are completely unprepared for it.
const bool is_reading_ext = EncryptedExtension::I2C_ADDR == m_read_request.slave_address &&
m_read_request.address < EncryptedExtension::CONTROLLER_DATA_BYTES;
const bool is_reading_ir =
CameraLogic::I2C_ADDR == m_read_request.slave_address &&
m_read_request.address < CameraLogic::REPORT_DATA_OFFSET + CameraLogic::CAMERA_DATA_BYTES &&
m_read_request.address + m_read_request.size > CameraLogic::REPORT_DATA_OFFSET;

if (is_reading_ext || is_reading_ir)
DolphinAnalytics::Instance()->ReportGameQuirk(GameQuirk::DIRECTLY_READS_WIIMOTE_INPUT);

// Top byte of address is ignored on the bus, but it IS maintained in the read-reply.
auto const bytes_read = m_i2c_bus.BusRead(
m_read_request.slave_address, (u8)m_read_request.address, bytes_to_read, reply.data);
@@ -62,6 +62,7 @@ class EncryptedExtension : public Extension
{
public:
static constexpr u8 I2C_ADDR = 0x52;
static constexpr int CONTROLLER_DATA_BYTES = 21;

using Extension::Extension;

@@ -76,7 +77,7 @@ class EncryptedExtension : public Extension
struct Register
{
// 21 bytes of possible extension data
u8 controller_data[21];
u8 controller_data[CONTROLLER_DATA_BYTES];

u8 unknown2[11];

0 comments on commit f055d37

Please sign in to comment.
You can’t perform that action at this time.