Added HID_SPVR service and split HID_U implementation into service/hid/hid.xxx

This commit is contained in:
archshift
2015-01-18 15:07:48 -08:00
parent 8946df97b5
commit 1f109c6b49
15 changed files with 378 additions and 264 deletions

View File

@ -5,13 +5,13 @@
#include "emu_window.h"
void EmuWindow::KeyPressed(KeyMap::HostDeviceKey key) {
HID_User::PadState mapped_key = KeyMap::GetPadKey(key);
Service::HID::PadState mapped_key = KeyMap::GetPadKey(key);
HID_User::PadButtonPress(mapped_key);
Service::HID::PadButtonPress(mapped_key);
}
void EmuWindow::KeyReleased(KeyMap::HostDeviceKey key) {
HID_User::PadState mapped_key = KeyMap::GetPadKey(key);
Service::HID::PadState mapped_key = KeyMap::GetPadKey(key);
HID_User::PadButtonRelease(mapped_key);
Service::HID::PadButtonRelease(mapped_key);
}

View File

@ -7,18 +7,18 @@
namespace KeyMap {
static std::map<HostDeviceKey, HID_User::PadState> key_map;
static std::map<HostDeviceKey, Service::HID::PadState> key_map;
static int next_device_id = 0;
int NewDeviceId() {
return next_device_id++;
}
void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState) {
void SetKeyMapping(HostDeviceKey key, Service::HID::PadState padState) {
key_map[key].hex = padState.hex;
}
HID_User::PadState GetPadKey(HostDeviceKey key) {
Service::HID::PadState GetPadKey(HostDeviceKey key) {
return key_map[key];
}

View File

@ -4,7 +4,7 @@
#pragma once
#include "core/hle/service/hid_user.h"
#include "core/hle/service/hid/hid.h"
namespace KeyMap {
@ -35,11 +35,11 @@ int NewDeviceId();
/**
* Maps a device-specific key to a PadState.
*/
void SetKeyMapping(HostDeviceKey key, HID_User::PadState padState);
void SetKeyMapping(HostDeviceKey key, Service::HID::PadState padState);
/**
* Gets the PadState that's mapped to the provided device-specific key.
*/
HID_User::PadState GetPadKey(HostDeviceKey key);
Service::HID::PadState GetPadKey(HostDeviceKey key);
}