mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-15 02:29:51 +01:00
Delete some left behind unused code
This commit is contained in:
1 parent
524854ac16
commit
5df4bac6d2
17 files changed
+17
-127
No files matched your search
+1
-4
@@ -36,10 +36,7 @@
|
||||
class PointerWrap;
|
||||
|
||||
// Net stuff
|
||||
#ifdef _XBOX
|
||||
#include <winsockx.h>
|
||||
typedef int socklen_t;
|
||||
#elif defined(_MSC_VER)
|
||||
#if defined(_MSC_VER)
|
||||
#include <WS2tcpip.h>
|
||||
#else
|
||||
#include <unistd.h>
|
||||
|
||||
@@ -32,10 +32,7 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
// Net stuff
|
||||
#ifdef _XBOX
|
||||
#include <winsockx.h>
|
||||
typedef int socklen_t;
|
||||
#elif defined(_MSC_VER)
|
||||
#if defined(_MSC_VER)
|
||||
#include <WS2tcpip.h>
|
||||
#else
|
||||
#include <sys/socket.h>
|
||||
|
||||
@@ -588,11 +588,6 @@ void __IoInit() {
|
||||
if (ioManagerThreadEnabled) {
|
||||
Core_ListenShutdown(&__IoWakeManager);
|
||||
ioManagerThread = new std::thread(&__IoManagerThread);
|
||||
#ifdef _XBOX
|
||||
SuspendThread(ioManagerThread->native_handle());
|
||||
XSetThreadProcessor(ioManagerThread->native_handle(), 4);
|
||||
ResumeThread(ioManagerThread->native_handle());
|
||||
#endif
|
||||
ioManagerThread->detach();
|
||||
}
|
||||
|
||||
|
||||
@@ -17,10 +17,8 @@
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "Common/CommonWindows.h"
|
||||
#ifndef _XBOX
|
||||
// timeval already defined in xtl.h
|
||||
#include <Winsock2.h>
|
||||
#endif
|
||||
#else
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
@@ -138,12 +138,8 @@ static bool Memory_TryBase(u32 flags) {
|
||||
// OK, we know where to find free space. Now grab it!
|
||||
// We just mimic the popular BAT setup.
|
||||
|
||||
#if defined(_XBOX)
|
||||
void *ptr;
|
||||
#else
|
||||
size_t position = 0;
|
||||
size_t last_position = 0;
|
||||
#endif
|
||||
|
||||
// Zero all the pointers to be sure.
|
||||
for (int i = 0; i < num_views; i++)
|
||||
@@ -162,13 +158,6 @@ static bool Memory_TryBase(u32 flags) {
|
||||
continue;
|
||||
SKIP(flags, view.flags);
|
||||
|
||||
#if defined(_XBOX)
|
||||
if (!CanIgnoreView(view)) {
|
||||
*(view.out_ptr_low) = (u8*)(base + view.virtual_address);
|
||||
ptr = VirtualAlloc(base + (view.virtual_address & MEMVIEW32_MASK), view.size, MEM_COMMIT, PAGE_READWRITE);
|
||||
}
|
||||
*(view.out_ptr) = (u8*)base + (view.virtual_address & MEMVIEW32_MASK);
|
||||
#else
|
||||
if (view.flags & MV_MIRROR_PREVIOUS) {
|
||||
position = last_position;
|
||||
} else {
|
||||
@@ -192,7 +181,6 @@ static bool Memory_TryBase(u32 flags) {
|
||||
#endif
|
||||
last_position = position;
|
||||
position += g_arena.roundup(view.size);
|
||||
#endif
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -223,9 +211,6 @@ bail:
|
||||
void MemoryMap_Setup(u32 flags)
|
||||
{
|
||||
// Find a base to reserve 256MB
|
||||
#if defined(_XBOX)
|
||||
base = (u8*)VirtualAlloc(0, 0x10000000, MEM_RESERVE|MEM_LARGE_PAGES, PAGE_READWRITE);
|
||||
#else
|
||||
size_t total_mem = 0;
|
||||
|
||||
for (int i = 0; i < num_views; i++)
|
||||
@@ -244,8 +229,6 @@ void MemoryMap_Setup(u32 flags)
|
||||
// Linux32 is fine with the x64 method, although limited to 32-bit with no automirrors.
|
||||
base = MemArena::Find4GBBase();
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
// Now, create views in high memory where there's plenty of space.
|
||||
#if defined(_WIN32) && !defined(_M_X64)
|
||||
|
||||
Reference in new issue
Block a user