mirror of https://github.com/PCSX2/pcsx2.git
lightningterror
parent
1fa7ae4f0d
commit
fdb170b443
|
|
@ -1409,7 +1409,6 @@ set(pcsx2WindowsSources
|
||||||
CDVD/Windows/IOCtlSrc.cpp
|
CDVD/Windows/IOCtlSrc.cpp
|
||||||
windows/FlatFileReaderWindows.cpp
|
windows/FlatFileReaderWindows.cpp
|
||||||
windows/Optimus.cpp
|
windows/Optimus.cpp
|
||||||
windows/VCprojects/IopSif.cpp
|
|
||||||
windows/WinConsolePipe.cpp
|
windows/WinConsolePipe.cpp
|
||||||
windows/WinKeyCodes.cpp
|
windows/WinKeyCodes.cpp
|
||||||
windows/WinPowerProfile.cpp
|
windows/WinPowerProfile.cpp
|
||||||
|
|
|
||||||
|
|
@ -1,175 +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/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "PrecompiledHeader.h"
|
|
||||||
|
|
||||||
#include "Common.h"
|
|
||||||
#include "Sif.h"
|
|
||||||
|
|
||||||
#if FALSE
|
|
||||||
|
|
||||||
const u32 fifoSize = 0x1000; // in bytes
|
|
||||||
|
|
||||||
s32 PrepareEEWrite()
|
|
||||||
{
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 PrepareEERead()
|
|
||||||
{
|
|
||||||
alignas(16) static u32 tag[4];
|
|
||||||
|
|
||||||
// Process DMA tag at hw_dma9.tadr
|
|
||||||
sif0.iop.data = *(sifData *)iopPhysMem(hw_dma9.tadr);
|
|
||||||
sif0.iop.data.words = (sif0.iop.data.words + 3) & 0xfffffffc; // Round up to nearest 4.
|
|
||||||
memcpy(tag, (u32*)iopPhysMem(hw_dma9.tadr + 8), 16);
|
|
||||||
|
|
||||||
hw_dma9.tadr += 16; ///hw_dma9.madr + 16 + sif0.sifData.words << 2;
|
|
||||||
|
|
||||||
// We're only copying the first 24 bits.
|
|
||||||
hw_dma9.madr = sif0data & 0xFFFFFF;
|
|
||||||
sif0.iop.counter = sif0words;
|
|
||||||
|
|
||||||
if (sif0tag.IRQ || (sif0tag.ID & 4)) sif0.iop.end = true;
|
|
||||||
SIF_LOG("SIF0 IOP to EE Tag: madr=%lx, tadr=%lx, counter=%lx (%08X_%08X)"
|
|
||||||
"\n\tread tag: %x %x %x %x", hw_dma9.madr, hw_dma9.tadr, sif0.iop.counter, sif0words, sif0data,
|
|
||||||
tag[0], tag[1], tag[2], tag[3]);
|
|
||||||
|
|
||||||
sif0ch.unsafeTransfer(((tDMA_TAG*)(tag)));
|
|
||||||
sif0ch.madr = tag[1];
|
|
||||||
tDMA_TAG ptag(tag[0]);
|
|
||||||
|
|
||||||
SIF_LOG("SIF0 EE dest chain tag madr:%08X qwc:%04X id:%X irq:%d(%08X_%08X)",
|
|
||||||
sif0ch.madr, sif0ch.qwc, ptag.ID, ptag.IRQ, tag[1], tag[0]);
|
|
||||||
|
|
||||||
if (sif0ch.chcr.TIE && ptag.IRQ)
|
|
||||||
{
|
|
||||||
//Console.WriteLn("SIF0 TIE");
|
|
||||||
sif0.ee.end = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (ptag.ID)
|
|
||||||
{
|
|
||||||
case TAG_REFE:
|
|
||||||
sif0.ee.end = true;
|
|
||||||
if (dmacRegs.ctrl.STS != NO_STS)
|
|
||||||
dmacRegs.stadr.ADDR = sif0ch.madr + (sif0ch.qwc * 16);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TAG_REFS:
|
|
||||||
if (dmacRegs.ctrl.STS != NO_STS)
|
|
||||||
dmacRegs.stadr.ADDR = sif0ch.madr + (sif0ch.qwc * 16);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case TAG_END:
|
|
||||||
sif0.ee.end = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void FinalizeEERead()
|
|
||||||
{
|
|
||||||
SIF_LOG("Sif0: End EE");
|
|
||||||
sif0.ee.end = false;
|
|
||||||
sif0.ee.busy = false;
|
|
||||||
SIF_LOG("CPU INT FIRED SIF0");
|
|
||||||
CPU_INT(DMAC_SIF0, 16);
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 DoSIFWrite(u32 iopAvailable)
|
|
||||||
{
|
|
||||||
u32 eeAvailable = PrepareEEWrite();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 DoSifRead(u32 iopAvailable)
|
|
||||||
{
|
|
||||||
u32 eeAvailable = PrepareEERead();
|
|
||||||
|
|
||||||
u32 transferSizeBytes = std::min(std::min(iopAvailable,eeAvailable),fifoSize);
|
|
||||||
u32 transferSizeWords = transferSizeBytes >> 2;
|
|
||||||
u32 transferSizeQWords = transferSizeBytes >> 4;
|
|
||||||
|
|
||||||
SIF_LOG("Write IOP to EE: +++++++++++ %lX of %lX", transferSizeWords, sif0.iop.counter);
|
|
||||||
|
|
||||||
tDMA_TAG *ptag = sif0ch.getAddr(sif0ch.madr, DMAC_SIF0, true);
|
|
||||||
if (ptag == NULL)
|
|
||||||
{
|
|
||||||
DevCon.Warning("Write IOP to EE: ptag == NULL");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
memcpy((u32*)ptag, (u32*)iopPhysMem(hw_dma9.madr), transferSizeBytes);
|
|
||||||
|
|
||||||
// Clearing handled by vtlb memory protection and manual blocks.
|
|
||||||
//Cpu->Clear(sif0ch.madr, readSize*4);
|
|
||||||
|
|
||||||
sif0ch.madr += transferSizeBytes;
|
|
||||||
sif0.ee.cycles += transferSizeQWords * 2;
|
|
||||||
sif0ch.qwc -= transferSizeQWords;
|
|
||||||
|
|
||||||
return transferSizeBytes;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 CALLBACK sif0DmaRead (s32 channel, u32* data, u32 bytesLeft, u32* bytesProcessed)
|
|
||||||
{
|
|
||||||
s32 processed = DoSIFWrite(bytesLeft);
|
|
||||||
|
|
||||||
if(processed>0)
|
|
||||||
{
|
|
||||||
bytesLeft -= processed;
|
|
||||||
if(bytesLeft == 0)
|
|
||||||
FinalizeEERead();
|
|
||||||
|
|
||||||
*bytesProcessed = processed;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
*bytesProcessed=0;
|
|
||||||
return -processed;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 CALLBACK sif0DmaWrite (s32 channel, u32* data, u32 bytesLeft, u32* bytesProcessed)
|
|
||||||
{
|
|
||||||
DevCon.Warning("SIF0 Dma Write to iop?!");
|
|
||||||
*bytesProcessed=0; return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CALLBACK sif0DmaInterrupt (s32 channel)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 CALLBACK sif1DmaRead (s32 channel, u32* data, u32 bytesLeft, u32* bytesProcessed)
|
|
||||||
{
|
|
||||||
DevCon.Warning("SIF1 Dma Read from iop?!");
|
|
||||||
*bytesProcessed=0; return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
s32 CALLBACK sif1DmaWrite (s32 channel, u32* data, u32 bytesLeft, u32* bytesProcessed)
|
|
||||||
{
|
|
||||||
*bytesProcessed=0;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CALLBACK sif1DmaInterrupt (s32 channel)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Loading…
Reference in New Issue