mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-27 18:20:27 +00:00
a4b934b71a
* Fix Sixaxis gamepad operation
== DETAILS
It looks like commit 78e7d23c14
broke
the DualShock. Sorry, @revvv, but this is probably going to break the
Retrode driver. We'll need to figure out a different solution.
* Fix a bunch of HID implementations
== DETAILS
As mentioned in the previous commit, the thing that broke the DS3
driver was a change to the wiiu HID handler, which did some pointer
math on the data buffer.
The thing is.. there's no reason to do that pointer math. Yet, I found
the same thing on almost every other HID driver: OSX, libusb, wiiusb.
The only other HID driver that did not do this was the Bluetooth
HID driver.
It doesn't make any sense. The only reason it doesn't crash is because
the memory right before the buffer is valid memory.
Change summary:
- remove the weird pointer math from all HID controllers
- remove the `#ifdef apple ...` in the ds3 and gamecube adapter
drivers, because it's no longer needed.
- in the pad packet handlers, decrement data buffer offset references
to account for the removal of the buffer manipulation.
* Fix DualShock 4
== DETAILS
Should've only subtracted 1, not 2; and now the pad works.
Also, added a PID to cover newer model DS4s. I picked "R2" out of the air
for the constant.
Tested on Mac OS
* Really really fix iohidmanager_set_report
A huge apology to @23rd for insulting your fix. I was wrong to call you
wrong.
That left the question: why did that change break the DS3?
Well, it's because `IOHIDDeviceSetReport` expects the report buffer to be
just the report. All of RA's HID SetReport calls include the report number
in the first byte, so we have to trim that off.
We actually do this in a different invocation of `IOHIDDeviceSetReport`
elsewhere in the file! This commit applies that same logic to
`iohidmanager_set_report`
This has two benefits:
1. The DS3 works
2. The DS3 no longer requres the user to press the PS button to activate
it the first time. You plug it in and it Just Works, just like on Wii U.
347 lines
9.8 KiB
C
347 lines
9.8 KiB
C
/* RetroArch - A frontend for libretro.
|
|
* Copyright (C) 2013-2014 - Jason Fetters
|
|
* Copyright (C) 2011-2017 - Daniel De Matteis
|
|
*
|
|
* RetroArch is free software: you can redistribute it and/or modify it under the terms
|
|
* of the GNU General Public License as published by the Free Software Found-
|
|
* ation, either version 3 of the License, or (at your option) any later version.
|
|
*
|
|
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
|
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
* PURPOSE. See the GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with RetroArch.
|
|
* If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <boolean.h>
|
|
#include <retro_environment.h>
|
|
#include <retro_miscellaneous.h>
|
|
#include <retro_endianness.h>
|
|
|
|
#include "joypad_connection.h"
|
|
#include "../input_defines.h"
|
|
#include "../../driver.h"
|
|
|
|
enum connect_ps4_dpad_states
|
|
{
|
|
DPAD_UP = 0x0,
|
|
DPAD_UP_RIGHT = 0x1,
|
|
DPAD_RIGHT = 0x2,
|
|
DPAD_RIGHT_DOWN = 0x3,
|
|
DPAD_DOWN = 0x4,
|
|
DPAD_DOWN_LEFT = 0x5,
|
|
DPAD_LEFT = 0x6,
|
|
DPAD_LEFT_UP = 0x7,
|
|
DPAD_OFF = 0x8
|
|
};
|
|
|
|
#if (__STDC_VERSION__ >= 199901L) || defined(__cplusplus)
|
|
typedef uint8_t bf_uint8_t;
|
|
#else
|
|
typedef int bf_uint8_t;
|
|
#endif
|
|
|
|
struct ps4buttons
|
|
{
|
|
#ifdef MSB_FIRST
|
|
bf_uint8_t triangle : 1;
|
|
bf_uint8_t circle : 1;
|
|
bf_uint8_t cross : 1;
|
|
bf_uint8_t square : 1;
|
|
bf_uint8_t dpad : 4;
|
|
|
|
bf_uint8_t r3 : 1;
|
|
bf_uint8_t l3 : 1;
|
|
bf_uint8_t options : 1;
|
|
bf_uint8_t share : 1;
|
|
bf_uint8_t r2 : 1;
|
|
bf_uint8_t l2 : 1;
|
|
bf_uint8_t r1 : 1;
|
|
bf_uint8_t l1 : 1;
|
|
|
|
bf_uint8_t reportcounter : 6;
|
|
bf_uint8_t touchpad : 1;
|
|
bf_uint8_t ps : 1;
|
|
#else
|
|
bf_uint8_t dpad : 4;
|
|
bf_uint8_t square : 1;
|
|
bf_uint8_t cross : 1;
|
|
bf_uint8_t circle : 1;
|
|
bf_uint8_t triangle : 1;
|
|
|
|
bf_uint8_t l1 : 1;
|
|
bf_uint8_t r1 : 1;
|
|
bf_uint8_t l2 : 1;
|
|
bf_uint8_t r2 : 1;
|
|
bf_uint8_t share : 1;
|
|
bf_uint8_t options : 1;
|
|
bf_uint8_t l3 : 1;
|
|
bf_uint8_t r3 : 1;
|
|
|
|
bf_uint8_t ps : 1;
|
|
bf_uint8_t touchpad : 1;
|
|
bf_uint8_t reportcounter : 6;
|
|
#endif
|
|
}__attribute__((packed));
|
|
|
|
/* NOTE: This needs to be aligned
|
|
* exactly like this, don't change this */
|
|
struct ps4
|
|
{
|
|
uint8_t hatvalue[4];
|
|
struct ps4buttons btn;
|
|
uint8_t trigger[2];
|
|
};
|
|
|
|
struct hidpad_ps4_data
|
|
{
|
|
struct pad_connection* connection;
|
|
hid_driver_t *driver;
|
|
uint32_t slot;
|
|
uint16_t motors[2];
|
|
struct ps4 data; /* uint8_t alignment */
|
|
bool have_led;
|
|
};
|
|
|
|
static void hidpad_ps4_send_control(struct hidpad_ps4_data* device)
|
|
{
|
|
/* TODO: Can this be modified to turn off motion tracking? */
|
|
static uint8_t report_buffer[79] = {
|
|
0x52, 0x11, 0xB0, 0x00, 0x0F
|
|
};
|
|
|
|
#if 0
|
|
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[10] = rgb[(device->slot % 4)][1];
|
|
report_buffer[11] = rgb[(device->slot % 4)][2];
|
|
#endif
|
|
|
|
device->driver->send_control(device->connection,
|
|
report_buffer, sizeof(report_buffer));
|
|
}
|
|
|
|
static void* hidpad_ps4_init(void *data, uint32_t slot, hid_driver_t *driver)
|
|
{
|
|
#if 0
|
|
uint8_t magic_data[0x25];
|
|
#endif
|
|
struct pad_connection* connection = (struct pad_connection*)data;
|
|
struct hidpad_ps4_data* device = (struct hidpad_ps4_data*)
|
|
calloc(1, sizeof(struct hidpad_ps4_data));
|
|
|
|
if (!device)
|
|
goto error;
|
|
|
|
if (!connection)
|
|
goto error;
|
|
|
|
device->connection = connection;
|
|
device->driver = driver;
|
|
device->slot = slot;
|
|
|
|
#if 0
|
|
/* TODO - unsure of this */
|
|
/* This is needed to get full input packet over bluetooth. */
|
|
device->driver->send_control(device->connection, magic_data, 0x2);
|
|
(void)magic_data;
|
|
#endif
|
|
|
|
/* Without this, the digital buttons won't be reported. */
|
|
hidpad_ps4_send_control(device);
|
|
|
|
return device;
|
|
|
|
error:
|
|
if (device)
|
|
free(device);
|
|
return NULL;
|
|
}
|
|
|
|
static void hidpad_ps4_deinit(void *data)
|
|
{
|
|
struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
|
|
|
|
if (device)
|
|
free(device);
|
|
}
|
|
|
|
static bool hidpad_ps4_check_dpad(struct ps4 *rpt, unsigned id)
|
|
{
|
|
switch (id)
|
|
{
|
|
case RETRO_DEVICE_ID_JOYPAD_UP:
|
|
return (rpt->btn.dpad == DPAD_LEFT_UP) || (rpt->btn.dpad == DPAD_UP) || (rpt->btn.dpad == DPAD_UP_RIGHT);
|
|
case RETRO_DEVICE_ID_JOYPAD_RIGHT:
|
|
return (rpt->btn.dpad == DPAD_UP_RIGHT) || (rpt->btn.dpad == DPAD_RIGHT) || (rpt->btn.dpad == DPAD_RIGHT_DOWN);
|
|
case RETRO_DEVICE_ID_JOYPAD_DOWN:
|
|
return (rpt->btn.dpad == DPAD_RIGHT_DOWN) || (rpt->btn.dpad == DPAD_DOWN) || (rpt->btn.dpad == DPAD_DOWN_LEFT);
|
|
case RETRO_DEVICE_ID_JOYPAD_LEFT:
|
|
return (rpt->btn.dpad == DPAD_DOWN_LEFT) || (rpt->btn.dpad == DPAD_LEFT) || (rpt->btn.dpad == DPAD_LEFT_UP);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
static void hidpad_ps4_get_buttons(void *data, input_bits_t* state)
|
|
{
|
|
struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
|
|
struct ps4 *rpt = device ?
|
|
(struct ps4*)&device->data : NULL;
|
|
|
|
if (!device || !rpt)
|
|
return;
|
|
|
|
BIT256_CLEAR_ALL_PTR( state );
|
|
|
|
if (rpt->btn.r3)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_R3 );
|
|
if (rpt->btn.l3)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_L3 );
|
|
if (rpt->btn.options)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_START );
|
|
if ( rpt->btn.share)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_SELECT );
|
|
if ( rpt->btn.r2)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_R2 );
|
|
if (rpt->btn.l2)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_L2 );
|
|
if (rpt->btn.r1)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_R );
|
|
if (rpt->btn.l1)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_L );
|
|
if (rpt->btn.triangle)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_X );
|
|
if (rpt->btn.circle)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_A );
|
|
if (rpt->btn.cross)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_B );
|
|
if (rpt->btn.square)
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_Y );
|
|
if ((hidpad_ps4_check_dpad(rpt, RETRO_DEVICE_ID_JOYPAD_LEFT)))
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_LEFT );
|
|
if ((hidpad_ps4_check_dpad(rpt, RETRO_DEVICE_ID_JOYPAD_DOWN)))
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_DOWN );
|
|
if ((hidpad_ps4_check_dpad(rpt, RETRO_DEVICE_ID_JOYPAD_RIGHT)))
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_RIGHT );
|
|
if ((hidpad_ps4_check_dpad(rpt, RETRO_DEVICE_ID_JOYPAD_UP)))
|
|
BIT256_SET_PTR( state, RETRO_DEVICE_ID_JOYPAD_UP );
|
|
if (rpt->btn.ps)
|
|
BIT256_SET_PTR( state, RARCH_MENU_TOGGLE );
|
|
}
|
|
|
|
static int16_t hidpad_ps4_get_axis(void *data, unsigned axis)
|
|
{
|
|
struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
|
|
|
|
if (device && (axis < 4))
|
|
{
|
|
struct ps4 *rpt = device ? (struct ps4*)&device->data : NULL;
|
|
int val = rpt ? rpt->hatvalue[axis] : 0;
|
|
val = (val << 8) - 0x8000;
|
|
return (abs(val) > 0x1000) ? val : 0;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void hidpad_ps4_packet_handler(void *data,
|
|
uint8_t *packet, uint16_t size)
|
|
{
|
|
struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
|
|
|
|
if (!device)
|
|
return;
|
|
|
|
#if 0
|
|
if (!device->have_led)
|
|
{
|
|
hidpad_ps4_send_control(device);
|
|
device->have_led = true;
|
|
}
|
|
#endif
|
|
|
|
memcpy(&device->data, packet+1, sizeof(struct ps4));
|
|
}
|
|
|
|
static void hidpad_ps4_set_rumble(void *data,
|
|
enum retro_rumble_effect effect, uint16_t strength)
|
|
{
|
|
/* TODO */
|
|
#if 0
|
|
struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
|
|
unsigned idx = (effect == RETRO_RUMBLE_STRONG) ? 0 : 1;
|
|
|
|
if (device && (device->motors[idx] != strength))
|
|
{
|
|
device->motors[idx] = strength;
|
|
hidpad_ps4_send_control(device);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
static int32_t hidpad_ps4_button(void *data, uint16_t joykey)
|
|
{
|
|
struct hidpad_ps4_data *device = (struct hidpad_ps4_data*)data;
|
|
struct ps4 *rpt = device ?
|
|
(struct ps4*)&device->data : NULL;
|
|
if (!device || !rpt || joykey > 31)
|
|
return 0;
|
|
|
|
switch (joykey)
|
|
{
|
|
case RETRO_DEVICE_ID_JOYPAD_R3:
|
|
return rpt->btn.r3;
|
|
case RETRO_DEVICE_ID_JOYPAD_L3:
|
|
return rpt->btn.l3;
|
|
case RETRO_DEVICE_ID_JOYPAD_START:
|
|
return rpt->btn.options;
|
|
case RETRO_DEVICE_ID_JOYPAD_SELECT:
|
|
return rpt->btn.share;
|
|
case RETRO_DEVICE_ID_JOYPAD_R2:
|
|
return rpt->btn.r2;
|
|
case RETRO_DEVICE_ID_JOYPAD_L2:
|
|
return rpt->btn.l2;
|
|
case RETRO_DEVICE_ID_JOYPAD_R:
|
|
return rpt->btn.r1;
|
|
case RETRO_DEVICE_ID_JOYPAD_L:
|
|
return rpt->btn.l1;
|
|
case RETRO_DEVICE_ID_JOYPAD_X:
|
|
return rpt->btn.triangle;
|
|
case RETRO_DEVICE_ID_JOYPAD_A:
|
|
return rpt->btn.circle;
|
|
case RETRO_DEVICE_ID_JOYPAD_B:
|
|
return rpt->btn.cross;
|
|
case RETRO_DEVICE_ID_JOYPAD_Y:
|
|
return rpt->btn.square;
|
|
case RETRO_DEVICE_ID_JOYPAD_LEFT:
|
|
case RETRO_DEVICE_ID_JOYPAD_RIGHT:
|
|
case RETRO_DEVICE_ID_JOYPAD_DOWN:
|
|
case RETRO_DEVICE_ID_JOYPAD_UP:
|
|
return hidpad_ps4_check_dpad(rpt, joykey);
|
|
case RARCH_MENU_TOGGLE:
|
|
return rpt->btn.ps;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
pad_connection_interface_t pad_connection_ps4 = {
|
|
hidpad_ps4_init,
|
|
hidpad_ps4_deinit,
|
|
hidpad_ps4_packet_handler,
|
|
hidpad_ps4_set_rumble,
|
|
hidpad_ps4_get_buttons,
|
|
hidpad_ps4_get_axis,
|
|
NULL, /* get_name */
|
|
hidpad_ps4_button,
|
|
false
|
|
};
|