mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-09 18:45:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Purely stylistic cleanup of Core/HW/WiimoteEmu/Attachment/* files.

Browse Source 
Also cleaned up WiimoteEmu.h as well.
This commit is contained in:
Lioncash 2014-02-01 19:13:38 -05:00
parent c31a623780
commit 3efb0aa5f7
8 changed files with 152 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/HW/WiimoteEmu/Attachment/Attachment.h
View File

@ -14,9 +14,9 @@ namespace WiimoteEmu
class Attachment : public ControllerEmu class Attachment : public ControllerEmu
{ {
public: public:
Attachment( const char* const _name, WiimoteEmu::ExtensionReg& _reg ); Attachment(const char* const _name, WiimoteEmu::ExtensionReg& _reg);
virtual void GetState( u8* const data, const bool focus = true ) {} virtual void GetState(u8* const data, const bool focus = true) {}
void Reset(); void Reset();
std::string GetName() const override; std::string GetName() const override;
@ -30,7 +30,7 @@ public:
class None : public Attachment class None : public Attachment
{ {
public: public:
None( WiimoteEmu::ExtensionReg& _reg ); None(WiimoteEmu::ExtensionReg& _reg);
}; };
} }

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Classic.h
View File

@ -11,7 +11,7 @@ class Classic : public Attachment
{ {
public: public:
Classic(WiimoteEmu::ExtensionReg& _reg); Classic(WiimoteEmu::ExtensionReg& _reg);
void GetState( u8* const data, const bool focus ); void GetState(u8* const data, const bool focus) override;
enum enum
{ {

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Drums.h
View File

@ -11,7 +11,7 @@ class Drums : public Attachment
{ {
public: public:
Drums(WiimoteEmu::ExtensionReg& _reg); Drums(WiimoteEmu::ExtensionReg& _reg);
void GetState( u8* const data, const bool focus ); void GetState(u8* const data, const bool focus) override;
enum enum
{ {

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Guitar.h
View File

@ -11,7 +11,7 @@ class Guitar : public Attachment
{ {
public: public:
Guitar(WiimoteEmu::ExtensionReg& _reg); Guitar(WiimoteEmu::ExtensionReg& _reg);
void GetState( u8* const data, const bool focus ) override; void GetState(u8* const data, const bool focus) override;
enum enum
{ {

2
Source/Core/Core/HW/WiimoteEmu/Attachment/Nunchuk.h
View File

@ -17,7 +17,7 @@ class Nunchuk : public Attachment
public: public:
Nunchuk(UDPWrapper * wrp, WiimoteEmu::ExtensionReg& _reg); Nunchuk(UDPWrapper * wrp, WiimoteEmu::ExtensionReg& _reg);
virtual void GetState( u8* const data, const bool focus ) override; virtual void GetState(u8* const data, const bool focus) override;
enum enum
{ {

6
Source/Core/Core/HW/WiimoteEmu/Attachment/Turntable.h
View File

@ -32,8 +32,10 @@ public:
private: private:
Buttons* m_buttons; Buttons* m_buttons;
AnalogStick* m_stick; AnalogStick* m_stick;
Triggers *m_effect_dial; Triggers* m_effect_dial;
Slider *m_left_table, *m_right_table, *m_crossfade; Slider* m_left_table;
Slider* m_right_table;
Slider* m_crossfade;
}; };

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

@ -118,7 +118,7 @@ public:
BUTTON_HOME = 0x8000, BUTTON_HOME = 0x8000,
}; };
Wiimote( const unsigned int index ); Wiimote(const unsigned int index);
std::string GetName() const; std::string GetName() const;
void Update(); void Update();
@ -148,7 +148,7 @@ private:
struct ReadRequest struct ReadRequest
{ {
//u16 channel; //u16 channel;
unsigned int address, size, position; u32 address, size, position;
u8* data; u8* data;
}; };
@ -202,7 +202,7 @@ private:
// read data request queue // read data request queue
// maybe it isn't actually a queue // maybe it isn't actually a queue
// maybe read requests cancel any current requests // maybe read requests cancel any current requests
std::queue< ReadRequest > m_read_requests; std::queue<ReadRequest> m_read_requests;
wiimote_key m_ext_key; wiimote_key m_ext_key;
@ -219,14 +219,12 @@ private:
// address 0xFA // address 0xFA
u8 ext_identifier[6]; u8 ext_identifier[6];
} m_reg_motion_plus; } m_reg_motion_plus;
struct IrReg struct IrReg
{ {
u8 data[0x33]; u8 data[0x33];
u8 mode; u8 mode;
} m_reg_ir; } m_reg_ir;
ExtensionReg m_reg_ext; ExtensionReg m_reg_ext;
@ -244,7 +242,6 @@ private:
u8 unk_7; u8 unk_7;
u8 play; u8 play;
u8 unk_9; u8 unk_9;
} m_reg_speaker; } m_reg_speaker;
}; };