summaryrefslogtreecommitdiff
path: root/libpcsxcore/psxcounters.c
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-21 08:32:39 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-21 08:32:39 +0000
commit54ef2e8a8000b8056aa32eb00179ab15dd48e2d8 (patch)
tree6a8cfca34b8fc3861302d7a17db0dd7f53ecb74f /libpcsxcore/psxcounters.c
parent2030af5d172802ddc2c74dfe4962a220237ebd20 (diff)
downloadpcsxr-54ef2e8a8000b8056aa32eb00179ab15dd48e2d8.tar.gz
revert the previous revert, and fixed the value in mdec1Interrupt().
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@48431 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/psxcounters.c')
-rw-r--r--libpcsxcore/psxcounters.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index 961739cb..d1089b66 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -116,7 +116,7 @@ void _psxRcntWcount( u32 index, u32 value )
value &= 0xffff;
}
- rcnts[index].cycleStart = psxRegs.cycle * BIAS;
+ rcnts[index].cycleStart = psxRegs.cycle;
rcnts[index].cycleStart -= value * rcnts[index].rate;
// TODO: <=.
@@ -137,7 +137,7 @@ u32 _psxRcntRcount( u32 index )
{
u32 count;
- count = psxRegs.cycle * BIAS;
+ count = psxRegs.cycle;
count -= rcnts[index].cycleStart;
count /= rcnts[index].rate;
@@ -158,7 +158,7 @@ void psxRcntSet()
s32 countToUpdate;
u32 i;
- psxNextsCounter = psxRegs.cycle * BIAS;
+ psxNextsCounter = psxRegs.cycle;
psxNextCounter = 0x7fffffff;
for( i = 0; i < CounterQuantity; ++i )
@@ -189,7 +189,7 @@ void psxRcntReset( u32 index )
{
if( rcnts[index].mode & RcCountToTarget )
{
- count = psxRegs.cycle * BIAS;
+ count = psxRegs.cycle;
count -= rcnts[index].cycleStart;
count /= rcnts[index].rate;
count -= rcnts[index].target;
@@ -215,7 +215,7 @@ void psxRcntReset( u32 index )
}
else if( rcnts[index].counterState == CountToOverflow )
{
- count = psxRegs.cycle * BIAS;
+ count = psxRegs.cycle;
count -= rcnts[index].cycleStart;
count /= rcnts[index].rate;
count -= 0xffff;
@@ -244,7 +244,7 @@ void psxRcntUpdate()
{
u32 cycle;
- cycle = psxRegs.cycle * BIAS;
+ cycle = psxRegs.cycle;
// rcnt 0.
if( cycle - rcnts[0].cycleStart >= rcnts[0].cycle )