From 07fd035aa23bde3210ae68ce01802a36ef3ebc43 Mon Sep 17 00:00:00 2001 From: Florin9doi Date: Sun, 11 Aug 2024 12:12:42 +0300 Subject: [PATCH] USB: Set actual_length value for Get HID descriptor --- pcsx2/USB/usb-pad/usb-buzz.cpp | 3 ++- pcsx2/USB/usb-pad/usb-gametrak.cpp | 3 ++- pcsx2/USB/usb-pad/usb-realplay.cpp | 3 ++- pcsx2/USB/usb-pad/usb-seamic.cpp | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pcsx2/USB/usb-pad/usb-buzz.cpp b/pcsx2/USB/usb-pad/usb-buzz.cpp index dd8d7c419f..9f9bc5eb79 100644 --- a/pcsx2/USB/usb-pad/usb-buzz.cpp +++ b/pcsx2/USB/usb-pad/usb-buzz.cpp @@ -133,7 +133,8 @@ namespace usb_pad { case USB_DT_REPORT: ret = sizeof(hid_report_descriptor); - memcpy(data, hid_report_descriptor, ret); + std::memcpy(data, hid_report_descriptor, ret); + p->actual_length = ret; break; } break; diff --git a/pcsx2/USB/usb-pad/usb-gametrak.cpp b/pcsx2/USB/usb-pad/usb-gametrak.cpp index 72c2a024dd..5085a6dc3b 100644 --- a/pcsx2/USB/usb-pad/usb-gametrak.cpp +++ b/pcsx2/USB/usb-pad/usb-gametrak.cpp @@ -166,7 +166,8 @@ namespace usb_pad { case USB_DT_REPORT: ret = sizeof(hid_report_descriptor); - memcpy(data, hid_report_descriptor, ret); + std::memcpy(data, hid_report_descriptor, ret); + p->actual_length = ret; break; } break; diff --git a/pcsx2/USB/usb-pad/usb-realplay.cpp b/pcsx2/USB/usb-pad/usb-realplay.cpp index bb871fba73..d5f5a1d7d4 100644 --- a/pcsx2/USB/usb-pad/usb-realplay.cpp +++ b/pcsx2/USB/usb-pad/usb-realplay.cpp @@ -216,7 +216,8 @@ namespace usb_pad { case USB_DT_REPORT: ret = sizeof(hid_report_descriptor); - memcpy(data, hid_report_descriptor, ret); + std::memcpy(data, hid_report_descriptor, ret); + p->actual_length = ret; break; } break; diff --git a/pcsx2/USB/usb-pad/usb-seamic.cpp b/pcsx2/USB/usb-pad/usb-seamic.cpp index 4d3bb05831..2561d2434e 100644 --- a/pcsx2/USB/usb-pad/usb-seamic.cpp +++ b/pcsx2/USB/usb-pad/usb-seamic.cpp @@ -296,7 +296,7 @@ namespace usb_pad { case USB_DT_REPORT: ret = sizeof(hid_report_descriptor); - memcpy(data, hid_report_descriptor, ret); + std::memcpy(data, hid_report_descriptor, ret); p->actual_length = ret; break; default: @@ -308,7 +308,6 @@ namespace usb_pad if (length > 0) { p->actual_length = 0; - //p->status = USB_RET_SUCCESS; } break; case SET_IDLE: