mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-01-06 07:06:00 +00:00
Merge pull request #764 from StevenMiller123/scePadOpenFix
Some checks are pending
Reuse / reuse (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
Linux-Qt / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS-Qt / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
Windows-Qt / build (push) Waiting to run
Some checks are pending
Reuse / reuse (push) Waiting to run
Clang Format / clang-format (push) Waiting to run
Linux-Qt / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS-Qt / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
Windows-Qt / build (push) Waiting to run
Add "support" for ORBIS_PAD_PORT_TYPE_REMOTE_CONTROL
This commit is contained in:
commit
bea5f643ca
|
@ -250,7 +250,7 @@ int PS4_SYSV_ABI scePadOpen(s32 userId, s32 type, s32 index, const OrbisPadOpenP
|
||||||
if (type != ORBIS_PAD_PORT_TYPE_SPECIAL)
|
if (type != ORBIS_PAD_PORT_TYPE_SPECIAL)
|
||||||
return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED;
|
return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED;
|
||||||
} else {
|
} else {
|
||||||
if (type != ORBIS_PAD_PORT_TYPE_STANDARD)
|
if (type != ORBIS_PAD_PORT_TYPE_STANDARD && type != ORBIS_PAD_PORT_TYPE_REMOTE_CONTROL)
|
||||||
return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED;
|
return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED;
|
||||||
}
|
}
|
||||||
return 1; // dummy
|
return 1; // dummy
|
||||||
|
@ -263,7 +263,7 @@ int PS4_SYSV_ABI scePadOpenExt(s32 userId, s32 type, s32 index,
|
||||||
if (type != ORBIS_PAD_PORT_TYPE_SPECIAL)
|
if (type != ORBIS_PAD_PORT_TYPE_SPECIAL)
|
||||||
return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED;
|
return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED;
|
||||||
} else {
|
} else {
|
||||||
if (type != ORBIS_PAD_PORT_TYPE_STANDARD)
|
if (type != ORBIS_PAD_PORT_TYPE_STANDARD && type != ORBIS_PAD_PORT_TYPE_REMOTE_CONTROL)
|
||||||
return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED;
|
return ORBIS_PAD_ERROR_DEVICE_NOT_CONNECTED;
|
||||||
}
|
}
|
||||||
return 1; // dummy
|
return 1; // dummy
|
||||||
|
|
|
@ -16,6 +16,7 @@ constexpr int ORBIS_PAD_MAX_DEVICE_UNIQUE_DATA_SIZE = 12;
|
||||||
|
|
||||||
constexpr int ORBIS_PAD_PORT_TYPE_STANDARD = 0;
|
constexpr int ORBIS_PAD_PORT_TYPE_STANDARD = 0;
|
||||||
constexpr int ORBIS_PAD_PORT_TYPE_SPECIAL = 2;
|
constexpr int ORBIS_PAD_PORT_TYPE_SPECIAL = 2;
|
||||||
|
constexpr int ORBIS_PAD_PORT_TYPE_REMOTE_CONTROL = 16;
|
||||||
|
|
||||||
enum OrbisPadDeviceClass {
|
enum OrbisPadDeviceClass {
|
||||||
ORBIS_PAD_DEVICE_CLASS_INVALID = -1,
|
ORBIS_PAD_DEVICE_CLASS_INVALID = -1,
|
||||||
|
|
Loading…
Reference in a new issue