diff options
| author | 2014-09-02 22:24:03 -0700 | |
|---|---|---|
| committer | 2014-09-11 22:43:42 -0700 | |
| commit | bb7ddede159d820b6f8b49caf0758940903ece3b (patch) | |
| tree | c9304b3f845ef3615a7599adbd3b6189d57a5191 /src | |
| parent | Merge pull request #99 from archshift/ext-check (diff) | |
| download | yuzu-bb7ddede159d820b6f8b49caf0758940903ece3b.tar.gz yuzu-bb7ddede159d820b6f8b49caf0758940903ece3b.tar.xz yuzu-bb7ddede159d820b6f8b49caf0758940903ece3b.zip | |
Created structure for PAD.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/service/hid.h | 25 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/core/hle/service/hid.cpp b/src/core/hle/service/hid.cpp index 4e470795f..6a4895c90 100644 --- a/src/core/hle/service/hid.cpp +++ b/src/core/hle/service/hid.cpp | |||
| @@ -57,6 +57,9 @@ const Interface::FunctionInfo FunctionTable[] = { | |||
| 57 | {0x00170000, nullptr, "GetSoundVolume"}, | 57 | {0x00170000, nullptr, "GetSoundVolume"}, |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | |||
| 61 | |||
| 62 | |||
| 60 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 63 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 61 | // Interface class | 64 | // Interface class |
| 62 | 65 | ||
diff --git a/src/core/hle/service/hid.h b/src/core/hle/service/hid.h index b17fcfa86..6ddf2f80f 100644 --- a/src/core/hle/service/hid.h +++ b/src/core/hle/service/hid.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include "core/hle/service/service.h" | 7 | #include "core/hle/service/service.h" |
| 8 | #include "common/bit_field.h" | ||
| 8 | 9 | ||
| 9 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 10 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 10 | // Namespace HID_User | 11 | // Namespace HID_User |
| @@ -14,6 +15,30 @@ | |||
| 14 | 15 | ||
| 15 | namespace HID_User { | 16 | namespace HID_User { |
| 16 | 17 | ||
| 18 | struct PADState { | ||
| 19 | union { | ||
| 20 | u32 hex; | ||
| 21 | |||
| 22 | BitField<0, 1, u32> A; | ||
| 23 | BitField<1, 1, u32> B; | ||
| 24 | BitField<2, 1, u32> Select; | ||
| 25 | BitField<3, 1, u32> Start; | ||
| 26 | BitField<4, 1, u32> Right; | ||
| 27 | BitField<5, 1, u32> Left; | ||
| 28 | BitField<6, 1, u32> Up; | ||
| 29 | BitField<7, 1, u32> Down; | ||
| 30 | BitField<8, 1, u32> R; | ||
| 31 | BitField<9, 1, u32> L; | ||
| 32 | BitField<10, 1, u32> X; | ||
| 33 | BitField<11, 1, u32> Y; | ||
| 34 | |||
| 35 | BitField<28, 1, u32> CircleRight; | ||
| 36 | BitField<29, 1, u32> CircleLeft; | ||
| 37 | BitField<30, 1, u32> CircleUp; | ||
| 38 | BitField<31, 1, u32> CircleDown; | ||
| 39 | }; | ||
| 40 | }; | ||
| 41 | |||
| 17 | class Interface : public Service::Interface { | 42 | class Interface : public Service::Interface { |
| 18 | public: | 43 | public: |
| 19 | 44 | ||