mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-10-07 15:53:34 +00:00
WiimoteEmu: Tweak the i2c bus code to better support motion plus and its passthrough port.
This commit is contained in:
Jordan Woyak
parent
84d32f6645
commit
ba936923bd
@ -442,7 +442,7 @@ void Wiimote::DoState(PointerWrap& p)
|
||||
p.Do(m_speaker_logic.adpcm_state);
|
||||
p.Do(m_ext_logic.ext_key);
|
||||
p.DoArray(m_eeprom);
|
||||
p.Do(m_reg_motion_plus);
|
||||
p.Do(m_motion_plus_logic.reg_data);
|
||||
p.Do(m_camera_logic.reg_data);
|
||||
p.Do(m_ext_logic.reg_data);
|
||||
p.Do(m_speaker_logic.reg_data);
|
||||
|
||||
@ -100,10 +100,9 @@ static const ReportFeatures reporting_mode_features[] = {
|
||||
{2, 0, 10, 9, 23},
|
||||
// 0x37: Core Buttons and Accelerometer with 10 IR bytes and 6 Extension Bytes
|
||||
{2, 3, 10, 6, 23},
|
||||
// UNSUPPORTED (but should be easy enough to implement):
|
||||
// 0x3d: 21 Extension Bytes
|
||||
{0, 0, 0, 21, 23},
|
||||
|
||||
// UNSUPPORTED:
|
||||
// 0x3e / 0x3f: Interleaved Core Buttons and Accelerometer with 36 IR bytes
|
||||
{0, 0, 0, 0, 23},
|
||||
};
|
||||
@ -334,9 +333,8 @@ void Wiimote::Reset()
|
||||
memset(&m_camera_logic.reg_data, 0, sizeof(m_camera_logic.reg_data));
|
||||
memset(&m_ext_logic.reg_data, 0, sizeof(m_ext_logic.reg_data));
|
||||
|
||||
memset(&m_reg_motion_plus, 0, sizeof(m_reg_motion_plus));
|
||||
|
||||
memcpy(&m_reg_motion_plus.ext_identifier, motion_plus_id, sizeof(motion_plus_id));
|
||||
memset(&m_motion_plus_logic.reg_data, 0, sizeof(m_motion_plus_logic.reg_data));
|
||||
memcpy(&m_motion_plus_logic.reg_data.ext_identifier, motion_plus_id, sizeof(motion_plus_id));
|
||||
|
||||
// status
|
||||
memset(&m_status, 0, sizeof(m_status));
|
||||
@ -362,9 +360,20 @@ void Wiimote::Reset()
|
||||
// Initialize i2c bus
|
||||
// TODO: kill magic numbers
|
||||
m_i2c_bus.Reset();
|
||||
m_i2c_bus.AddSlave(0x58, &m_camera_logic);
|
||||
m_i2c_bus.AddSlave(0x52, &m_ext_logic);
|
||||
m_i2c_bus.AddSlave(0x51, &m_speaker_logic);
|
||||
// Address 0x51
|
||||
m_i2c_bus.AddSlave(&m_speaker_logic);
|
||||
|
||||
// TODO: only add to bus when enabled
|
||||
// Address 0x53 (or 0x52 when activated)
|
||||
m_i2c_bus.AddSlave(&m_motion_plus_logic);
|
||||
// Address 0x58
|
||||
m_i2c_bus.AddSlave(&m_camera_logic);
|
||||
|
||||
// TODO: add directly to wiimote bus when mplus is disabled
|
||||
// TODO: only add to bus when connected:
|
||||
// Address 0x52 (when motion plus is not activated)
|
||||
// Connected to motion plus i2c_bus (with passthrough by default)
|
||||
m_motion_plus_logic.i2c_bus.AddSlave(&m_ext_logic);
|
||||
}
|
||||
|
||||
Wiimote::Wiimote(const unsigned int index) : m_index(index), ir_sin(0), ir_cos(1)
|
||||
@ -422,6 +431,7 @@ Wiimote::Wiimote(const unsigned int index) : m_index(index), ir_sin(0), ir_cos(1
|
||||
|
||||
// extension
|
||||
groups.emplace_back(m_extension = new ControllerEmu::Extension(_trans("Extension")));
|
||||
m_ext_logic.extension = m_extension;
|
||||
m_extension->attachments.emplace_back(new WiimoteEmu::None(m_ext_logic.reg_data));
|
||||
m_extension->attachments.emplace_back(new WiimoteEmu::Nunchuk(m_ext_logic.reg_data));
|
||||
m_extension->attachments.emplace_back(new WiimoteEmu::Classic(m_ext_logic.reg_data));
|
||||
@ -908,6 +918,11 @@ void Wiimote::Update()
|
||||
feature_ptr += rptf.ext_size;
|
||||
}
|
||||
|
||||
// motion plus
|
||||
auto* mplus_data = reinterpret_cast<wm_motionplus_data*>(m_motion_plus_logic.reg_data.controller_data);
|
||||
*mplus_data = wm_motionplus_data();
|
||||
mplus_data->is_mp_data = true;
|
||||
|
||||
if (feature_ptr != data + rptf_size)
|
||||
{
|
||||
PanicAlert("Wiimote input report is the wrong size!");
|
||||
|
||||
@ -215,11 +215,14 @@ enum
|
||||
class I2CSlave
|
||||
{
|
||||
public:
|
||||
virtual int BusRead(u8 addr, int count, u8* data_out) = 0;
|
||||
virtual int BusWrite(u8 addr, int count, const u8* data_in) = 0;
|
||||
// Kill MSVC warning:
|
||||
virtual ~I2CSlave() = default;
|
||||
|
||||
virtual int BusRead(u8 slave_addr, u8 addr, int count, u8* data_out) = 0;
|
||||
virtual int BusWrite(u8 slave_addr, u8 addr, int count, const u8* data_in) = 0;
|
||||
|
||||
template <typename T>
|
||||
static int raw_read(T* reg_data, u8 addr, int count, u8* data_out)
|
||||
static int RawRead(T* reg_data, u8 addr, int count, u8* data_out)
|
||||
{
|
||||
static_assert(std::is_pod<T>::value);
|
||||
|
||||
@ -234,7 +237,7 @@ public:
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
static int raw_write(T* reg_data, u8 addr, int count, const u8* data_in)
|
||||
static int RawWrite(T* reg_data, u8 addr, int count, const u8* data_in)
|
||||
{
|
||||
static_assert(std::is_pod<T>::value);
|
||||
|
||||
@ -252,9 +255,15 @@ public:
|
||||
class I2CBus
|
||||
{
|
||||
public:
|
||||
void AddSlave(u8 addr, I2CSlave* slave) { m_slaves.insert(std::make_pair(addr, slave)); }
|
||||
void AddSlave(I2CSlave* slave)
|
||||
{
|
||||
m_slaves.emplace_back(slave);
|
||||
}
|
||||
|
||||
void RemoveSlave(u8 addr) { m_slaves.erase(addr); }
|
||||
void RemoveSlave(I2CSlave* slave)
|
||||
{
|
||||
m_slaves.erase(std::remove(m_slaves.begin(), m_slaves.end(), slave), m_slaves.end());
|
||||
}
|
||||
|
||||
void Reset() { m_slaves.clear(); }
|
||||
|
||||
@ -262,31 +271,71 @@ public:
|
||||
{
|
||||
INFO_LOG(WIIMOTE, "i2c bus read: 0x%02x @ 0x%02x (%d)", slave_addr, addr, count);
|
||||
|
||||
// TODO: reads loop around at end of address space (0xff)
|
||||
for (auto& slave : m_slaves)
|
||||
{
|
||||
auto const bytes_read = slave->BusRead(slave_addr, addr, count, data_out);
|
||||
|
||||
auto it = m_slaves.find(slave_addr);
|
||||
if (m_slaves.end() != it)
|
||||
return it->second->BusRead(addr, count, data_out);
|
||||
else
|
||||
return 0;
|
||||
// A slave responded, we are done.
|
||||
if (bytes_read)
|
||||
return bytes_read;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int BusWrite(u8 slave_addr, u8 addr, int count, const u8* data_in)
|
||||
{
|
||||
INFO_LOG(WIIMOTE, "i2c bus write: 0x%02x @ 0x%02x (%d)", slave_addr, addr, count);
|
||||
|
||||
// TODO: writes loop around at end of address space (0xff)
|
||||
for (auto& slave : m_slaves)
|
||||
{
|
||||
auto const bytes_written = slave->BusWrite(slave_addr, addr, count, data_in);
|
||||
|
||||
auto it = m_slaves.find(slave_addr);
|
||||
if (m_slaves.end() != it)
|
||||
return it->second->BusWrite(addr, count, data_in);
|
||||
else
|
||||
return 0;
|
||||
// A slave responded, we are done.
|
||||
if (bytes_written)
|
||||
return bytes_written;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
private:
|
||||
// Organized by slave addr
|
||||
std::map<u8, I2CSlave*> m_slaves;
|
||||
std::vector<I2CSlave*> m_slaves;
|
||||
};
|
||||
|
||||
class ExtensionAttachment : public I2CSlave
|
||||
{
|
||||
public:
|
||||
virtual bool ReadDeviceDetectPin() = 0;
|
||||
};
|
||||
|
||||
class ExtensionPort
|
||||
{
|
||||
public:
|
||||
ExtensionPort(I2CBus& _i2c_bus)
|
||||
: m_i2c_bus(_i2c_bus)
|
||||
{}
|
||||
|
||||
// Simulates the "device-detect" pin.
|
||||
// Wiimote uses this to detect extension change..
|
||||
// and then send a status report..
|
||||
bool IsDeviceConnected()
|
||||
{
|
||||
if (m_attachment)
|
||||
return m_attachment->ReadDeviceDetectPin();
|
||||
else
|
||||
return false;
|
||||
}
|
||||
|
||||
void SetAttachment(ExtensionAttachment* dev)
|
||||
{
|
||||
m_i2c_bus.RemoveSlave(m_attachment);
|
||||
m_i2c_bus.AddSlave(m_attachment = dev);
|
||||
}
|
||||
|
||||
private:
|
||||
ExtensionAttachment* m_attachment;
|
||||
I2CBus& m_i2c_bus;
|
||||
};
|
||||
|
||||
class Wiimote : public ControllerEmu::EmulatedController
|
||||
@ -347,6 +396,10 @@ protected:
|
||||
bool WantExtension() const;
|
||||
|
||||
private:
|
||||
I2CBus m_i2c_bus;
|
||||
|
||||
ExtensionPort m_extension_port{m_i2c_bus};
|
||||
|
||||
struct IRCameraLogic : public I2CSlave
|
||||
{
|
||||
struct
|
||||
@ -362,26 +415,41 @@ private:
|
||||
|
||||
static_assert(0x100 == sizeof(reg_data));
|
||||
|
||||
int BusRead(u8 addr, int count, u8* data_out) override
|
||||
static const u8 DEVICE_ADDR = 0x58;
|
||||
|
||||
int BusRead(u8 slave_addr, u8 addr, int count, u8* data_out) override
|
||||
{
|
||||
return raw_read(®_data, addr, count, data_out);
|
||||
if (DEVICE_ADDR != slave_addr)
|
||||
return 0;
|
||||
|
||||
return RawRead(®_data, addr, count, data_out);
|
||||
}
|
||||
|
||||
int BusWrite(u8 addr, int count, const u8* data_in) override
|
||||
int BusWrite(u8 slave_addr, u8 addr, int count, const u8* data_in) override
|
||||
{
|
||||
return raw_write(®_data, addr, count, data_in);
|
||||
if (DEVICE_ADDR != slave_addr)
|
||||
return 0;
|
||||
|
||||
return RawWrite(®_data, addr, count, data_in);
|
||||
}
|
||||
|
||||
} m_camera_logic;
|
||||
|
||||
struct ExtensionLogic : public I2CSlave
|
||||
struct ExtensionLogic : public ExtensionAttachment
|
||||
{
|
||||
ExtensionReg reg_data;
|
||||
wiimote_key ext_key;
|
||||
|
||||
int BusRead(u8 addr, int count, u8* data_out) override
|
||||
ControllerEmu::Extension* extension;
|
||||
|
||||
static const u8 DEVICE_ADDR = 0x52;
|
||||
|
||||
int BusRead(u8 slave_addr, u8 addr, int count, u8* data_out) override
|
||||
{
|
||||
auto const result = raw_read(®_data, addr, count, data_out);
|
||||
if (DEVICE_ADDR != slave_addr)
|
||||
return 0;
|
||||
|
||||
auto const result = RawRead(®_data, addr, count, data_out);
|
||||
|
||||
// Encrypt data read from extension register
|
||||
// Check if encrypted reads is on
|
||||
@ -391,9 +459,12 @@ private:
|
||||
return result;
|
||||
}
|
||||
|
||||
int BusWrite(u8 addr, int count, const u8* data_in) override
|
||||
int BusWrite(u8 slave_addr, u8 addr, int count, const u8* data_in) override
|
||||
{
|
||||
auto const result = raw_write(®_data, addr, count, data_in);
|
||||
if (DEVICE_ADDR != slave_addr)
|
||||
return 0;
|
||||
|
||||
auto const result = RawWrite(®_data, addr, count, data_in);
|
||||
|
||||
if (addr + count > 0x40 && addr < 0x50)
|
||||
{
|
||||
@ -405,6 +476,11 @@ private:
|
||||
return result;
|
||||
}
|
||||
|
||||
bool ReadDeviceDetectPin() override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
} m_ext_logic;
|
||||
|
||||
struct SpeakerLogic : public I2CSlave
|
||||
@ -427,26 +503,125 @@ private:
|
||||
|
||||
ADPCMState adpcm_state;
|
||||
|
||||
static const u8 DEVICE_ADDR = 0x51;
|
||||
|
||||
void SpeakerData(const u8* data, int length);
|
||||
|
||||
int BusRead(u8 addr, int count, u8* data_out) override
|
||||
int BusRead(u8 slave_addr, u8 addr, int count, u8* data_out) override
|
||||
{
|
||||
return raw_read(®_data, addr, count, data_out);
|
||||
if (DEVICE_ADDR != slave_addr)
|
||||
return 0;
|
||||
|
||||
return RawRead(®_data, addr, count, data_out);
|
||||
}
|
||||
|
||||
int BusWrite(u8 addr, int count, const u8* data_in) override
|
||||
int BusWrite(u8 slave_addr, u8 addr, int count, const u8* data_in) override
|
||||
{
|
||||
if (DEVICE_ADDR != slave_addr)
|
||||
return 0;
|
||||
|
||||
if (0x00 == addr)
|
||||
{
|
||||
SpeakerData(data_in, count);
|
||||
return count;
|
||||
}
|
||||
else
|
||||
return raw_write(®_data, addr, count, data_in);
|
||||
return RawWrite(®_data, addr, count, data_in);
|
||||
}
|
||||
|
||||
} m_speaker_logic;
|
||||
|
||||
struct MotionPlusLogic : public ExtensionAttachment
|
||||
{
|
||||
// The bus on the end of the motion plus:
|
||||
I2CBus i2c_bus;
|
||||
|
||||
// The port on the end of the motion plus:
|
||||
ExtensionPort extension_port{i2c_bus};
|
||||
|
||||
#pragma pack(push, 1)
|
||||
struct MotionPlusRegister
|
||||
{
|
||||
u8 controller_data[0x10];
|
||||
u8 unknown[0x10];
|
||||
u8 calibration_data[0x20];
|
||||
u8 unknown2[0xb0];
|
||||
|
||||
// address 0xF0
|
||||
// TODO: bad name
|
||||
u8 activated;
|
||||
|
||||
u8 unknown3[9];
|
||||
|
||||
// address 0xFA
|
||||
u8 ext_identifier[6];
|
||||
} reg_data;
|
||||
#pragma pack(pop)
|
||||
|
||||
static_assert(0x100 == sizeof(reg_data));
|
||||
|
||||
static const u8 DEVICE_ADDR = 0x53;
|
||||
static const u8 EXT_DEVICE_ADDR = 0x52;
|
||||
|
||||
bool IsActive() const { return reg_data.activated; }
|
||||
|
||||
u8 GetPassthroughMode() const { return reg_data.ext_identifier[4]; }
|
||||
|
||||
// Return the status of the "device detect" pin
|
||||
// used to product status reports on device change
|
||||
bool GetDevicePresent() const
|
||||
{
|
||||
if (IsActive())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// TODO: passthrough other extension attachment status
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
int BusRead(u8 slave_addr, u8 addr, int count, u8* data_out) override
|
||||
{
|
||||
// if (DEVICE_ADDR != slave_addr)
|
||||
// return 0;
|
||||
|
||||
return i2c_bus.BusRead(slave_addr, addr, count, data_out);
|
||||
|
||||
auto const result = RawRead(®_data, addr, count, data_out);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
int BusWrite(u8 slave_addr, u8 addr, int count, const u8* data_in) override
|
||||
{
|
||||
// if (DEVICE_ADDR != slave_addr)
|
||||
// return 0;
|
||||
|
||||
return i2c_bus.BusWrite(slave_addr, addr, count, data_in);
|
||||
|
||||
auto const result = RawWrite(®_data, addr, count, data_in);
|
||||
|
||||
if (0xfe == addr)
|
||||
{
|
||||
if (true) // 0x55 == reg_data.activated)
|
||||
{
|
||||
// i2c_bus.SetSlave(0x52, this);
|
||||
// i2c_bus.RemoveSlave(0x53);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
bool ReadDeviceDetectPin() override
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
} m_motion_plus_logic;
|
||||
|
||||
void ReportMode(const wm_report_mode* dr);
|
||||
void SendAck(u8 report_id, u8 error_code = 0x0);
|
||||
void RequestStatus(const wm_request_status* rs = nullptr);
|
||||
@ -480,8 +655,6 @@ private:
|
||||
DynamicData m_swing_dynamic_data;
|
||||
DynamicData m_shake_dynamic_data;
|
||||
|
||||
I2CBus m_i2c_bus;
|
||||
|
||||
// Wiimote accel data
|
||||
AccelData m_accel;
|
||||
|
||||
@ -514,21 +687,6 @@ private:
|
||||
u16 size;
|
||||
} m_read_request;
|
||||
|
||||
#pragma pack(push, 1)
|
||||
u8 m_eeprom[WIIMOTE_EEPROM_SIZE];
|
||||
struct MotionPlusReg
|
||||
{
|
||||
u8 unknown[0xF0];
|
||||
|
||||
// address 0xF0
|
||||
u8 activated;
|
||||
|
||||
u8 unknown2[9];
|
||||
|
||||
// address 0xFA
|
||||
u8 ext_identifier[6];
|
||||
} m_reg_motion_plus;
|
||||
|
||||
#pragma pack(pop)
|
||||
};
|
||||
} // namespace WiimoteEmu
|
||||
|
||||
Loading…
Reference in New Issue
Block a user