ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Create Missing Paths for Dev_USB/HDD0 and mms 

In addiytion, fix 2 warnings.
This commit is contained in:
Darkhost1999 2023-07-19 04:01:44 -05:00 committed by GitHub
parent 50dad6801b
commit a0297933ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/Io/usio.cpp
View File

@ -122,12 +122,12 @@ void usb_device_usio::control_transfer(u8 bmRequestType, u8 bRequest, u16 wValue
transfer->fake = true;
// Control transfers are nearly instant
switch (bmRequestType)
//switch (bmRequestType)
{
default:
//default:
// Follow to default emulated handler
usb_device_emulated::control_transfer(bmRequestType, bRequest, wValue, wIndex, wLength, buf_size, buf, transfer);
break;
//break;
}
}

22
rpcs3/Emu/System.cpp
View File

@ -424,7 +424,17 @@ void Emulator::Init()
make_path_verbose(dev_flash, true);
make_path_verbose(dev_flash2, true);
make_path_verbose(dev_flash3, true);
make_path_verbose(dev_usb, true);
if (make_path_verbose(dev_usb, true))
{
make_path_verbose(dev_usb + "MUSIC/", false);
make_path_verbose(dev_usb + "VIDEO/", false);
make_path_verbose(dev_usb + "PICTURE/", false);
make_path_verbose(dev_usb + "PS3/EXPORT/PSV/", false); // PS1 and PS2 Saves go here
make_path_verbose(dev_usb + "PS3/SAVEDATA", false);
make_path_verbose(dev_usb + "PS3/THEME", false);
make_path_verbose(dev_usb + "PS3/UPDATE", false);
}
if (make_path_verbose(dev_hdd1, true))
{
@ -453,6 +463,16 @@ void Emulator::Init()
make_path_verbose(dev_hdd0 + "savedata/", false);
make_path_verbose(dev_hdd0 + "savedata/vmc/", false);
make_path_verbose(dev_hdd0 + "photo/", false);
make_path_verbose(dev_hdd0 + "music/", false);
make_path_verbose(dev_hdd0 + "theme/", false);
make_path_verbose(dev_hdd0 + "video/", false);
make_path_verbose(dev_hdd0 + "drm/", false);
make_path_verbose(dev_hdd0 + "vsh/", false);
make_path_verbose(dev_hdd0 + "crash_report/", false);
make_path_verbose(dev_hdd0 + "tmp/", false);
make_path_verbose(dev_hdd0 + "mms/", false); //multimedia server for vsh, created from rebuilding the database
make_path_verbose(dev_hdd0 + "data/", false);
make_path_verbose(dev_hdd0 + "vm/", false);
}
const std::string games_common_dir = g_cfg_vfs.get(g_cfg_vfs.games_dir, emu_dir);

4
rpcs3/rpcs3qt/main_window.h
View File

@ -1,8 +1,8 @@
#pragma once
#ifdef _WIN32
#include <QWinTHumbnailToolbar>
#include <QWinTHumbnailToolbutton>
#include <QWinThumbnailToolBar>
#include <QWinThumbnailToolButton>
#endif
#include <QActionGroup>

4
rpcs3/util/dyn_lib.hpp
View File

@ -14,7 +14,7 @@ namespace utils
dynamic_library(const dynamic_library&) = delete;
dynamic_library(dynamic_library&& other)
dynamic_library(dynamic_library&& other) noexcept
: m_handle(other.m_handle)
{
other.m_handle = nullptr;
@ -22,7 +22,7 @@ namespace utils
dynamic_library& operator=(const dynamic_library&) = delete;
dynamic_library& operator=(dynamic_library&& other)
dynamic_library& operator=(dynamic_library&& other) noexcept
{
std::swap(m_handle, other.m_handle);
return *this;