ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8986 from jordan-woyak/button-pressed-no-ext 

WiimoteEmu: Don't check extension button press for Wii remote reconnection.
This commit is contained in:
Tilka 2020-08-08 21:06:46 +01:00 committed by GitHub
parent c0fde32d80 bdfb320b3d
commit 8b236fc8f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 1 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/HW/WiimoteEmu/Extension/Classic.cpp
View File

@ -153,16 +153,6 @@ void Classic::Update()
Common::BitCastPtr<DataFormat>(&m_reg.controller_data) = classic_data;
}
bool Classic::IsButtonPressed() const
{
u16 buttons = 0;
std::array<ControlState, 2> trigs{};
m_buttons->GetState(&buttons, classic_button_bitmasks.data());
m_dpad->GetState(&buttons, classic_dpad_bitmasks.data());
m_triggers->GetState(&buttons, classic_trigger_bitmasks.data(), trigs.data());
return buttons != 0;
}
void Classic::Reset()
{
EncryptedExtension::Reset();

1
Source/Core/Core/HW/WiimoteEmu/Extension/Classic.h
View File

@ -180,7 +180,6 @@ public:
Classic();
void Update() override;
bool IsButtonPressed() const override;
void Reset() override;
ControllerEmu::ControlGroup* GetGroup(ClassicGroup group);

6
Source/Core/Core/HW/WiimoteEmu/Extension/DrawsomeTablet.cpp
View File

@ -92,12 +92,6 @@ void DrawsomeTablet::Reset()
m_reg.calibration.fill(0xff);
}
bool DrawsomeTablet::IsButtonPressed() const
{
// Device has no buttons.
return false;
}
ControllerEmu::ControlGroup* DrawsomeTablet::GetGroup(DrawsomeTabletGroup group)
{
switch (group)

1
Source/Core/Core/HW/WiimoteEmu/Extension/DrawsomeTablet.h
View File

@ -29,7 +29,6 @@ public:
DrawsomeTablet();
void Update() override;
bool IsButtonPressed() const override;
void Reset() override;
ControllerEmu::ControlGroup* GetGroup(DrawsomeTabletGroup group);

11
Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp
View File

@ -165,17 +165,6 @@ void Drums::Update()
Common::BitCastPtr<DataFormat>(&m_reg.controller_data) = drum_data;
}
bool Drums::IsButtonPressed() const
{
u8 buttons = 0;
m_buttons->GetState(&buttons, drum_button_bitmasks.data());
u8 pads = 0;
m_pads->GetState(&pads, drum_pad_bitmasks.data());
return buttons != 0 || pads != 0;
}
void Drums::Reset()
{
EncryptedExtension::Reset();

1
Source/Core/Core/HW/WiimoteEmu/Extension/Drums.h
View File

@ -79,7 +79,6 @@ public:
Drums();
void Update() override;
bool IsButtonPressed() const override;
void Reset() override;
ControllerEmu::ControlGroup* GetGroup(DrumsGroup group);

5
Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp
View File

@ -49,11 +49,6 @@ void None::Update()
// Nothing needed.
}
bool None::IsButtonPressed() const
{
return false;
}
void None::Reset()
{
// Nothing needed.

2
Source/Core/Core/HW/WiimoteEmu/Extension/Extension.h
View File

@ -31,7 +31,6 @@ public:
// but M+ does some tricks with it during activation.
virtual bool ReadDeviceDetectPin() const = 0;
virtual bool IsButtonPressed() const = 0;
virtual void Reset() = 0;
virtual void DoState(PointerWrap& p) = 0;
virtual void Update() = 0;
@ -49,7 +48,6 @@ public:
private:
bool ReadDeviceDetectPin() const override;
void Update() override;
bool IsButtonPressed() const override;
void Reset() override;
void DoState(PointerWrap& p) override;

9
Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp
View File

@ -138,15 +138,6 @@ void Guitar::Update()
Common::BitCastPtr<DataFormat>(&m_reg.controller_data) = guitar_data;
}
bool Guitar::IsButtonPressed() const
{
u16 buttons = 0;
m_buttons->GetState(&buttons, guitar_button_bitmasks.data());
m_frets->GetState(&buttons, guitar_fret_bitmasks.data());
m_strum->GetState(&buttons, guitar_strum_bitmasks.data());
return buttons != 0;
}
void Guitar::Reset()
{
EncryptedExtension::Reset();

1
Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.h
View File

@ -52,7 +52,6 @@ public:
Guitar();
void Update() override;
bool IsButtonPressed() const override;
void Reset() override;
ControllerEmu::ControlGroup* GetGroup(GuitarGroup group);

7
Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp
View File

@ -114,13 +114,6 @@ void Nunchuk::Update()
Common::BitCastPtr<DataFormat>(&m_reg.controller_data) = nc_data;
}
bool Nunchuk::IsButtonPressed() const
{
u8 buttons = 0;
m_buttons->GetState(&buttons, nunchuk_button_bitmasks.data());
return buttons != 0;
}
void Nunchuk::Reset()
{
EncryptedExtension::Reset();

1
Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.h
View File

@ -151,7 +151,6 @@ public:
Nunchuk();
void Update() override;
bool IsButtonPressed() const override;
void Reset() override;
void DoState(PointerWrap& p) override;

8
Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp
View File

@ -62,14 +62,6 @@ void TaTaCon::Update()
Common::BitCastPtr<DataFormat>(&m_reg.controller_data) = tatacon_data;
}
bool TaTaCon::IsButtonPressed() const
{
u8 state = 0;
m_center->GetState(&state, center_bitmasks.data());
m_rim->GetState(&state, rim_bitmasks.data());
return state != 0;
}
void TaTaCon::Reset()
{
m_reg = {};

1
Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.h
View File

@ -33,7 +33,6 @@ public:
TaTaCon();
void Update() override;
bool IsButtonPressed() const override;
void Reset() override;
ControllerEmu::ControlGroup* GetGroup(TaTaConGroup group);

7
Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp
View File

@ -137,13 +137,6 @@ void Turntable::Update()
Common::BitCastPtr<DataFormat>(&m_reg.controller_data) = tt_data;
}
bool Turntable::IsButtonPressed() const
{
u16 buttons = 0;
m_buttons->GetState(&buttons, turntable_button_bitmasks.data());
return buttons != 0;
}
void Turntable::Reset()
{
EncryptedExtension::Reset();

1
Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.h
View File

@ -58,7 +58,6 @@ public:
Turntable();
void Update() override;
bool IsButtonPressed() const override;
void Reset() override;
ControllerEmu::ControlGroup* GetGroup(TurntableGroup group);

7
Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp
View File

@ -119,13 +119,6 @@ void UDrawTablet::Reset()
m_reg.calibration.fill(0xff);
}
bool UDrawTablet::IsButtonPressed() const
{
u8 buttons = 0;
m_buttons->GetState(&buttons, udraw_tablet_button_bitmasks.data());
return buttons != 0;
}
ControllerEmu::ControlGroup* UDrawTablet::GetGroup(UDrawTabletGroup group)
{
switch (group)

1
Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.h
View File

@ -29,7 +29,6 @@ public:
UDrawTablet();
void Update() override;
bool IsButtonPressed() const override;
void Reset() override;
ControllerEmu::ControlGroup* GetGroup(UDrawTabletGroup group);

5
Source/Core/Core/HW/WiimoteEmu/MotionPlus.cpp
View File

@ -388,11 +388,6 @@ bool MotionPlus::ReadDeviceDetectPin() const
}
}
bool MotionPlus::IsButtonPressed() const
{
return false;
}
void MotionPlus::Update()
{
if (m_progress_timer)

1
Source/Core/Core/HW/WiimoteEmu/MotionPlus.h
View File

@ -230,7 +230,6 @@ private:
int BusWrite(u8 slave_addr, u8 addr, int count, const u8* data_in) override;
bool ReadDeviceDetectPin() const override;
bool IsButtonPressed() const override;
Register m_reg_data = {};

2
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -673,7 +673,7 @@ bool Wiimote::CheckForButtonPress()
m_buttons->GetState(&buttons, button_bitmasks);
m_dpad->GetState(&buttons, dpad_bitmasks);
return (buttons != 0 || GetActiveExtension()->IsButtonPressed());
return buttons != 0;
}
void Wiimote::LoadDefaults(const ControllerInterface& ciface)