diff options
author | Tony Wasserka <neobrainx@gmail.com> | 2015-07-28 13:17:12 +0200 |
---|---|---|
committer | Tony Wasserka <neobrainx@gmail.com> | 2015-07-28 13:17:12 +0200 |
commit | 62adb4ee7b69449aa2c9ac2a519b49b9d54f15fe (patch) | |
tree | 2abf715b8693863fd730852aa8cc485e034d0572 /src/core/hle/service/hid/hid.h | |
parent | 62caa89f480591260a95d165ccc62ec6c8dd9044 (diff) | |
parent | 1bc7829ee9f8bb73c92c7be672a77308ea44fe70 (diff) |
Merge pull request #873 from jroweboy/input_array
Move input values into an array.
Diffstat (limited to 'src/core/hle/service/hid/hid.h')
-rw-r--r-- | src/core/hle/service/hid/hid.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index d50d479f..517f4f2a 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -9,7 +9,7 @@ #ifndef _MSC_VER #include <cstddef> #endif - +#include "core/settings.h" #include "common/bit_field.h" #include "common/common_funcs.h" #include "common/common_types.h" @@ -157,6 +157,9 @@ const PadState PAD_CIRCLE_LEFT = {{1u << 29}}; const PadState PAD_CIRCLE_UP = {{1u << 30}}; const PadState PAD_CIRCLE_DOWN = {{1u << 31}}; + +extern const std::array<Service::HID::PadState, Settings::NativeInput::NUM_INPUTS> pad_mapping; + /** * HID::GetIPCHandles service function * Inputs: |