ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pad: GCC compile fix

This commit is contained in:
Stenzek 2024-11-22 22:55:54 +10:00
parent d26fc89aac
commit bb24d406f2
No known key found for this signature in database
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/pad.cpp
View File

@ -45,7 +45,7 @@ enum class ActiveDevice : u8
Multitap
};
union JOY_CTRL
union JOYCTRLRegister
{
u16 bits;
@ -61,7 +61,7 @@ union JOY_CTRL
BitField<u16, u8, 13, 1> SLOT;
};
union JOY_STAT
union JOYSTATRegister
{
u32 bits;
@ -73,7 +73,7 @@ union JOY_STAT
BitField<u32, u32, 11, 21> TMR;
};
union JOY_MODE
union JOYMODERegister
{
u16 bits;
@ -127,9 +127,9 @@ struct PadState
TimingEvent transfer_event{"Pad Serial Transfer", 1, 1, &Pad::TransferEvent, nullptr};
State state = State::Idle;
JOY_STAT JOY_STAT = {};
JOY_CTRL JOY_CTRL = {};
JOY_MODE JOY_MODE = {};
JOYSTATRegister JOY_STAT = {};
JOYCTRLRegister JOY_CTRL = {};
JOYMODERegister JOY_MODE = {};
u16 JOY_BAUD = 0;
ActiveDevice active_device = ActiveDevice::None;