Merge branch 'master' into add_bd_support

Author: digant73

.github/workflows/rpcs3.yml

@@ -235,7 +235,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup NuGet
-        uses: nuget/setup-nuget@v2
+        uses: nuget/setup-nuget@v4
 
       - name: Restore NuGet packages
         run: nuget restore rpcs3.sln

3rdparty/7zip/7zip

@@ -24,6 +24,22 @@ void usb_device::get_location(u8* location) const
 	memcpy(location, this->location.data(), 7);
 }
 
+const UsbDeviceEndpoint* usb_device::find_endpoint(u8 endpoint_addr) const
+{
+	for (const auto& config_node : device.subnodes)
+	{
+		if (config_node.bDescriptorType != USB_DESCRIPTOR_CONFIG)
+			continue;
+
+		for (const auto& node : config_node.subnodes)
+		{
+			if (node.bDescriptorType == USB_DESCRIPTOR_ENDPOINT && node._endpoint.bEndpointAddress == endpoint_addr)
+				return &node._endpoint;
+		}
+	}
+	return nullptr;
+}
+
 void usb_device::read_descriptors()
 {
 }
@@ -88,6 +104,15 @@ void usb_device_passthrough::send_libusb_transfer(libusb_transfer* transfer)
 		default:
 		{
 			sys_usbd.error("Unexpected error from libusb_submit_transfer: %d(%s)", res, libusb_error_name(res));
+
+			// Mark as a failed fake transfer so the USB manager processes a completion
+			// instead of leaving the request stuck in the busy state forever.
+			UsbTransfer* usbd_transfer = static_cast<UsbTransfer*>(transfer->user_data);
+			usbd_transfer->busy = true;
+			usbd_transfer->fake = true;
+			usbd_transfer->expected_result = EHCI_CC_HALTED;
+			usbd_transfer->expected_count = 0;
+			usbd_transfer->expected_time = get_timestamp();
 			return;
 		}
 		}
@@ -163,7 +188,23 @@ void usb_device_passthrough::control_transfer(u8 bmRequestType, u8 bRequest, u16
 
 void usb_device_passthrough::interrupt_transfer(u32 buf_size, u8* buf, u32 endpoint, UsbTransfer* transfer)
 {
-	libusb_fill_interrupt_transfer(transfer->transfer, lusb_handle, endpoint, buf, buf_size, callback_transfer, transfer, 0);
+	// Pick the libusb helper matching the endpoint's actual transfer type. The PS3 USB
+	// stack routes both bulk and interrupt transfers through this method, but submitting
+	// an interrupt URB to a bulk endpoint fails with EINVAL on Linux.
+	const UsbDeviceEndpoint* ep_desc = find_endpoint(static_cast<u8>(endpoint));
+	const bool is_bulk = ep_desc && (ep_desc->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK) == LIBUSB_TRANSFER_TYPE_BULK;
+
+	sys_usbd.notice("USIO debug: submitting passthrough transfer endpoint=0x%x dir=%s size=0x%x type=%s",
+		endpoint, (endpoint & LIBUSB_ENDPOINT_IN) ? "IN" : "OUT", buf_size, is_bulk ? "bulk" : "interrupt");
+
+	if (is_bulk)
+	{
+		libusb_fill_bulk_transfer(transfer->transfer, lusb_handle, endpoint, buf, buf_size, callback_transfer, transfer, 0);
+	}
+	else
+	{
+		libusb_fill_interrupt_transfer(transfer->transfer, lusb_handle, endpoint, buf, buf_size, callback_transfer, transfer, 0);
+	}
 	send_libusb_transfer(transfer->transfer);
 }
 

rpcs3/Emu/Io/usb_device.cpp

@@ -238,6 +238,9 @@ class usb_device
 	virtual void isochronous_transfer(UsbTransfer* transfer)                                                                                        = 0;
 
 public:
+	// Look up an endpoint descriptor by address in the descriptor tree
+	const UsbDeviceEndpoint* find_endpoint(u8 endpoint_addr) const;
+
 	// device ID if the device has been ldded(0 otherwise)
 	u32 assigned_number = 0;
 	// base device descriptor, every other descriptor is a subnode

rpcs3/Emu/Io/usb_device.h

@@ -2,7 +2,6 @@
 #include "main_application.h"
 #include "display_sleep_control.h"
 #include "gamemode_control.h"
-#include "rpcs3qt/gui_settings.h"
 #include "rpcs3qt/config_database.h"
 
 #include "util/types.hpp"
@@ -418,8 +417,7 @@ EmuCallbacks main_application::CreateCallbacks()
 
 		sys_log.notice("Trying to retrieve database config for: '%s'", title_id);
 
-		const auto settings = std::make_shared<gui_settings>();
-		config_database config_db(settings, nullptr);
+		config_database config_db(nullptr);
 		config_db.request_config_database(false);
 
 		if (!config_db.has_config(title_id))

rpcs3/main_application.cpp

@@ -85,7 +85,7 @@ static const bool s_init_locale = []()
 
 static semaphore<> s_qt_init;
 
-static atomic_t<bool> s_headless = false;
+atomic_t<bool> g_headless = false;
 static atomic_t<bool> s_no_gui = false;
 static atomic_t<char*> s_argv0 = nullptr;
 static bool s_is_error_launch = false;
@@ -214,7 +214,7 @@ std::set<std::string> get_one_drive_paths()
 
 	std::string_view text = s_is_error_launch ? _text : buf;
 
-	if (s_headless)
+	if (g_headless)
 	{
 		utils::attach_console(utils::console_stream::std_err, true);
 
@@ -977,7 +977,7 @@ int run_rpcs3(int argc, char** argv)
 	}
 	else if (headless_application* headless_app = qobject_cast<headless_application*>(app.data()))
 	{
-		s_headless = true;
+		g_headless = true;
 
 		headless_app->SetActiveUser(active_user);
 
@@ -1200,7 +1200,7 @@ int run_rpcs3(int argc, char** argv)
 			{
 				sys_log.error("Booting savestate '%s' failed: reason: %s", path, error);
 
-				if (s_headless || s_no_gui)
+				if (g_headless || s_no_gui)
 				{
 					report_fatal_error(fmt::format("Booting savestate '%s' failed!\n\nReason: %s", path, error));
 				}
@@ -1223,7 +1223,7 @@ int run_rpcs3(int argc, char** argv)
 			{
 				sys_log.error("Booting rsx capture '%s' failed", path);
 
-				if (s_headless || s_no_gui)
+				if (g_headless || s_no_gui)
 				{
 					report_fatal_error(fmt::format("Booting rsx capture '%s' failed!", path));
 				}
@@ -1332,20 +1332,20 @@ int run_rpcs3(int argc, char** argv)
 			{
 				sys_log.error("Booting '%s' with cli argument failed: reason: %s", path, error);
 
-				if (s_headless || s_no_gui)
+				if (g_headless || s_no_gui)
 				{
 					report_fatal_error(fmt::format("Booting '%s' failed!\n\nReason: %s", path, error));
 				}
 			}
 		});
 	}
-	else if (s_headless || s_no_gui)
+	else if (g_headless || s_no_gui)
 	{
 		// If launched from CMD
 		utils::attach_console(utils::console_stream::std_out | utils::console_stream::std_err, false);
 
-		sys_log.error("Cannot run %s mode without boot target. Terminating...", s_headless ? "headless" : "no-gui");
-		fprintf(stderr, "Cannot run %s mode without boot target. Terminating...\n", s_headless ? "headless" : "no-gui");
+		sys_log.error("Cannot run %s mode without boot target. Terminating...", g_headless ? "headless" : "no-gui");
+		fprintf(stderr, "Cannot run %s mode without boot target. Terminating...\n", g_headless ? "headless" : "no-gui");
 
 		if (s_no_gui)
 		{

rpcs3/rpcs3.cpp

@@ -6,17 +6,19 @@
 
 LOG_CHANNEL(gui_log, "GUI");
 
-config_database::config_database(std::shared_ptr<gui_settings> settings, QWidget* parent)
+config_database::config_database(QWidget* parent)
 	: QObject(parent)
-	, m_gui_settings(std::move(settings))
 {
-	m_filepath = m_gui_settings->GetSettingsDir() + "/config_database.dat";
-	m_downloader = new downloader(parent);
+	m_filepath = gui_settings::GetSettingsDir() + "config_database.dat";
 	request_config_database();
 
-	connect(m_downloader, &downloader::signal_download_error, this, &config_database::handle_download_error);
-	connect(m_downloader, &downloader::signal_download_finished, this, &config_database::handle_download_finished);
-	connect(m_downloader, &downloader::signal_download_canceled, this, &config_database::handle_download_canceled);
+	if (parent)
+	{
+		m_downloader = new downloader(parent);
+		connect(m_downloader, &downloader::signal_download_error, this, &config_database::handle_download_error);
+		connect(m_downloader, &downloader::signal_download_finished, this, &config_database::handle_download_finished);
+		connect(m_downloader, &downloader::signal_download_canceled, this, &config_database::handle_download_canceled);
+	}
 }
 
 config_database::~config_database()
@@ -89,7 +91,7 @@ void config_database::request_config_database(bool online)
 	const std::string url = "https://api.rpcs3.net/config/?api=v1";
 	gui_log.notice("Beginning config database download from: %s", url);
 
-	m_downloader->start(url, true, true, true, tr("Downloading Config Database"));
+	ensure(m_downloader)->start(url, true, true, true, tr("Downloading Config Database"));
 
 	Q_EMIT download_started();
 }

rpcs3/rpcs3qt/config_database.cpp

@@ -4,14 +4,13 @@
 #include <optional>
 
 class downloader;
-class gui_settings;
 
 class config_database : public QObject
 {
 	Q_OBJECT
 
 public:
-	config_database(std::shared_ptr<gui_settings> settings, QWidget* parent);
+	config_database(QWidget* parent);
 	virtual ~config_database();
 
 	bool has_config(const std::string& title_id) const;
@@ -35,7 +34,6 @@ private Q_SLOTS:
 	/** Creates new set from the database. Returns config for the optional serial. */
 	std::optional<std::string> read_json(const QByteArray& data, bool after_download, const std::string& serial = "");
 
-	std::shared_ptr<gui_settings> m_gui_settings;
 	QString m_filepath;
 	downloader* m_downloader = nullptr;
 

rpcs3/rpcs3qt/config_database.h

@@ -13,17 +13,19 @@
 
 LOG_CHANNEL(compat_log, "Compat");
 
-game_compatibility::game_compatibility(std::shared_ptr<gui_settings> settings, QWidget* parent)
+game_compatibility::game_compatibility(QWidget* parent)
 	: QObject(parent)
-	, m_gui_settings(std::move(settings))
 {
-	m_filepath = m_gui_settings->GetSettingsDir() + "/compat_database.dat";
-	m_downloader = new downloader(parent);
+	m_filepath = gui_settings::GetSettingsDir() + "compat_database.dat";
 	RequestCompatibility();
 
-	connect(m_downloader, &downloader::signal_download_error, this, &game_compatibility::handle_download_error);
-	connect(m_downloader, &downloader::signal_download_finished, this, &game_compatibility::handle_download_finished);
-	connect(m_downloader, &downloader::signal_download_canceled, this, &game_compatibility::handle_download_canceled);
+	if (parent)
+	{
+		m_downloader = new downloader(parent);
+		connect(m_downloader, &downloader::signal_download_error, this, &game_compatibility::handle_download_error);
+		connect(m_downloader, &downloader::signal_download_finished, this, &game_compatibility::handle_download_finished);
+		connect(m_downloader, &downloader::signal_download_canceled, this, &game_compatibility::handle_download_canceled);
+	}
 }
 
 void game_compatibility::handle_download_error(const QString& error)
@@ -227,7 +229,7 @@ void game_compatibility::RequestCompatibility(bool online)
 	const std::string url = "https://rpcs3.net/compatibility?api=v1&export";
 	compat_log.notice("Beginning compatibility database download from: %s", url);
 
-	m_downloader->start(url, true, true, true, tr("Downloading Database"));
+	ensure(m_downloader)->start(url, true, true, true, tr("Downloading Database"));
 
 	// We want to retrieve a new database, therefore refresh game list and indicate that
 	Q_EMIT DownloadStarted();

rpcs3/rpcs3qt/game_compatibility.cpp

@@ -7,7 +7,6 @@
 #include <QJsonObject>
 
 class downloader;
-class gui_settings;
 
 namespace compat
 {
@@ -120,29 +119,9 @@ class game_compatibility : public QObject
 {
 	Q_OBJECT
 
-private:
-	const std::map<QString, compat::status> Status_Data =
-	{
-		{ "Playable", { 0, "", "#1ebc61", tr("Playable"),         tr("Games that can be properly played from start to finish") } },
-		{ "Ingame",   { 1, "", "#f9b32f", tr("Ingame"),           tr("Games that either can't be finished, have serious glitches or have insufficient performance") } },
-		{ "Intro",    { 2, "", "#e08a1e", tr("Intro"),            tr("Games that display image but don't make it past the menus") } },
-		{ "Loadable", { 3, "", "#e74c3c", tr("Loadable"),         tr("Games that display a black screen with a framerate on the window's title") } },
-		{ "Nothing",  { 4, "", "#455556", tr("Nothing"),          tr("Games that don't initialize properly, not loading at all and/or crashing the emulator") } },
-		{ "NoResult", { 5, "", "",        tr("No results found"), tr("There is no entry for this game or application in the compatibility database yet.") } },
-		{ "NoData",   { 6, "", "",        tr("Database missing"), tr("Right click here and download the current database.\nMake sure you are connected to the internet.") } },
-		{ "Download", { 7, "", "",        tr("Retrieving..."),    tr("Downloading the compatibility database. Please wait...") } }
-	};
-	std::shared_ptr<gui_settings> m_gui_settings;
-	QString m_filepath;
-	downloader* m_downloader = nullptr;
-	std::map<std::string, compat::status> m_compat_database;
-
-	/** Creates new map from the database */
-	bool handle_json(const QByteArray& data, bool after_download);
-
 public:
 	/** Handles reads, writes and downloads for the compatibility database */
-	game_compatibility(std::shared_ptr<gui_settings> settings, QWidget* parent);
+	game_compatibility(QWidget* parent);
 
 	/** Reads database. If online set to true: Downloads and writes the database to file */
 	void RequestCompatibility(bool online = false);
@@ -166,4 +145,23 @@ private Q_SLOTS:
 	void handle_download_error(const QString& error);
 	void handle_download_finished(const QByteArray& content);
 	void handle_download_canceled();
+
+private:
+	/** Creates new map from the database */
+	bool handle_json(const QByteArray& data, bool after_download);
+
+	const std::map<QString, compat::status> Status_Data =
+	{
+		{ "Playable", { 0, "", "#1ebc61", tr("Playable"),         tr("Games that can be properly played from start to finish") } },
+		{ "Ingame",   { 1, "", "#f9b32f", tr("Ingame"),           tr("Games that either can't be finished, have serious glitches or have insufficient performance") } },
+		{ "Intro",    { 2, "", "#e08a1e", tr("Intro"),            tr("Games that display image but don't make it past the menus") } },
+		{ "Loadable", { 3, "", "#e74c3c", tr("Loadable"),         tr("Games that display a black screen with a framerate on the window's title") } },
+		{ "Nothing",  { 4, "", "#455556", tr("Nothing"),          tr("Games that don't initialize properly, not loading at all and/or crashing the emulator") } },
+		{ "NoResult", { 5, "", "",        tr("No results found"), tr("There is no entry for this game or application in the compatibility database yet.") } },
+		{ "NoData",   { 6, "", "",        tr("Database missing"), tr("Right click here and download the current database.\nMake sure you are connected to the internet.") } },
+		{ "Download", { 7, "", "",        tr("Retrieving..."),    tr("Downloading the compatibility database. Please wait...") } }
+	};
+	QString m_filepath;
+	downloader* m_downloader = nullptr;
+	std::map<std::string, compat::status> m_compat_database;
 };