summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/debug_pad.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-03-21 04:44:20 +0100
committerGitHub <noreply@github.com>2019-03-21 04:44:20 +0100
commit3e930304fe6fb29a2421dd0fdfef6e66ebb213ad (patch)
tree3298c05a68692803d9124b919f7f3fe284d535c8 /src/core/hle/service/hid/controllers/debug_pad.h
parentMerge pull request #2262 from lioncash/enum (diff)
parentMake bitfield assignment operator public (diff)
downloadyuzu-3e930304fe6fb29a2421dd0fdfef6e66ebb213ad.tar
yuzu-3e930304fe6fb29a2421dd0fdfef6e66ebb213ad.tar.gz
yuzu-3e930304fe6fb29a2421dd0fdfef6e66ebb213ad.tar.bz2
yuzu-3e930304fe6fb29a2421dd0fdfef6e66ebb213ad.tar.lz
yuzu-3e930304fe6fb29a2421dd0fdfef6e66ebb213ad.tar.xz
yuzu-3e930304fe6fb29a2421dd0fdfef6e66ebb213ad.tar.zst
yuzu-3e930304fe6fb29a2421dd0fdfef6e66ebb213ad.zip
Diffstat (limited to 'src/core/hle/service/hid/controllers/debug_pad.h')
-rw-r--r--src/core/hle/service/hid/controllers/debug_pad.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/core/hle/service/hid/controllers/debug_pad.h b/src/core/hle/service/hid/controllers/debug_pad.h
index 929035034..e584b92ec 100644
--- a/src/core/hle/service/hid/controllers/debug_pad.h
+++ b/src/core/hle/service/hid/controllers/debug_pad.h
@@ -41,20 +41,20 @@ private:
struct PadState {
union {
u32_le raw{};
- BitField<0, 1, u32_le> a;
- BitField<1, 1, u32_le> b;
- BitField<2, 1, u32_le> x;
- BitField<3, 1, u32_le> y;
- BitField<4, 1, u32_le> l;
- BitField<5, 1, u32_le> r;
- BitField<6, 1, u32_le> zl;
- BitField<7, 1, u32_le> zr;
- BitField<8, 1, u32_le> plus;
- BitField<9, 1, u32_le> minus;
- BitField<10, 1, u32_le> d_left;
- BitField<11, 1, u32_le> d_up;
- BitField<12, 1, u32_le> d_right;
- BitField<13, 1, u32_le> d_down;
+ BitField<0, 1, u32> a;
+ BitField<1, 1, u32> b;
+ BitField<2, 1, u32> x;
+ BitField<3, 1, u32> y;
+ BitField<4, 1, u32> l;
+ BitField<5, 1, u32> r;
+ BitField<6, 1, u32> zl;
+ BitField<7, 1, u32> zr;
+ BitField<8, 1, u32> plus;
+ BitField<9, 1, u32> minus;
+ BitField<10, 1, u32> d_left;
+ BitField<11, 1, u32> d_up;
+ BitField<12, 1, u32> d_right;
+ BitField<13, 1, u32> d_down;
};
};
static_assert(sizeof(PadState) == 0x4, "PadState is an invalid size");
@@ -62,7 +62,7 @@ private:
struct Attributes {
union {
u32_le raw{};
- BitField<0, 1, u32_le> connected;
+ BitField<0, 1, u32> connected;
};
};
static_assert(sizeof(Attributes) == 0x4, "Attributes is an invalid size");