ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for ST-V (with Saturnus)

This commit is contained in:
CasualPokePlayer 2024-11-14 17:32:36 -08:00
parent 9fe5b316b3
commit a51c7c07d0
11 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/faust.wbx.zst
View File

Binary file not shown.

BIN
Assets/dll/hyper.wbx.zst
View File

Binary file not shown.

BIN
Assets/dll/ngp.wbx.zst
View File

Binary file not shown.

BIN
Assets/dll/pcfx.wbx.zst
View File

Binary file not shown.

BIN
Assets/dll/shock.wbx.zst
View File

Binary file not shown.

BIN
Assets/dll/ss.wbx.zst
View File

Binary file not shown.

BIN
Assets/dll/turbo.wbx.zst
View File

Binary file not shown.

BIN
Assets/dll/vb.wbx.zst
View File

Binary file not shown.

4
waterbox/nyma/NymaCore.cpp
View File

@ -142,7 +142,7 @@ ECL_EXPORT void FrameAdvance(MyFrameInfo& frame)
if (frame.Command)
Game->DoSimpleCommand(frame.Command);
memcpy(InputPortData, frame.InputPortData, sizeof(InputPortData));
if (Game->TransformInput)
@ -254,6 +254,7 @@ struct SystemInfo
int32_t NominalWidth;
int32_t NominalHeight;
int32_t VideoSystem;
int32_t GameType;
int32_t FpsFixed;
int64_t MasterClock;
int32_t LcmWidth;
@ -272,6 +273,7 @@ ECL_EXPORT SystemInfo* GetSystemInfo()
SI.NominalWidth = Game->nominal_width;
SI.NominalHeight = Game->nominal_height;
SI.VideoSystem = Game->VideoSystem;
SI.GameType = Game->GameType;
SI.FpsFixed = Game->fps;
SI.MasterClock = Game->MasterClock;
SI.LcmWidth = Game->lcm_width;

2
waterbox/nyma/mednafen

@ -1 +1 @@
Subproject commit 66c482b516f3b37927a9f51522f2e6cc9dd0aed0
Subproject commit 33165f0cfe30eb9cab3b61b3666cd9dbf8b1a204

31
waterbox/nyma/ss.cpp
View File

@ -5,6 +5,7 @@
#include "nyma.h"
#include <emulibc.h>
#include <waterboxcore.h>
#include <src/ss/ak93c45.h>
#include <src/ss/cart.h>
#include <src/ss/smpc.h>
namespace MDFN_IEN_SS
@ -42,6 +43,8 @@ namespace MDFN_IEN_SS
extern uint16* CS1RAM;
extern uint16 ExtRAM[0x200000];
extern uint16 ROM[0x100000];
extern uint16 STV_ROM[0x3000000 / sizeof(uint16)];
extern AK93C45 eep;
extern int ActiveCartType;
@ -72,6 +75,9 @@ ECL_EXPORT uint32_t GetSaveRamLength()
if (ActiveCartType == CART_BACKUP_MEM)
return sizeof(BackupRAM) + sizeof(ExtBackupRAM) + sizeof(uint8_t) + sizeof(RTC.raw) + sizeof(SaveMem);
if (ActiveCartType == CART_STV)
return sizeof(BackupRAM) + sizeof(eep.mem) + sizeof(uint8_t) + sizeof(RTC.raw) + sizeof(SaveMem);
return sizeof(BackupRAM) + sizeof(uint8_t) + sizeof(RTC.raw) + sizeof(SaveMem);
}
@ -86,6 +92,12 @@ ECL_EXPORT void GetSaveRam(uint8_t* data)
data += sizeof(ExtBackupRAM);
}
if (ActiveCartType == CART_STV)
{
memcpy(data, eep.mem, sizeof(eep.mem));
data += sizeof(eep.mem);
}
*data = RTC.Valid;
data += sizeof(uint8_t);
@ -114,6 +126,16 @@ ECL_EXPORT void PutSaveRam(uint8_t* data, uint32_t length)
}
}
if (ActiveCartType == CART_STV)
{
if (length >= sizeof(eep.mem))
{
memcpy(eep.mem, data, sizeof(eep.mem));
data += sizeof(eep.mem);
length -= sizeof(eep.mem);
}
}
if (length >= (sizeof(uint8_t) + sizeof(RTC.raw) + sizeof(SaveMem)))
{
RTC.Valid = *data != 0;
@ -144,7 +166,7 @@ ECL_EXPORT void GetMemoryAreas(MemoryArea* m)
while (0)
AddMemoryDomain("Sound Ram", SCSP.GetRAMPtr(), 0x100000, MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
AddMemoryDomain("Backup Ram", BackupRAM, sizeof(BackupRAM), MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
AddMemoryDomain("Boot Rom", BIOSROM, 524288, MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
AddMemoryDomain("Boot Rom", BIOSROM, 524288, MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
AddMemoryDomain("Work Ram Low", WorkRAML, sizeof(WorkRAML), MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
AddMemoryDomain("Work Ram High", WorkRAMH, sizeof(WorkRAMH), MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2 | MEMORYAREA_FLAGS_PRIMARY);
AddMemoryDomain("VDP1 Ram", VDP1::VRAM, sizeof(VDP1::VRAM), MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
@ -160,7 +182,12 @@ ECL_EXPORT void GetMemoryAreas(MemoryArea* m)
if (ActiveCartType == CART_EXTRAM_1M)
AddMemoryDomain("Ram Cart", ExtRAM, sizeof(ExtRAM) / 4, MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
if (ActiveCartType == CART_KOF95 || ActiveCartType == CART_ULTRAMAN)
AddMemoryDomain("Rom Cart", ROM, sizeof(ROM), MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
AddMemoryDomain("Rom Cart", ROM, sizeof(ROM), MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
if (ActiveCartType == CART_STV)
{
AddMemoryDomain("Rom Cart", STV_ROM, sizeof(STV_ROM), MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
AddMemoryDomain("STV EEPROM", eep.mem, sizeof(eep.mem), MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_SWAPPED | MEMORYAREA_FLAGS_YUGEENDIAN | MEMORYAREA_FLAGS_WORDSIZE2);
}
AddMemoryDomain("SMPC RTC", RTC.raw, sizeof(RTC.raw), MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_WORDSIZE1);
AddMemoryDomain("SMPC SaveMem", SaveMem, sizeof(SaveMem), MEMORYAREA_FLAGS_WRITABLE | MEMORYAREA_FLAGS_WORDSIZE1);
}