mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(apple_joypad_ps4.c) - build fixes

Browse Source
This commit is contained in:
Twinaphex 2014-09-30 10:55:52 +02:00
parent e65831a778
commit 597f25624a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
input/apple_joypad.c
View File

@ -26,6 +26,7 @@
#include "wiimote.c" #include "wiimote.c"
#include "apple_joypad_ps3.c" #include "apple_joypad_ps3.c"
#include "apple_joypad_ps4.c"
#include "apple_joypad_wii.c" #include "apple_joypad_wii.c"
typedef struct typedef struct
@ -74,7 +75,7 @@ int32_t apple_joypad_connect(const char* name, void *data)
{ {
{ "Nintendo RVL-CNT-01", &apple_pad_wii }, { "Nintendo RVL-CNT-01", &apple_pad_wii },
/* { "Nintendo RVL-CNT-01-UC", &apple_pad_wii }, */ /* WiiU */ /* { "Nintendo RVL-CNT-01-UC", &apple_pad_wii }, */ /* WiiU */
/* { "Wireless Controller", &apple_pad_ps4 }, */ /* DualShock4 */ { "Wireless Controller", &apple_pad_ps4 }, /* DualShock4 */
{ "PLAYSTATION(R)3 Controller", &apple_pad_ps3 }, { "PLAYSTATION(R)3 Controller", &apple_pad_ps3 },
{ 0, 0} { 0, 0}
}; };

12
input/apple_joypad_ps4.c
View File

@ -36,7 +36,7 @@ static void hidpad_ps4_send_control(struct hidpad_ps4_data* device)
0x52, 0x11, 0xB0, 0x00, 0x0F 0x52, 0x11, 0xB0, 0x00, 0x0F
}; };
uint8_t rgb[4][3] { { 0xFF, 0, 0 }, { 0, 0xFF, 0 }, { 0, 0, 0xFF }, { 0xFF, 0xFF, 0xFF } }; uint8_t rgb[4][3] = { { 0xFF, 0, 0 }, { 0, 0xFF, 0 }, { 0, 0, 0xFF }, { 0xFF, 0xFF, 0xFF } };
report_buffer[ 9] = rgb[(device->slot % 4)][0]; report_buffer[ 9] = rgb[(device->slot % 4)][0];
report_buffer[10] = rgb[(device->slot % 4)][1]; report_buffer[10] = rgb[(device->slot % 4)][1];
report_buffer[11] = rgb[(device->slot % 4)][2]; report_buffer[11] = rgb[(device->slot % 4)][2];
@ -79,7 +79,7 @@ static void hidpad_ps4_disconnect(void *data)
static uint32_t hidpad_ps4_get_buttons(void *data) static uint32_t hidpad_ps4_get_buttons(void *data)
{ {
uint32_t i, result = 0; uint32_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
@ -93,7 +93,7 @@ static uint32_t hidpad_ps4_get_buttons(void *data)
uint8_t rightTrigger; uint8_t rightTrigger;
}; };
Report* rpt = (Report*)&device->data[4]; struct Report* rpt = (struct Report*)&device->data[4];
const uint8_t dpad_state = rpt->buttons[0] & 0xF; const uint8_t dpad_state = rpt->buttons[0] & 0xF;
result |= ((rpt->buttons[0] & 0x20) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_B) : 0); result |= ((rpt->buttons[0] & 0x20) ? (1ULL << RETRO_DEVICE_ID_JOYPAD_B) : 0);
@ -143,6 +143,8 @@ static void hidpad_ps4_packet_handler(void *data, uint8_t *packet, uint16_t size
if (!device) if (!device)
return; return;
(void)i;
#if 0 #if 0
if (!device->have_led) if (!device->have_led)
{ {
@ -163,11 +165,11 @@ static void hidpad_ps4_packet_handler(void *data, uint8_t *packet, uint16_t size
static void hidpad_ps4_set_rumble(void *data, static void hidpad_ps4_set_rumble(void *data,
enum retro_rumble_effect effect, uint16_t strength) enum retro_rumble_effect effect, uint16_t strength)
{ {
/* TODO */
#if 0
struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data; struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
unsigned index = (effect == RETRO_RUMBLE_STRONG) ? 0 : 1; unsigned index = (effect == RETRO_RUMBLE_STRONG) ? 0 : 1;
/* TODO */
#if 0
if (device && (device->motors[index] != strength)) if (device && (device->motors[index] != strength))
{ {
device->motors[index] = strength; device->motors[index] = strength;