xavi
/
pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64466 e17a0e51-4ae3-4d35-97c3-1a29b211df97

This commit is contained in:
SND\edgbla_cp 2011-03-11 20:08:35 +00:00
parent b3dc02dc3f
commit 5d5a8db6c6
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/pcsx.desktop
View File

@ -4,9 +4,11 @@ Encoding=UTF-8
Type=Application
Name=PCSX
GenericName=PlayStation Emulator
GenericName[ru_RU]=Эмулятор PlayStation
GenericName[zh_CN]=PlayStation 模拟器
GenericName[zh_TW]=PlayStation 模擬器
Comment=Sony PlayStation emulator
Comment[ru_RU]=Эмулятор Sony PlayStation
Comment[zh_CN]=Sony PlayStation 模拟器
Comment[zh_TW]=Sony PlayStation 模擬器
Exec=pcsx

1
doc/keys.txt
View File

@ -12,6 +12,7 @@ F5: Toggle SIO IRQ
F6: Toggle Black & White decoders
F7: Toggle XA
F8: Take a game screenshot
F12: Reset
ESC: Return to the main window
Ctrl 1 to 5: Save state 1 to 5

3
doc/tweaks.txt
View File

@ -20,6 +20,9 @@ function. These can all be found at Configuration -> CPU.
* Enable Console Output:
Dumps the PSX emulator output to the console.
* Slow Boot:
Enable BIOS Logo.
* Enable Interpreter CPU:
Enables interpretive emulation.
This is often more compatible, but at the price of emulation speed.

10
libpcsxcore/gpu.c
View File

@ -20,8 +20,6 @@
#include "gpu.h"
#include "psxdma.h"
extern unsigned int hSyncCount;
#define GPUSTATUS_ODDLINES 0x80000000
#define GPUSTATUS_DMABITS 0x60000000 // Two bits
#define GPUSTATUS_READYFORCOMMANDS 0x10000000
@ -39,8 +37,6 @@ extern unsigned int hSyncCount;
#define GPUSTATUS_DRAWINGALLOWED 0x00000400
#define GPUSTATUS_DITHER 0x00000200
// Taken from PEOPS SOFTGPU
u32 lUsedAddr[3];
@ -75,13 +71,13 @@ static u32 gpuDmaChainSize(u32 addr) {
// # 32-bit blocks to transfer
size += psxMu8( addr + 3 );
// next 32-bit pointer
addr = psxMu32( addr & ~0x3 ) & 0xffffff;
size += 1;
} while (addr != 0xffffff);
return size;
}
@ -163,7 +159,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
size = gpuDmaChainSize(madr);
GPU_dmaChain((u32 *)psxM, madr & 0x1fffff);
// Tekken 3 = use 1.0 only (not 1.5x)
// Einhander = parse linked list in pieces (todo)

8
libpcsxcore/psxcounters.c
View File

@ -76,7 +76,7 @@ static const s32 VerboseLevel = 0;
static Rcnt rcnts[ CounterQuantity ];
u32 hSyncCount = 0;
static u32 hSyncCount = 0;
static u32 spuSyncCount = 0;
u32 psxNextCounter = 0, psxNextsCounter = 0;
@ -283,16 +283,16 @@ void psxRcntUpdate()
SPU_async( SpuUpdInterval[Config.PsxType] * rcnts[3].target );
}
}
// VSync irq.
if( hSyncCount == VBlankStart[Config.PsxType] )
{
GPU_vBlank( 1 );
// For the best times. :D
//setIrq( 0x01 );
}
// Update lace. (with InuYasha fix)
if( hSyncCount >= (Config.VSyncWA ? HSyncTotal[Config.PsxType] / BIAS : HSyncTotal[Config.PsxType]) )
{