1 files changed, 11 insertions, 7 deletions

diff --git a/src/common/key_map.cpp b/src/common/key_map.cpp
index 5941a105b..309caab98 100644
--- a/src/common/key_map.cpp
+++ b/src/common/key_map.cpp
@@ -1,21 +1,25 @@
-// Copyright 2013 Dolphin Emulator Project
+// Copyright 2014 Citra Emulator Project
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
 #include "key_map.h"
 #include <map>
 
-
 namespace KeyMap {
 
-std::map<CitraKey, HID_User::PADState> g_key_map;
+static std::map<HostDeviceKey, HID_User::PadState> key_map;
+static int next_device_id = 0;
+
+int NewDeviceId() {
+    return next_device_id++;
+}
 
-void SetKeyMapping(CitraKey key, HID_User::PADState padState) {
-    g_key_map[key].hex = padState.hex;
+void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState) {
+    key_map[key].hex = padState.hex;
 }
 
-HID_User::PADState Get3DSKey(CitraKey key) {
-    return g_key_map[key];
+HID_User::PadState GetPadKey(HostDeviceKey key) {
+    return key_map[key];
 }
 
 }