mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS4/joypad_connection) Changes

Browse Source
This commit is contained in:
Twinaphex 2015-03-31 19:23:06 +02:00
parent b9da2bc32f
commit 047fdbd3fc
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
input/connect/connect_ps4.c
View File

@ -68,12 +68,16 @@ static void* hidpad_ps4_init(void *data, uint32_t slot, send_control_t ptr)
device->slot = slot; device->slot = slot;
device->send_control = ptr; device->send_control = ptr;
#if 0
/* TODO - unsure of this */ /* TODO - unsure of this */
/* This is needed to get full input packet over bluetooth. */ /* This is needed to get full input packet over bluetooth. */
device->send_control(device->connection, magic_data, 0x2); device->send_control(device->connection, magic_data, 0x2);
#endif
/* Without this, the digital buttons won't be reported. */ /* Without this, the digital buttons won't be reported. */
hidpad_ps4_send_control(device); hidpad_ps4_send_control(device);
(void)magic_data;
return device; return device;
} }
@ -86,10 +90,9 @@ static void hidpad_ps4_deinit(void *data)
free(device); free(device);
} }
#if 0 static uint64_t hidpad_ps4_get_buttons(void *data)
static uint32_t hidpad_ps4_get_buttons(void *data)
{ {
uint32_t result = 0; uint64_t result = 0;
struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data; struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
struct Report struct Report
@ -140,11 +143,10 @@ static int16_t hidpad_ps4_get_axis(void *data, unsigned axis)
return 0; return 0;
} }
#endif
static void hidpad_ps4_packet_handler(void *data, uint8_t *packet, uint16_t size) static void hidpad_ps4_packet_handler(void *data, uint8_t *packet, uint16_t size)
{ {
int i; uint32_t i;
struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data; struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
if (!device) if (!device)
@ -159,8 +161,19 @@ static void hidpad_ps4_packet_handler(void *data, uint8_t *packet, uint16_t size
device->have_led = true; device->have_led = true;
} }
#endif #endif
struct Report
memcpy(device->data, packet, size); {
uint8_t leftX;
uint8_t leftY;
uint8_t rightX;
uint8_t rightY;
uint8_t buttons[3];
uint8_t leftTrigger;
uint8_t rightTrigger;
};
struct Report *rpt = (struct Report*)&packet[4];
(void)rpt;
} }
static void hidpad_ps4_set_rumble(void *data, static void hidpad_ps4_set_rumble(void *data,
@ -183,5 +196,7 @@ pad_connection_interface_t pad_connection_ps4 = {
hidpad_ps4_init, hidpad_ps4_init,
hidpad_ps4_deinit, hidpad_ps4_deinit,
hidpad_ps4_packet_handler, hidpad_ps4_packet_handler,
hidpad_ps4_set_rumble hidpad_ps4_set_rumble,
hidpad_ps4_get_buttons,
hidpad_ps4_get_axis,
}; };

2
input/connect/joypad_connection.c
View File

@ -90,6 +90,8 @@ int32_t pad_connection_pad_init(joypad_connection_t *joyconn,
s->iface = pad_map[i].iface; s->iface = pad_map[i].iface;
s->data = s->iface->init(data, pad, ptr); s->data = s->iface->init(data, pad, ptr);
s->connected = true; s->connected = true;
return pad;
} }
} }
} }

1
input/connect/joypad_connection.h
View File

@ -36,6 +36,7 @@ typedef struct pad_connection_interface
extern pad_connection_interface_t pad_connection_wii; extern pad_connection_interface_t pad_connection_wii;
extern pad_connection_interface_t pad_connection_ps3; extern pad_connection_interface_t pad_connection_ps3;
extern pad_connection_interface_t pad_connection_ps4;
typedef struct joypad_connection typedef struct joypad_connection
{ {