mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

MacOS: Fix Sixaxis (DS3) support (#14402)

Browse Source 
* MacOS: Fix sixaxis on MacOS 12.x

== DETAILS
Mac OS 12.x "Monterey" dropped some built-in support for the
Sixaxis controller--exactly what changed is unclear, but other
projects reported similar issues with the OS.

This commit ports the work done on SDL, which is basically to
read two feature reports after writing out the activation report.
I think we did this at one point in the past, but it got lost
among HID driver rewrites.

I've tested this locally and it resolves the issue; after connecting
the sixaxis and pressing the Playstation button, the pad is registered
and works successfully.

I have not tested this on other platforms.

* Gracefully handle incomplete HID implementations

== DETAILS
Not all HID drivers implement all HID methods; since this controller
has a magic sequence that requires the ability to set and get HID
reports, we need to make sure we don't crash if we're running on
an incomplete implementation.

- Add a null check for the driver methods and log useful info if checks
  fail
- Fix minor formatting
This commit is contained in:
gblues 2022-09-11 00:40:38 -07:00 committed by GitHub
parent 422d2fcf12
commit cdd39a6364
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
input/connect/connect_ps3.c
View File

@ -72,7 +72,7 @@ struct __attribute__((__packed__)) sixaxis_output_report
struct __attribute__((__packed__)) sixaxis_activation_report
{
uint8_t report_id;
uint8_t unknown[4];
uint8_t knock[4];
};
union sixaxis_activation_report_f4
@ -93,7 +93,7 @@ static const union sixaxis_output_report_01 default_report = {
0x00, /* padding */
0xff, 0x00, /* right rumble */
0xff, 0x00, /* left rumble */
0x00, 0x00, 0x00, 0x00, /* padding */
0x00, 0x00, 0x00, 0x00, /* gyro */
0x00, /* LED bitmap */
0xff, 0x27, 0x10, 0x00, 0x32, /* LED 1 config */
0xff, 0x27, 0x10, 0x00, 0x32, /* LED 2 config */
@ -107,25 +107,43 @@ static const union sixaxis_output_report_01 default_report = {
};
static const union sixaxis_activation_report_f4 ds3_activation_packet = {
{ 0xF4, 0x42, 0x0c, 0x00, 0x00 }
{ 0xf4, 0x42, 0x0c, 0x00, 0x00 }
};
/* forward declarations */
static int ds3_set_operational(ds3_instance_t *instance)
{
int ret;
const int buf_size = SIXAXIS_REPORT_0xF2_SIZE;
uint8_t *buf = (uint8_t *)malloc(buf_size);
uint8_t usb_packet[64] = { 0x00 };
if (!buf)
if(instance->driver->set_report == NULL || instance->driver->get_report == NULL) {
RARCH_ERR("This HID implementation does not support the Sony Sixaxis controller:\n");
if(instance->driver->set_report == NULL)
RARCH_ERR("- set_report implementation is missing\n");
if(instance->driver->get_report == NULL)
RARCH_ERR("- get_report implementation is missing\n");
return -1;
}
ret = instance->driver->set_report(instance->handle, HID_REPORT_FEATURE, ds3_activation_packet.data.report_id, (uint8_t*)ds3_activation_packet.buf, sizeof(ds3_activation_packet));
if (ret < 0)
ret = instance->driver->set_report(instance->handle, HID_REPORT_FEATURE, ds3_activation_packet.data.report_id, ds3_activation_packet.buf, sizeof(ds3_activation_packet.buf));
if (ret < 0) {
RARCH_LOG("Failed to send activation packet\n");
return ret;
}
free(buf);
return ret;
ret = instance->driver->get_report(instance->handle, HID_REPORT_FEATURE, 0xf2, &usb_packet, SIXAXIS_REPORT_0xF2_SIZE);
if (ret < 0) {
RARCH_LOG("Failed to read feature report 0xf2\n");
return ret;
}
ret = instance->driver->get_report(instance->handle, HID_REPORT_FEATURE, 0xf5, &usb_packet, SIXAXIS_REPORT_0xF5_SIZE);
if (ret < 0) {
RARCH_LOG("Failed to read feature report 0xf5\n");
return ret;
}
return 0;
}
static uint8_t ds3_get_leds(unsigned pad_number)
@ -242,7 +260,7 @@ static void *ds3_init(void *handle, uint32_t slot, hid_driver_t *driver)
RARCH_LOG("Failed to send output report\n");
goto error;
}
if (ds3_set_operational(instance) < 0)
{
RARCH_LOG("Failed to set operational mode\n");