fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'GliniakRepo/local_multiplayer' into canary_experimental

Browse Source
This commit is contained in:
Gliniak
2022-05-19 10:56:21 +02:00
parent 6c6c5ac14b 17b30be56a
commit 7c2cd16548
9 changed files with 130 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/xenia/hid/input_system.cc
View File

@@ -28,6 +28,18 @@ void InputSystem::AddDriver(std::unique_ptr<InputDriver> driver) {
drivers_.push_back(std::move(driver));
}
void InputSystem::UpdateUsedSlot(uint8_t slot, bool connected) {
if (slot == 0xFF) {
slot = 0;
}
if (connected) {
connected_slot |= (1 << slot);
} else {
connected_slot &= ~(1 << slot);
}
}
X_RESULT InputSystem::GetCapabilities(uint32_t user_index, uint32_t flags,
X_INPUT_CAPABILITIES* out_caps) {
SCOPE_profile_cpu_f("hid");
@@ -39,9 +51,11 @@ X_RESULT InputSystem::GetCapabilities(uint32_t user_index, uint32_t flags,
any_connected = true;
}
if (result == X_ERROR_SUCCESS) {
UpdateUsedSlot(user_index, any_connected);
return result;
}
}
UpdateUsedSlot(user_index, any_connected);
return any_connected ? X_ERROR_EMPTY : X_ERROR_DEVICE_NOT_CONNECTED;
}
@@ -55,9 +69,11 @@ X_RESULT InputSystem::GetState(uint32_t user_index, X_INPUT_STATE* out_state) {
any_connected = true;
}
if (result == X_ERROR_SUCCESS) {
UpdateUsedSlot(user_index, any_connected);
return result;
}
}
UpdateUsedSlot(user_index, any_connected);
return any_connected ? X_ERROR_EMPTY : X_ERROR_DEVICE_NOT_CONNECTED;
}
@@ -72,9 +88,11 @@ X_RESULT InputSystem::SetState(uint32_t user_index,
any_connected = true;
}
if (result == X_ERROR_SUCCESS) {
UpdateUsedSlot(user_index, any_connected);
return result;
}
}
UpdateUsedSlot(user_index, any_connected);
return any_connected ? X_ERROR_EMPTY : X_ERROR_DEVICE_NOT_CONNECTED;
}
@@ -89,9 +107,11 @@ X_RESULT InputSystem::GetKeystroke(uint32_t user_index, uint32_t flags,
any_connected = true;
}
if (result == X_ERROR_SUCCESS || result == X_ERROR_EMPTY) {
UpdateUsedSlot(user_index, any_connected);
return result;
}
}
UpdateUsedSlot(user_index, any_connected);
return any_connected ? X_ERROR_EMPTY : X_ERROR_DEVICE_NOT_CONNECTED;
}