diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-03-11 20:08:35 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-03-11 20:08:35 +0000 |
| commit | 5d5a8db6c6174e5e43b90f91747214c695fa7f9f (patch) | |
| tree | e555f6696fd1f4ad4493c4efa340e74e2be805aa | |
| parent | b3dc02dc3fbc4c22966c0026e93eb86261aa6839 (diff) | |
| download | pcsxr-5d5a8db6c6174e5e43b90f91747214c695fa7f9f.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64466 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | data/pcsx.desktop | 2 | ||||
| -rw-r--r-- | doc/keys.txt | 1 | ||||
| -rw-r--r-- | doc/tweaks.txt | 3 | ||||
| -rw-r--r-- | libpcsxcore/gpu.c | 10 | ||||
| -rw-r--r-- | libpcsxcore/psxcounters.c | 8 |
5 files changed, 13 insertions, 11 deletions
diff --git a/data/pcsx.desktop b/data/pcsx.desktop index 7fb8688b..4058a2f7 100644 --- a/data/pcsx.desktop +++ b/data/pcsx.desktop @@ -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 diff --git a/doc/keys.txt b/doc/keys.txt index b4105cb1..3806d817 100644 --- a/doc/keys.txt +++ b/doc/keys.txt @@ -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 diff --git a/doc/tweaks.txt b/doc/tweaks.txt index 0788302f..ad6e1854 100644 --- a/doc/tweaks.txt +++ b/doc/tweaks.txt @@ -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. diff --git a/libpcsxcore/gpu.c b/libpcsxcore/gpu.c index 63a18cf8..05137541 100644 --- a/libpcsxcore/gpu.c +++ b/libpcsxcore/gpu.c @@ -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)
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index 800f6497..70d16f85 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -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]) ) { |