libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

[ORBIS] Update input driver

Browse Source
This commit is contained in:
Francisco José García García 2018-12-30 14:00:18 +01:00
parent 9c5a934529
commit 4ad083cb97
5 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configuration.c
View File

@ -240,6 +240,7 @@ enum joypad_driver_enum
JOYPAD_GX,
JOYPAD_WIIU,
JOYPAD_XDK,
JOYPAD_PS4,
JOYPAD_PSP,
JOYPAD_PS2,
JOYPAD_CTR,
@ -488,6 +489,8 @@ static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_GX;
static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_WIIU;
#elif defined(_XBOX)
static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_XDK;
#elif defined(ORBIS)
static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_PS4;
#elif defined(PSP) || defined(VITA)
static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_PSP;
#elif defined(PS2)
@ -898,6 +901,8 @@ const char *config_get_default_joypad(void)
switch (default_driver)
{
case JOYPAD_PS4:
return "ps4";
case JOYPAD_PS3:
return "ps3";
case JOYPAD_XINPUT:

3
frontend/drivers/platform_orbis.c
View File

@ -92,6 +92,9 @@ int main(int argc, char *argv[])
return -1;
}
orbisPadInitWithConf(myConf->confPad);
scePadClose(myConf->confPad->padHandle);
return rarch_main(argc, argv, NULL);
}

2
input/drivers/ps4_input.c
View File

@ -144,7 +144,7 @@ input_driver_t input_ps4 = {
NULL,
NULL,
ps4_input_get_capabilities,
"orbis",
"ps4",
ps4_input_grab_mouse,
NULL,
ps4_input_set_rumble,

29
input/drivers_joypad/ps4_joypad.c
View File

@ -85,13 +85,14 @@ static bool ps4_joypad_init(void *data)
SceUserServiceLoginUserIdList userIdList;
int result = sceUserServiceGetLoginUserIdList(&userIdList);
if (result < 0)
RARCH_LOG("sceUserServiceGetLoginUserIdList %x ", result);
if (result == 0)
{
for (int i = 0; i < SCE_USER_SERVICE_MAX_LOGIN_USERS; i++)
{
SceUserServiceUserId userId = userIdList.userId[i];
RARCH_LOG("USER %d ID %x\n", i, userId);
if (userId != SCE_USER_SERVICE_USER_ID_INVALID)
{
int index = 0;
@ -104,10 +105,12 @@ static bool ps4_joypad_init(void *data)
if (index == num_players)
{
ds_joypad_states[num_players].handle = scePadOpen(userId, 0, 0, NULL);
RARCH_LOG("USER %x HANDLE %x\n", userId, ds_joypad_states[num_players].handle);
if (ds_joypad_states[num_players].handle > 0){
num_players++;
ds_joypad_states[num_players].connected = true;
ds_joypad_states[num_players].userId = userId;
RARCH_LOG("NEW PAD: num_players %x \n", num_players);
bool auto_configure = input_autoconfigure_connect( ps4_joypad_name(i),
NULL,
@ -131,15 +134,22 @@ static bool ps4_joypad_init(void *data)
static bool ps4_joypad_button(unsigned port_num, uint16_t joykey)
{
RARCH_LOG("[JOYPAD] BUTTONS %x\n" , port_num);
if (port_num >= PS4_MAX_ORBISPADS)
return false;
RARCH_LOG("[JOYPAD] BUTTONS %x\n" , (pad_state[port_num] & (UINT64_C(1) << joykey)));
return (pad_state[port_num] & (UINT64_C(1) << joykey));
}
static void ps4_joypad_get_buttons(unsigned port_num, input_bits_t *state)
{
BIT256_CLEAR_ALL_PTR(state);
RARCH_LOG("[JOYPAD] BUTTONS %x\n" , port_num);
if (port_num < PS4_MAX_ORBISPADS)
{
BITS_COPY16_PTR( state, pad_state[port_num] );
}
else
BIT256_CLEAR_ALL_PTR(state);
}
static int16_t ps4_joypad_axis(unsigned port_num, uint32_t joyaxis)
@ -152,6 +162,7 @@ static void ps4_joypad_poll(void)
unsigned player;
unsigned players_count = num_players;
ScePadData buttons;
RARCH_LOG("[JOYPAD] Polling \n");
for (player = 0; player < players_count; player++)
{
@ -160,10 +171,11 @@ static void ps4_joypad_poll(void)
unsigned p = player;
int ret = scePadReadState(ds_joypad_states[player].handle,&buttons);
if (ret != 0)
RARCH_LOG("[JOYPAD] Returned %x\n" , ret);
if (ret == 0)
{
int32_t state_tmp = buttons.buttons;
RARCH_LOG("[JOYPAD] BUTTONS %x\n" , buttons.buttons);
pad_state[i] = 0;
pad_state[i] |= (state_tmp & ORBISPAD_LEFT) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0;
@ -182,6 +194,7 @@ static void ps4_joypad_poll(void)
pad_state[i] |= (state_tmp & ORBISPAD_L2) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L2) : 0;
pad_state[i] |= (state_tmp & ORBISPAD_R3) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R3) : 0;
pad_state[i] |= (state_tmp & ORBISPAD_L3) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L3) : 0;
RARCH_LOG("[JOYPAD] BUTTONS %x\n" , pad_state[i]);
}
}
@ -189,12 +202,16 @@ static void ps4_joypad_poll(void)
static bool ps4_joypad_query_pad(unsigned pad)
{
RARCH_LOG("[JOYPAD] BUTTONS %x\n" , pad);
return pad < PS4_MAX_ORBISPADS && pad_state[pad];
}
static bool ps4_joypad_rumble(unsigned pad,
enum retro_rumble_effect effect, uint16_t strength)
{
RARCH_LOG("[JOYPAD] BUTTONS %x\n" , pad);
return false;
}

2
input/input_driver.c
View File

@ -164,7 +164,7 @@ static input_device_driver_t *joypad_drivers[] = {
#ifdef _XBOX
&xdk_joypad,
#endif
#if defined(PS4)
#if defined(ORBIS)
&ps4_joypad,
#endif
#if defined(PSP) || defined(VITA)