summaryrefslogtreecommitdiff
path: root/src/common/key_map.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-21 18:36:46 -0500
committerGravatar bunnei2015-01-21 18:36:46 -0500
commit0c7498545f7f9beeb7e8070e1a1955a8d6f40bb6 (patch)
tree9eaedc4e6d764f3436a45ba05e79f16fec1ff299 /src/common/key_map.cpp
parentMerge pull request #429 from Kingcom/titlebar (diff)
parentAdded HID_SPVR service and split HID_U implementation into service/hid/hid.xxx (diff)
downloadyuzu-0c7498545f7f9beeb7e8070e1a1955a8d6f40bb6.tar.gz
yuzu-0c7498545f7f9beeb7e8070e1a1955a8d6f40bb6.tar.xz
yuzu-0c7498545f7f9beeb7e8070e1a1955a8d6f40bb6.zip
Merge pull request #491 from archshift/hidspvr
Added HID_SPVR service and split HID_U implementation into hle/service/hid/hid.xxx
Diffstat (limited to 'src/common/key_map.cpp')
-rw-r--r--src/common/key_map.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp
index d8945bb13..844d5df68 100644
--- a/src/common/key_map.cpp
+++ b/src/common/key_map.cpp
@@ -7,18 +7,18 @@
7 7
8namespace KeyMap { 8namespace KeyMap {
9 9
10static std::map<HostDeviceKey, HID_User::PadState> key_map; 10static std::map<HostDeviceKey, Service::HID::PadState> key_map;
11static int next_device_id = 0; 11static int next_device_id = 0;
12 12
13int NewDeviceId() { 13int NewDeviceId() {
14 return next_device_id++; 14 return next_device_id++;
15} 15}
16 16
17void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState) { 17void SetKeyMapping(HostDeviceKey key, Service::HID::PadState padState) {
18 key_map[key].hex = padState.hex; 18 key_map[key].hex = padState.hex;
19} 19}
20 20
21HID_User::PadState GetPadKey(HostDeviceKey key) { 21Service::HID::PadState GetPadKey(HostDeviceKey key) {
22 return key_map[key]; 22 return key_map[key];
23} 23}
24 24