diff options
| author | bunnei <bunneidev@gmail.com> | 2019-03-20 23:44:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 23:44:20 -0400 |
| commit | 3e930304fe6fb29a2421dd0fdfef6e66ebb213ad (patch) | |
| tree | 3298c05a68692803d9124b919f7f3fe284d535c8 /src/core/hle/service/hid/controllers/touchscreen.h | |
| parent | 52f36ea1c70eee37be84b8b207f94bcfdf26bc2e (diff) | |
| parent | efd83570bdb70597b3e06eeb3bced5486ac85eab (diff) | |
Merge pull request #2090 from FearlessTobi/port-4599
Port citra-emu/citra#4244 and citra-emu/citra#4599: Changes to BitField
Diffstat (limited to 'src/core/hle/service/hid/controllers/touchscreen.h')
| -rw-r--r-- | src/core/hle/service/hid/controllers/touchscreen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/core/hle/service/hid/controllers/touchscreen.h index 012b6e0dd..76fc340e9 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.h +++ b/src/core/hle/service/hid/controllers/touchscreen.h @@ -33,8 +33,8 @@ private: struct Attributes { union { u32 raw{}; - BitField<0, 1, u32_le> start_touch; - BitField<1, 1, u32_le> end_touch; + BitField<0, 1, u32> start_touch; + BitField<1, 1, u32> end_touch; }; }; static_assert(sizeof(Attributes) == 0x4, "Attributes is an invalid size"); |