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

Core: Remove unused code/includes.

This commit is contained in:
Christian Kenny 2022-05-14 21:57:00 -04:00 committed by refractionpcsx2
parent f4f06c9777
commit d21c01f8d1
16 changed files with 3 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CDVD/CDVD.cpp
View File

@ -30,7 +30,7 @@
#include "Ps1CD.h"
#include "CDVD.h"
#include "CDVD_internal.h"
#include "CDVDisoReader.h"
#include "IsoFileFormats.h"
#include "GS.h" // for gsVideoMode
#include "Elfheader.h"

1
pcsx2/CDVD/CDVD.h
View File

@ -169,7 +169,6 @@ extern void cdvdVsync();
extern void cdvdActionInterrupt();
extern void cdvdSectorReady();
extern void cdvdReadInterrupt();
extern void cdvdDMAInterrupt();
// We really should not have a function with the exact same name as a callback except for case!
extern void cdvdNewDiskCB();

2
pcsx2/CDVD/CDVDaccess.cpp
View File

@ -30,7 +30,7 @@
#include "IsoFS/IsoFS.h"
#include "IsoFS/IsoFSCDVD.h"
#include "CDVDisoReader.h"
#include "IsoFileFormats.h"
#include "common/FileSystem.h"
#include "common/StringUtil.h"

3
pcsx2/CDVD/CDVDisoReader.cpp
View File

@ -21,8 +21,7 @@
*/
#include "PrecompiledHeader.h"
#include "CDVDisoReader.h"
#include "IsoFileFormats.h"
#include "AsyncFileReader.h"
#include "CDVD/CDVD.h"

23
pcsx2/CDVD/CDVDisoReader.h
View File

@ -1,23 +0,0 @@
/* PCSX2 - PS2 Emulator for PCs
* Copyright (C) 2002-2010 PCSX2 Dev Team
*
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
* of the GNU Lesser General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with PCSX2.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CDVD_ISO_READER_H__
#define __CDVD_ISO_READER_H__
#include <stdio.h>
#include "IsoFileFormats.h"
#endif

1
pcsx2/CMakeLists.txt
View File

@ -281,7 +281,6 @@ set(pcsx2CDVDHeaders
CDVD/CDVD.h
CDVD/CDVD_internal.h
CDVD/CDVDdiscReader.h
CDVD/CDVDisoReader.h
CDVD/ChunksCache.h
CDVD/CompressedFileReader.h
CDVD/ChdFileReader.h

3
pcsx2/FiFo.cpp
View File

@ -17,13 +17,10 @@
#include "PrecompiledHeader.h"
#include "Common.h"
#include "GS.h"
#include "Gif.h"
#include "Gif_Unit.h"
#include "Vif.h"
#include "Vif_Dma.h"
#include "IPU/IPU.h"
#include "IPU/IPU_Fifo.h"
//////////////////////////////////////////////////////////////////////////
/////////////////////////// Quick & dirty FIFO :D ////////////////////////

1
pcsx2/Gif.h
View File

@ -283,7 +283,6 @@ struct GIFregisters
static GIFregisters& gifRegs = (GIFregisters&)eeHw[0x3000];
extern void gifInterrupt();
extern int _GIFchain();
extern void GIFdma();
extern void dmaGIF();
extern void mfifoGIFtransfer();

2
pcsx2/IopHw.h
View File

@ -329,8 +329,6 @@ extern void PSX_INT( IopEventId n, s32 ecycle);
extern void psxSetNextBranch( u32 startCycle, s32 delta );
extern void psxSetNextBranchDelta( s32 delta );
extern int iopTestCycle( u32 startCycle, s32 delta );
extern void _iopTestInterrupts();
extern void psxHwReset();
extern u8 psxHw4Read8 (u32 add);

2
pcsx2/R5900.h
View File

@ -418,8 +418,6 @@ extern void CPU_INT( EE_EventType n, s32 ecycle );
extern uint intcInterrupt();
extern uint dmacInterrupt();
extern void cpuInit();
extern void cpuReset(); // can throw Exception::FileNotFound.
extern void cpuException(u32 code, u32 bd);
extern void cpuTlbMissR(u32 addr, u32 bd);

5
pcsx2/SPU2/defs.h
View File

@ -535,11 +535,6 @@ struct V_Core
void LogAutoDMA(FILE* fp);
s32 NewDmaRead(u32* data, u32 bytesLeft, u32* bytesProcessed);
s32 NewDmaWrite(u32* data, u32 bytesLeft, u32* bytesProcessed);
void NewDmaInterrupt();
// old dma only
void DoDMAwrite(u16* pMem, u32 size);
void DoDMAread(u16* pMem, u32 size);
void FinishDMAread();

13
pcsx2/SPU2/spu2sys.cpp
View File

@ -214,9 +214,7 @@ void V_Core::Init(int index)
}
DMAICounter = 0;
AutoDmaFree = 0;
AdmaInProgress = false;
DmaStarted = false;
Regs.STATX = 0x80;
Regs.ENDX = 0xffffff; // PS2 confirmed
@ -282,17 +280,6 @@ void V_Core::UpdateEffectsBufferSize()
{
const s32 newbufsize = EffectsEndA - EffectsStartA + 1;
if ((newbufsize * 2) > 0x20000) // max 128kb per core
{
//printf("too big, returning\n");
//return;
}
// bad optimization?
//if (newbufsize == EffectsBufferSize && EffectsStartA == EffectsBufferStart) return;
//printf("Rvb Area change: ESA = %x, EEA = %x, Size(dec) = %d, Size(hex) = %x FxEnable = %d\n", EffectsStartA, EffectsEndA, newbufsize * 2, newbufsize * 2, FxEnable);
RevBuffers.NeedsUpdated = false;
EffectsBufferSize = newbufsize;
EffectsBufferStart = EffectsStartA;

3
pcsx2/Sif.h
View File

@ -18,9 +18,6 @@
static const int FIFO_SIF_W = 128;
// psxdev: was here on the initial psx merge
//static u32 sif2fifostat = (u32&)eeHw[0xf380];
// Despite its name, this is actually the IOP's DMAtag, which itself also contains
// the EE's DMAtag in its upper 64 bits. Note that only the lower 24 bits of 'data' is
// the IOP's chain transfer address (loaded into MADR). Bits 30 and 31 are transfer stop

166
pcsx2/Sifcmd.h
View File

@ -16,18 +16,6 @@
#ifndef __SIFCMD_H__
#define __SIFCMD_H__
/* from sifcmd.h */
//#define SYSTEM_CMD 0x80000000
//
//struct t_sif_cmd_header
//{
// u32 size;
// void *dest;
// s32 command;
// u32 unknown;
//};
struct t_sif_dma_transfer
{
void *src;
@ -35,159 +23,5 @@ struct t_sif_dma_transfer
s32 size;
s32 attr;
};
//
//struct t_sif_handler
//{
// void (*handler)(void *a, void *b);
// void *buff;
//};
//
//#define SYSTEM_CMD_CHANGE_SADDR 0x80000000
//#define SYSTEM_CMD_INIT_CMD 0x80000002
//struct t_sif_saddr
//{
// struct t_sif_cmd_header hdr; //+00
// void *newaddr; //+10
//}; //=14
//
//#define SYSTEM_CMD_SET_SREG 0x80000001
//struct t_sif_sreg
//{
// struct t_sif_cmd_header hdr; //+00
// s32 index; //+10
// u32 value; //+14
//}; //=18
//
//#define SYSTEM_CMD_RESET 0x80000003
//struct t_sif_reset
//{
// struct t_sif_cmd_header hdr; //+00
// s32 size; //+10
// s32 flag; //+14
// char data[80]; //+18
//}; //=68
/* end of sifcmd.h */
/* from sifsrpc.h */
//struct t_sif_rpc_rend
//{
// struct t_sif_cmd_header sifcmd;
// s32 rec_id; /* 04 */
// void *pkt_addr; /* 05 */
// s32 rpc_id; /* 06 */
//
// struct t_rpc_client_data *client; /* 7 */
// u32 command; /* 8 */
// struct t_rpc_server_data *server; /* 9 */
// void *buff; /* 10 */
// void *buff2; /* 11 */
//};
//
//struct t_sif_rpc_other_data
//{
// struct t_sif_cmd_header sifcmd;
// s32 rec_id; /* 04 */
// void *pkt_addr; /* 05 */
// s32 rpc_id; /* 06 */
//
// struct t_rpc_receive_data *receive; /* 07 */
// void *src; /* 08 */
// void *dest; /* 09 */
// s32 size; /* 10 */
//};
//
//struct t_sif_rpc_bind
//{
// struct t_sif_cmd_header sifcmd;
// s32 rec_id; /* 04 */
// void *pkt_addr; /* 05 */
// s32 rpc_id; /* 06 */
// struct t_rpc_client_data *client; /* 07 */
// s32 rpc_number; /* 08 */
//};
//
//struct t_sif_rpc_call
//{
// struct t_sif_cmd_header sifcmd;
// s32 rec_id; /* 04 */
// void *pkt_addr; /* 05 */
// s32 rpc_id; /* 06 */
// struct t_rpc_client_data *client; /* 07 */
// s32 rpc_number; /* 08 */
// s32 send_size; /* 09 */
// void *receive; /* 10 */
// s32 rec_size; /* 11 */
// s32 has_async_ef; /* 12 */
// struct t_rpc_server_data *server; /* 13 */
//};
//
//struct t_rpc_server_data
//{
// s32 command; /* 04 00 */
//
// void *(*func)(u32, void *, int); /* 05 01 */
// void *buff; /* 06 02 */
// s32 size; /* 07 03 */
//
// void *(*func2)(u32, void *, int); /* 08 04 */
// void *buff2; /* 09 05 */
// s32 size2; /* 10 06 */
//
// struct t_rpc_client_data *client; /* 11 07 */
// void *pkt_addr; /* 12 08 */
// s32 rpc_number; /* 13 09 */
//
// void *receive; /* 14 10 */
// s32 rec_size; /* 15 11 */
// s32 has_async_ef; /* 16 12 */
// s32 rec_id; /* 17 13 */
//
// struct t_rpc_server_data *link; /* 18 14 */
// struct r_rpc_server_data *next; /* 19 15 */
// struct t_rpc_data_queue *queued_object; /* 20 16 */
//};
//
//
//struct t_rpc_header
//{
// void *pkt_addr; /* 04 00 */
// u32 rpc_id; /* 05 01 */
// s32 sema_id; /* 06 02 */
// u32 mode; /* 07 03 */
//};
//
//
//struct t_rpc_client_data
//{
// struct t_rpc_header hdr;
// u32 command; /* 04 08 */
// void *buff; /* 05 09 */
// void *buff2; /* 06 10 */
// void (*end_function)(void *); /* 07 11 */
// void *end_param; /* 08 12*/
// struct t_rpc_server_data *server; /* 09 13 */
//};
//
//struct t_rpc_receive_data
//{
// struct t_rpc_header hdr;
// void *src; /* 04 */
// void *dest; /* 05 */
// s32 size; /* 06 */
//};
//
//struct t_rpc_data_queue
//{
// s32 thread_id; /* 00 */
// s32 active; /* 01 */
// struct t_rpc_server_data *svdata_ref; /* 02 */
// struct t_rpc_server_data *start; /* 03 */
// struct t_rpc_server_data *end; /* 04 */
// struct t_rpc_data_queue *next; /* 05 */
//};
/* end of sifrpc.h */
#endif//__SIFCMD_H__

1
pcsx2/pcsx2core.vcxproj
View File

@ -701,7 +701,6 @@
<ClInclude Include="CDVD\CDVD.h" />
<ClInclude Include="CDVD\CDVD_internal.h" />
<ClInclude Include="CDVD\CDVDaccess.h" />
<ClInclude Include="CDVD\CDVDisoReader.h" />
<ClInclude Include="Ipu\IPU.h" />
<ClInclude Include="Ipu\IPU_Fifo.h" />
<ClInclude Include="Ipu\yuv2rgb.h" />

3
pcsx2/pcsx2core.vcxproj.filters
View File

@ -1472,9 +1472,6 @@
<ClInclude Include="CDVD\CDVDaccess.h">
<Filter>System\Ps2\Iop\CDVD</Filter>
</ClInclude>
<ClInclude Include="CDVD\CDVDisoReader.h">
<Filter>System\Ps2\Iop\CDVD</Filter>
</ClInclude>
<ClInclude Include="IPU\IPU.h">
<Filter>System\Ps2\IPU</Filter>
</ClInclude>