preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Attempt to add support for DualSense over Bluetooth

Browse Source
This commit is contained in:
Henrik Rydgård
2026-02-03 00:18:15 +01:00
parent 1f43b1cf23
commit 62a570904c
6 changed files with 192 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Windows/Hid/DualSense.cpp
+167 -75
View File
@@ -1,11 +1,13 @@
// Some info from
// https://controllers.fandom.com/wiki/Sony_DualSense
#include <cstring>
#include "Windows/Hid/DualShock.h"
#include "Windows/Hid/DualSense.h"
#include "Windows/Hid/HidInputDevice.h"
#include "Windows/Hid/HidCommon.h"
#pragma pack(push,1)
struct DualSenseOutputReport {
u8 reportId;
u8 flags1;
@@ -26,50 +28,8 @@ struct DualSenseOutputReport {
};
static_assert(sizeof(DualSenseOutputReport) == 48);
// https://github.com/ds4windowsapp/DS4Windows/blob/65609b470f53a4f832fb07ac24085d3e28ec15bd/DS4Windows/DS4Library/InputDevices/DualSenseDevice.cs#L905
// Sends initialization packet to DualSense
bool InitializeDualSense(HANDLE handle, int outReportSize) {
if (outReportSize != sizeof(DualSenseOutputReport)) {
return false;
}
DualSenseOutputReport report{};
report.reportId = 2;
report.flags1 = 0x0C;
report.flags2 = 0x15;
report.muteLED = 1;
report.playerLights = 1;
report.enableBrightness = 1;
report.brightness = 0; // 0 = high, 1 = medium, 2 = low
report.lightbarRed = LED_R;
report.lightbarGreen = LED_G;
report.lightbarBlue = LED_B;
return WriteReport(handle, report);
}
bool ShutdownDualsense(HANDLE handle, int outReportSize) {
if (outReportSize != sizeof(DualSenseOutputReport)) {
return false;
}
DualSenseOutputReport report{};
report.reportId = 2;
report.flags1 = 0x0C;
report.flags2 = 0x15;
report.muteLED = 1;
report.playerLights = 0;
report.enableBrightness = 1;
report.brightness = 2; // 0 = high, 1 = medium, 2 = low
report.lightbarRed = 0;
report.lightbarGreen = 0;
report.lightbarBlue = 0;
return WriteReport(handle, report);
}
// So strange that this is different!
struct DualSenseInputReport {
u8 firstByte; // must be 1
struct DualSenseInputReportUSB {
u8 reportId; // Must be 1
u8 lx;
u8 ly;
@@ -86,55 +46,187 @@ struct DualSenseInputReport {
s16 gyroscope[3];
s16 accelerometer[3];
// There's more stuff after here.
};
bool ReadDualSenseInput(HANDLE handle, HIDControllerState *state) {
BYTE inputReport[64]{}; // 64-byte input report for DS4
#pragma pack(push, 1)
struct DualSenseInputReportBT {
u8 reportId; // Must be 0x31
u8 seq_tag; // Sequence tag / Transaction header
u8 lx;
u8 ly;
u8 rx;
u8 ry;
u8 l2_analog;
u8 r2_analog;
u8 frameCounter; // Offset 8
// The BT struct differs from the USB one here:
// USB has buttons immediately after frameCounter. BT has 6 bytes of status/battery data first.
u8 unknown_status[6];
u8 buttons[3]; // Offset 15, 16, 17
u8 device_extra; // Offset 18 (often contains power/battery status)
u8 pad[3]; // Offset 19, 20, 21
s16 gyroscope[3];
s16 accelerometer[3];
// There's more stuff after here.
};
#pragma pack(pop)
// https://github.com/ds4windowsapp/DS4Windows/blob/65609b470f53a4f832fb07ac24085d3e28ec15bd/DS4Windows/DS4Library/InputDevices/DualSenseDevice.cs#L905
static void FillDualSenseOutputReport(DualSenseOutputReport *report, bool lightsOn) {
report->reportId = 2;
report->flags1 = 0x0C;
report->flags2 = 0x15;
report->muteLED = 1;
// Turn on the lights.
report->playerLights = 1;
report->enableBrightness = 1;
report->brightness = lightsOn ? 0 : 2; // 0 = high, 1 = medium, 2 = low
report->lightbarRed = lightsOn ? LED_R : 0;
report->lightbarGreen = lightsOn ? LED_G : 0;
report->lightbarBlue = lightsOn ? LED_B : 0;
}
static bool SendReport(HANDLE handle, const DualSenseOutputReport &report, int outReportSize) {
if (outReportSize == sizeof(DualSenseOutputReport)) {
// USB case: Just write the plain struct.
return WriteReport(handle, report);
} else if (outReportSize >= 547) {
// BT case. Not as fun!
std::vector<uint8_t> buffer(outReportSize, 0);
// 1. Report ID 0x31 is required for Extended Features (Rumble/LED) over BT
buffer[0] = 0x31;
// 2. Bluetooth Header: 0x02 sets the "tag" for the controller to process the report
buffer[1] = 0x02;
// We skip report.reportId because buffer[0] is already 0x31
// Copy everything after reportId into buffer starting at index 2
memcpy(&buffer[2], (uint8_t*)&report + 1, sizeof(DualSenseOutputReport) - 1);
// 4. Calculate CRC32
// The DualSense expects a CRC of the Report ID (0x31) + the entire data payload.
// For a 547 byte report, the CRC is placed at index 543 (the last 4 bytes).
uint32_t crc = ComputePSControllerCRC(buffer.data(), 543);
// Append CRC in Little Endian
// memcpy(buffer.data() + 543, &crc, 4);
buffer[543] = (uint8_t)(crc & 0xFF);
buffer[544] = (uint8_t)((crc >> 8) & 0xFF);
buffer[545] = (uint8_t)((crc >> 16) & 0xFF);
buffer[546] = (uint8_t)((crc >> 24) & 0xFF);
return WriteReport(handle, buffer.data(), buffer.size());
} else {
ERROR_LOG(Log::System, "SendReport: Unexpected outReportSize: %d", outReportSize);
return false;
}
}
// Sends initialization packet to DualSense
bool InitializeDualSense(HANDLE handle, int outReportSize) {
DualSenseOutputReport report{};
FillDualSenseOutputReport(&report, true);
return SendReport(handle, report, outReportSize);
}
bool ShutdownDualsense(HANDLE handle, int outReportSize) {
if (outReportSize != sizeof(DualSenseOutputReport)) {
return false;
}
DualSenseOutputReport report{};
FillDualSenseOutputReport(&report, false);
return SendReport(handle, report, outReportSize);
}
bool ReadDualSenseInput(HANDLE handle, HIDControllerState *state, int inReportSize) {
if (inReportSize > 1024) {
return false;
}
BYTE inputReport[1024]{};
DWORD bytesRead = 0;
if (!ReadFile(handle, inputReport, sizeof(inputReport), &bytesRead, nullptr)) {
if (!ReadFile(handle, inputReport, inReportSize, &bytesRead, nullptr)) {
const u32 error = GetLastError();
return false;
}
DualSenseInputReport report{};
static_assert(sizeof(report) < sizeof(inputReport));
if (bytesRead < 14) {
return false;
}
u32 buttons{};
// OK, check the first byte to figure out what we're dealing with here.
if (inputReport[0] != 1) {
// Wrong data
if (inputReport[0] == 0x1 && inReportSize == 64) {
// A valid USB packet.
DualSenseInputReportUSB report;
memcpy(&report, inputReport, sizeof(report));
// Center the sticks.
state->stickAxes[HID_STICK_LX] = report.lx - 128;
state->stickAxes[HID_STICK_LY] = report.ly - 128;
state->stickAxes[HID_STICK_RX] = report.rx - 128;
state->stickAxes[HID_STICK_RY] = report.ry - 128;
// Copy over the triggers.
state->triggerAxes[HID_TRIGGER_L2] = report.l2_analog;
state->triggerAxes[HID_TRIGGER_R2] = report.r2_analog;
const float accelScale = (1.0f / 8192.0f) * 9.81f;
// We need to remap the axes a bit.
state->accValid = true;
state->accelerometer[0] = -report.accelerometer[2] * accelScale;
state->accelerometer[1] = -report.accelerometer[0] * accelScale;
state->accelerometer[2] = report.accelerometer[1] * accelScale;
memcpy(&buttons, &report.buttons[0], 3);
// Fall through to button processing
} else if (inputReport[0] == 0x31 && inReportSize >= 547) {
// A valid bluetooth packet. The layout is a bit different!
// A valid USB packet.
DualSenseInputReportUSB report;
memcpy(&report, inputReport, sizeof(report));
// Center the sticks.
state->stickAxes[HID_STICK_LX] = report.lx - 128;
state->stickAxes[HID_STICK_LY] = report.ly - 128;
state->stickAxes[HID_STICK_RX] = report.rx - 128;
state->stickAxes[HID_STICK_RY] = report.ry - 128;
// Copy over the triggers.
state->triggerAxes[HID_TRIGGER_L2] = report.l2_analog;
state->triggerAxes[HID_TRIGGER_R2] = report.r2_analog;
const float accelScale = (1.0f / 8192.0f) * 9.81f;
// We need to remap the axes a bit.
state->accValid = true;
state->accelerometer[0] = -report.accelerometer[2] * accelScale;
state->accelerometer[1] = -report.accelerometer[0] * accelScale;
state->accelerometer[2] = report.accelerometer[1] * accelScale;
memcpy(&buttons, &report.buttons[0], 3);
// Fall through to button processing
} else {
// Unknown packet (simple BT?). Ignore.
return false;
}
// const bool isBluetooth = (reportId == 0x11 || reportId == 0x31);
memcpy(&report, inputReport, sizeof(report));
// Center the sticks.
state->stickAxes[HID_STICK_LX] = report.lx - 128;
state->stickAxes[HID_STICK_LY] = report.ly - 128;
state->stickAxes[HID_STICK_RX] = report.rx - 128;
state->stickAxes[HID_STICK_RY] = report.ry - 128;
// Copy over the triggers.
state->triggerAxes[HID_TRIGGER_L2] = report.l2_analog;
state->triggerAxes[HID_TRIGGER_R2] = report.r2_analog;
const float accelScale = (1.0f / 8192.0f) * 9.81f;
// We need to remap the axes a bit.
state->accValid = true;
state->accelerometer[0] = -report.accelerometer[2] * accelScale;
state->accelerometer[1] = -report.accelerometer[0] * accelScale;
state->accelerometer[2] = report.accelerometer[1] * accelScale;
u32 buttons{};
report.buttons[2] &= 3; // Remove noise
memcpy(&buttons, &report.buttons[0], 3);
// Shared button handling.
// Clear out and re-fill the DPAD, it works differently somehow
const u32 hat = buttons & 0xF;
buttons &= ~0xF;
buttons |= DecodePSHatSwitch(report.buttons[0] & 0xF);
buttons |= DecodePSHatSwitch(hat);
state->buttons = buttons;
return true;
Windows/Hid/DualSense.h
+1 -1
View File
@@ -4,4 +4,4 @@
bool InitializeDualSense(HANDLE handle, int outReportSize);
bool ShutdownDualsense(HANDLE handle, int outReportSize);
bool ReadDualSenseInput(HANDLE handle, HIDControllerState *state);
bool ReadDualSenseInput(HANDLE handle, HIDControllerState *state, int inReportSize);
Windows/Hid/DualShock.cpp
+18 -3
View File
@@ -111,10 +111,13 @@ struct DualShockInputReport {
// Then there's motion and all kinds of stuff.
};
bool ReadDualShockInput(HANDLE handle, HIDControllerState *state) {
BYTE inputReport[64]{}; // 64-byte input report for DS4
bool ReadDualShockInput(HANDLE handle, HIDControllerState *state, int inReportSize) {
if (inReportSize > 1024) {
return false;
}
BYTE inputReport[1024]{};
DWORD bytesRead = 0;
if (!ReadFile(handle, inputReport, sizeof(inputReport), &bytesRead, nullptr)) {
if (!ReadFile(handle, inputReport, inReportSize, &bytesRead, nullptr)) {
u32 error = GetLastError();
return false;
}
@@ -163,3 +166,15 @@ bool ReadDualShockInput(HANDLE handle, HIDControllerState *state) {
state->buttons = buttons;
return true;
}
// Standard CRC32 used by PlayStation controllers
uint32_t ComputePSControllerCRC(uint8_t* data, size_t len) {
uint32_t crc = 0xFFFFFFFF;
for (size_t i = 0; i < len; i++) {
crc ^= data[i];
for (int j = 0; j < 8; j++) {
crc = (crc >> 1) ^ (0xEDB88320 & (-(int32_t)(crc & 1)));
}
}
return ~crc;
}
Windows/Hid/DualShock.h
+2 -1
View File
@@ -47,5 +47,6 @@ inline u32 DecodePSHatSwitch(u8 dpad) {
bool InitializeDualShock(HANDLE handle, int outReportSize);
bool ShutdownDualShock(HANDLE handle, int outReportSize);
bool ReadDualShockInput(HANDLE handle, HIDControllerState *state);
bool ReadDualShockInput(HANDLE handle, HIDControllerState *state, int inReportSize);
void GetPSInputMappings(const ButtonInputMapping **mappings, size_t *size);
uint32_t ComputePSControllerCRC(uint8_t* data, size_t len);
Windows/Hid/HidInputDevice.cpp
+3 -3
View File
@@ -214,7 +214,7 @@ int HidInputDevice::UpdateState() {
if (pollCount_ == 0) {
pollCount_ = POLL_FREQ;
const HIDControllerInfo *info{};
HANDLE newController = OpenFirstHIDController(&subType_, &reportSize_, &outReportSize_, &info);
HANDLE newController = OpenFirstHIDController(&subType_, &inReportSize_, &outReportSize_, &info);
if (newController) {
controller_ = newController;
if (info) {
@@ -233,10 +233,10 @@ int HidInputDevice::UpdateState() {
const ButtonInputMapping *buttonMappings = nullptr;
size_t buttonMappingsSize = 0;
if (subType_ == HIDControllerType::DS4) {
result = ReadDualShockInput(controller_, &state);
result = ReadDualShockInput(controller_, &state, inReportSize_);
GetPSInputMappings(&buttonMappings, &buttonMappingsSize);
} else if (subType_ == HIDControllerType::DS5) {
result = ReadDualSenseInput(controller_, &state);
result = ReadDualSenseInput(controller_, &state, inReportSize_);
GetPSInputMappings(&buttonMappings, &buttonMappingsSize);
} else if (subType_ == HIDControllerType::SwitchPro) {
result = ReadSwitchProInput(controller_, &state);
Windows/Hid/HidInputDevice.h
+1 -1
View File
@@ -56,7 +56,7 @@ private:
std::string name_;
int pad_ = 0;
int pollCount_ = 0;
int reportSize_ = 0;
int inReportSize_ = 0;
int outReportSize_ = 0;
enum {
POLL_FREQ = 283, // a prime number.