libretro/FBNeo
1
0
Fork 0
mirror of https://github.com/libretro/FBNeo.git synced 2025-03-01 14:28:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

umk3 smoke fatality stars fix + wunit nvram fix

Browse Source
This commit is contained in:
dinkc64 2021-01-05 00:21:06 -05:00
parent 4670d181da
commit 6d51dda056
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/burn/drv/midway/midwunit.cpp
View File

@ -51,6 +51,9 @@ static INT32 nIOShuffle[16];
static INT32 wwfmania = 0;
static INT32 nExtraCycles = 0;
#define RGB888(r,g,b) ((r) | ((g) << 8) | ((b) << 16))
#define RGB888_r(x) ((x) & 0xFF)
#define RGB888_g(x) (((x) >> 8) & 0xFF)
@ -76,7 +79,7 @@ static INT32 MemIndex()
DrvSoundROM = Next; Next += 0x1000000 * sizeof(UINT8);
DrvGfxROM = Next; Next += 0x2000000 * sizeof(UINT8);
DrvNVRAM = Next; Next += TOBYTE(0x60000) * sizeof(UINT16);
DrvNVRAM = Next; Next += 0x8000 * sizeof(UINT16);
AllRam = Next;
DrvRAM = Next; Next += TOBYTE(0x400000) * sizeof(UINT16);
@ -210,7 +213,7 @@ void WolfUnitSecurityWrite(UINT32 address, UINT16 value)
UINT16 WolfUnitCMOSRead(UINT32 address)
{
UINT16 *wn = (UINT16*)DrvNVRAM;
UINT32 offset = (address & 0x05ffff) >> 4;
UINT32 offset = (address & 0x07ffff) >> 4;
return wn[offset];
}
@ -218,7 +221,7 @@ void WolfUnitCMOSWrite(UINT32 address, UINT16 value)
{
if (bCMOSWriteEnable) {
UINT16 *wn = (UINT16*)DrvNVRAM;
UINT32 offset = (address & 0x05ffff) >> 4;
UINT32 offset = (address & 0x07ffff) >> 4;
wn[offset] = value;
bCMOSWriteEnable = false;
}
@ -391,6 +394,8 @@ static void WolfDoReset()
TMS34010Reset();
Dcs2kReset();
nExtraCycles = 0;
}
INT32 WolfUnitInit()
@ -454,7 +459,7 @@ INT32 WolfUnitInit()
TMS34010MapHandler(3, 0x01600000, 0x0160001f, MAP_READ | MAP_WRITE);
TMS34010SetHandlers(4, WolfUnitCMOSRead, WolfUnitCMOSWrite);
TMS34010MapHandler(4, 0x01400000, 0x0145ffff, MAP_READ | MAP_WRITE);
TMS34010MapHandler(4, 0x01400000, 0x0147ffff, MAP_READ | MAP_WRITE);
TMS34010SetWriteHandler(5, WolfUnitCMOSWriteEnable);
TMS34010MapHandler(5, 0x01480000, 0x014fffff, MAP_READ | MAP_WRITE);
@ -516,8 +521,8 @@ INT32 WolfUnitFrame()
Dcs2kNewFrame();
INT32 nInterleave = 288;
INT32 nCyclesTotal[2] = { (INT32)(50000000/8/54.71), (INT32)(10000000 / 54.71) };
INT32 nCyclesDone[2] = { 0, 0 };
INT32 nCyclesTotal[2] = { (INT32)(50000000/8/54.706840), (INT32)(10000000 / 54.706840) };
INT32 nCyclesDone[2] = { nExtraCycles, 0 };
for (INT32 i = 0; i < nInterleave; i++) {
CPU_RUN(0, TMS34010);
@ -535,6 +540,8 @@ INT32 WolfUnitFrame()
WolfUnitDraw();
}
nExtraCycles = nCyclesDone[0] - nCyclesTotal[0];
// Buffering palette for 1 frame, fix umk3pb1 palette glitch when
// transitioning from title screen to select screen
memcpy(DrvPaletteB2, DrvPaletteB, 0x8000 * sizeof(UINT32));
@ -598,11 +605,12 @@ INT32 WolfUnitScan(INT32 nAction, INT32 *pnMin)
SCAN_VAR(bCMOSWriteEnable);
SCAN_VAR(nGfxBankOffset);
SCAN_VAR(nIOShuffle);
SCAN_VAR(nExtraCycles);
}
if (nAction & ACB_NVRAM) {
ba.Data = DrvNVRAM;
ba.nLen = TOBYTE(0x60000);
ba.nLen = 0x8000;
ba.nAddress = 0;
ba.szName = "NV RAM";
BurnAcb(&ba);

20
src/cpu/tms34010/tms34010.cpp
View File

@ -11,6 +11,7 @@
#include "tms34010_shift.h"
#include "tms34010_gfx.h"
#include "stddef.h"
#include "tiles_generic.h"
#ifdef TMS34010_DEBUGGER
#include <algorithm>
@ -285,7 +286,10 @@ void write_ioreg(cpu_state *cpu, dword addr, word value)
}
break;
case DPYSTRT:
break;
break;
case HSTCTLL:
//bprintf(0,_T("hstctll %x\n"), value);
break;
case VTOTAL:
case HTOTAL:
case HSBLNK:
@ -306,7 +310,19 @@ void write_ioreg(cpu_state *cpu, dword addr, word value)
dword read_ioreg(cpu_state *cpu, dword addr)
{
int reg = (addr >> 4) & 0x1F;
int reg = (addr >> 4) & 0x1F;
switch(reg) {
case HCOUNT: {
INT32 hc = TMS34010TotalCycles() % nScreenWidth;
INT32 ht = cpu->io_regs[HTOTAL] + 1;
hc = hc * ht / nScreenWidth;
hc += cpu->io_regs[HEBLNK];
return (hc > ht) ? (hc - ht) : hc;
}
case REFCNT:
return (TMS34010TotalCycles() / 0x10) & 0xfffc;
}
return cpu->io_regs[reg];
}