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 #7257 from lioncash/const 

WiimoteEmu: Minor changes
This commit is contained in:
Anthony 2018-08-03 20:09:31 -07:00 committed by GitHub
parent 15090dc4b8 113a357604
commit 72d5ff54f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
View File

@ -181,23 +181,22 @@ struct ExtensionReg
}; };
#pragma pack(pop) #pragma pack(pop)
void EmulateShake(AccelData* const accel_data, ControllerEmu::Buttons* const buttons_group, void EmulateShake(AccelData* accel, ControllerEmu::Buttons* buttons_group, double intensity,
const double intensity, u8* const shake_step); u8* shake_step);
void EmulateDynamicShake(AccelData* const accel, DynamicData& dynamic_data, void EmulateDynamicShake(AccelData* accel, DynamicData& dynamic_data,
ControllerEmu::Buttons* const buttons_group, ControllerEmu::Buttons* buttons_group, const DynamicConfiguration& config,
const DynamicConfiguration& config, u8* const shake_step); u8* shake_step);
void EmulateTilt(AccelData* const accel, ControllerEmu::Tilt* const tilt_group, void EmulateTilt(AccelData* accel, ControllerEmu::Tilt* tilt_group, bool sideways = false,
const bool sideways = false, const bool upright = false); bool upright = false);
void EmulateSwing(AccelData* const accel, ControllerEmu::Force* const tilt_group, void EmulateSwing(AccelData* accel, ControllerEmu::Force* swing_group, double intensity,
const double intensity, const bool sideways = false, const bool upright = false); bool sideways = false, bool upright = false);
void EmulateDynamicSwing(AccelData* const accel, DynamicData& dynamic_data, void EmulateDynamicSwing(AccelData* accel, DynamicData& dynamic_data,
ControllerEmu::Force* const swing_group, ControllerEmu::Force* swing_group, const DynamicConfiguration& config,
const DynamicConfiguration& config, const bool sideways = false, bool sideways = false, bool upright = false);
const bool upright = false);
enum enum
{ {
@ -227,7 +226,7 @@ public:
BUTTON_HOME = 0x8000, BUTTON_HOME = 0x8000,
}; };
Wiimote(const unsigned int index); explicit Wiimote(unsigned int index);
std::string GetName() const override; std::string GetName() const override;
ControllerEmu::ControlGroup* GetWiimoteGroup(WiimoteGroup group); ControllerEmu::ControlGroup* GetWiimoteGroup(WiimoteGroup group);
ControllerEmu::ControlGroup* GetNunchukGroup(NunchukGroup group); ControllerEmu::ControlGroup* GetNunchukGroup(NunchukGroup group);
@ -237,8 +236,8 @@ public:
ControllerEmu::ControlGroup* GetTurntableGroup(TurntableGroup group); ControllerEmu::ControlGroup* GetTurntableGroup(TurntableGroup group);
void Update(); void Update();
void InterruptChannel(const u16 channel_id, const void* data, u32 size); void InterruptChannel(u16 channel_id, const void* data, u32 size);
void ControlChannel(const u16 channel_id, const void* data, u32 size); void ControlChannel(u16 channel_id, const void* data, u32 size);
bool CheckForButtonPress(); bool CheckForButtonPress();
void Reset(); void Reset();
@ -251,14 +250,14 @@ public:
protected: protected:
bool Step(); bool Step();
void HidOutputReport(const wm_report* const sr, const bool send_ack = true); void HidOutputReport(const wm_report* sr, bool send_ack = true);
void HandleExtensionSwap(); void HandleExtensionSwap();
void UpdateButtonsStatus(); void UpdateButtonsStatus();
void GetButtonData(u8* const data); void GetButtonData(u8* data);
void GetAccelData(u8* const data, const ReportFeatures& rptf); void GetAccelData(u8* data, const ReportFeatures& rptf);
void GetIRData(u8* const data, bool use_accel); void GetIRData(u8* data, bool use_accel);
void GetExtData(u8* const data); void GetExtData(u8* data);
bool HaveExtension() const; bool HaveExtension() const;
bool WantExtension() const; bool WantExtension() const;
@ -271,11 +270,11 @@ private:
u8* data; u8* data;
}; };
void ReportMode(const wm_report_mode* const dr); void ReportMode(const wm_report_mode* dr);
void SendAck(const u8 report_id); void SendAck(u8 report_id);
void RequestStatus(const wm_request_status* const rs = nullptr); void RequestStatus(const wm_request_status* rs = nullptr);
void ReadData(const wm_read_data* const rd); void ReadData(const wm_read_data* rd);
void WriteData(const wm_write_data* const wd); void WriteData(const wm_write_data* wd);
void SendReadDataReply(ReadRequest& request); void SendReadDataReply(ReadRequest& request);
void SpeakerData(const wm_speaker_data* sd); void SpeakerData(const wm_speaker_data* sd);
bool NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size, u8 reporting_mode); bool NetPlay_GetWiimoteData(int wiimote, u8* data, u8 size, u8 reporting_mode);