mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-05 06:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lv2_socket id_base

Browse Source
This commit is contained in:
Nekotekina 2017-12-25 21:08:04 +03:00
parent 39a3ed2d03
commit a605919729
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Emu/Cell/lv2/sys_net.cpp
View File

@ -88,7 +88,7 @@ static s32 get_last_error(bool is_blocking, int native_error = 0)
static void network_clear_queue(ppu_thread& ppu)
{
idm::select<lv2_socket>([&](u32 id, lv2_socket& sock)
idm::select<lv2_socket>([&](u32, lv2_socket& sock)
{
semaphore_lock lock(sock.mutex);
@ -356,7 +356,7 @@ s32 sys_net_bnet_accept(ppu_thread& ppu, s32 s, vm::ptr<sys_net_sockaddr> addr,
result = idm::import_existing<lv2_socket>(newsock);
if (result == -1)
if (result == id_manager::id_traits<lv2_socket>::invalid)
{
return -SYS_NET_EMFILE;
}
@ -1386,7 +1386,7 @@ s32 sys_net_bnet_socket(ppu_thread& ppu, s32 family, s32 type, s32 protocol)
const s32 s = idm::import_existing<lv2_socket>(std::make_shared<lv2_socket>(native_socket));
if (s == -1)
if (s == id_manager::id_traits<lv2_socket>::invalid)
{
return -SYS_NET_EMFILE;
}
@ -1624,7 +1624,7 @@ s32 sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set> readf
continue;
}
if (auto sock = idm::check_unlocked<lv2_socket>(i))
if (auto sock = idm::check_unlocked<lv2_socket>((lv2_socket::id_base & -1024) + i))
{
#ifdef _WIN32
bool sig = false;
@ -1700,7 +1700,7 @@ s32 sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set> readf
continue;
}
if (auto sock = idm::check_unlocked<lv2_socket>(i))
if (auto sock = idm::check_unlocked<lv2_socket>((lv2_socket::id_base & -1024) + i))
{
semaphore_lock lock(sock->mutex);

8
rpcs3/Emu/Cell/lv2/sys_net.h
View File

@ -8,7 +8,7 @@
#include <functional>
// Error codes
enum
enum
{
SYS_NET_ENOENT = 2,
SYS_NET_EINTR = 4,
@ -172,7 +172,7 @@ using sys_net_socklen_t = u32;
struct sys_net_fd_set
{
be_t<u32> fds_bits[32];
u32 bit(s32 s)
{
return (fds_bits[(s >> 5) & 31] >> (s & 31)) & 1u;
@ -307,9 +307,9 @@ struct lv2_socket final
using socket_type = int;
#endif
static const u32 id_base = 0x40000000;
static const u32 id_base = 24;
static const u32 id_step = 1;
static const u32 id_count = 1024;
static const u32 id_count = 1000;
// Poll events
enum class poll