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

rename bs memory domains (and fix rom domain) 

- also some other renames for clarity
This commit is contained in:
Morilli 2022-11-22 17:22:11 +01:00 committed by Moritz Bender
parent c906c830dd
commit 76cfee6396
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi.cs
View File

@ -81,7 +81,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
[BizImport(CallingConvention.Cdecl)]
public abstract void snes_load_cartridge_super_gameboy(byte[] romData, byte[] sgbRomData, int romSize, int sgbRomSize);
[BizImport(CallingConvention.Cdecl)]
public abstract void snes_load_cartridge_bsx(byte[] romData, byte[] bsxRomData, int romSize, int bsxRomSize);
public abstract void snes_load_cartridge_bsmemory(byte[] romData, byte[] bsmemoryRomData, int romSize, int bsmemoryRomSize);
[BizImport(CallingConvention.Cdecl)]
public abstract void snes_get_cpu_registers(ref BsnesApi.CpuRegisters registers);

4
src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesApi_Enums.cs
View File

@ -92,8 +92,8 @@
CARTRAM,
CARTROM,
BSX_RAM,
BSX_PRAM,
BSMEMORY_ROM,
BSMEMORY_PSRAM,
SUFAMI_TURBO_A_RAM,
SUFAMI_TURBO_B_RAM,
SA1_IRAM,

2
src/BizHawk.Emulation.Cores/Consoles/Nintendo/BSNES/BsnesCore.cs
View File

@ -99,7 +99,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.BSNES
}
else if (IsBSX)
{
Api.core.snes_load_cartridge_bsx(bsxRomData, loadParameters.Roms[0].RomData,
Api.core.snes_load_cartridge_bsmemory(bsxRomData, loadParameters.Roms[0].RomData,
bsxRomData!.Length, loadParameters.Roms[0].RomData.Length);
}
else

16
waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.cpp
View File

@ -220,16 +220,16 @@ EXPORT void snes_load_cartridge_super_gameboy(
program->load();
}
EXPORT void snes_load_cartridge_bsx(
const uint8_t* rom_data, const uint8_t* bsx_rom_data, int rom_size, int bsx_rom_size
EXPORT void snes_load_cartridge_bsmemory(
const uint8_t* rom_data, const uint8_t* bsmemory_rom_data, int rom_size, int bsmemory_rom_size
) {
emulator->connect(ID::Port::Expansion, ID::Device::Satellaview);
program->superFamicom.raw_data.resize(rom_size);
memcpy(program->superFamicom.raw_data.data(), rom_data, rom_size);
program->bsMemory.program.resize(bsx_rom_size);
memcpy(program->bsMemory.program.data(), bsx_rom_data, bsx_rom_size);
program->bsMemory.program.resize(bsmemory_rom_size);
memcpy(program->bsMemory.program.data(), bsmemory_rom_data, bsmemory_rom_size);
program->load();
}
@ -350,12 +350,12 @@ EXPORT void* snes_get_memory_region(int id, int* size, int* word_size)
*word_size = 1;
return program->superFamicom.program.data();
case SNES_MEMORY::BSX_RAM:
case SNES_MEMORY::BSMEMORY_ROM:
if (!cartridge.has.BSMemorySlot) break;
*size = mcc.rom.size();
*size = bsmemory.memory.size();
*word_size = 1;
return mcc.rom.data();
case SNES_MEMORY::BSX_PRAM:
return bsmemory.memory.data();
case SNES_MEMORY::BSMEMORY_PSRAM:
if (!cartridge.has.BSMemorySlot) break;
*size = mcc.psram.size();
*word_size = 1;

4
waterbox/bsnescore/bsnes/target-bsnescore/bsnescore.hpp
View File

@ -10,9 +10,9 @@ enum SNES_MEMORY {
CARTRIDGE_RAM,
CARTRIDGE_ROM,
BSMEMORY_ROM,
BSMEMORY_PSRAM,
// sufamiturbo unused cause unsupported by frontend
BSX_RAM,
BSX_PRAM,
SUFAMI_TURBO_A_RAM,
SUFAMI_TURBO_B_RAM,
SA1_IRAM,