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

Change "BUS" to "System Bus" in both GBA cores, and the bsnes core, don't account for "BUS" in the CheatDomain property

This commit is contained in:
adelikat 2015-01-13 00:01:25 +00:00
parent c1cbad1b30
commit 17b4782474
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Emulation.Common/MemoryDomain.cs
View File

@ -219,7 +219,7 @@ namespace BizHawk.Emulation.Common
{ {
get get
{ {
return this.Any(x => x.Name == "System Bus" || x.Name == "BUS"); // Have to account for "BUS" because some developers don't like consistency! return this.Any(x => x.Name == "System Bus");
} }
} }
@ -227,7 +227,7 @@ namespace BizHawk.Emulation.Common
{ {
get get
{ {
return this.FirstOrDefault(x => x.Name == "System Bus" || x.Name == "BUS"); return this.FirstOrDefault(x => x.Name == "System Bus");
} }
} }
} }

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs
View File

@ -279,7 +279,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
AddMemoryDomain(LibMeteor.MemoryArea.rom, 32 * 1024 * 1024, "ROM"); AddMemoryDomain(LibMeteor.MemoryArea.rom, 32 * 1024 * 1024, "ROM");
// special domain for system bus // special domain for system bus
{ {
MemoryDomain sb = new MemoryDomain("BUS", 1 << 28, MemoryDomain.Endian.Little, MemoryDomain sb = new MemoryDomain("System Bus", 1 << 28, MemoryDomain.Endian.Little,
delegate(int addr) delegate(int addr)
{ {
if (addr < 0 || addr >= 0x10000000) if (addr < 0 || addr >= 0x10000000)

2
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
View File

@ -362,7 +362,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
mm.Add(MemoryDomain.FromIntPtr("OAM", 1024, l, s.oam)); mm.Add(MemoryDomain.FromIntPtr("OAM", 1024, l, s.oam));
mm.Add(MemoryDomain.FromIntPtr("ROM", 32 * 1024 * 1024, l, s.rom)); mm.Add(MemoryDomain.FromIntPtr("ROM", 32 * 1024 * 1024, l, s.rom));
mm.Add(new MemoryDomain("BUS", 0x10000000, l, mm.Add(new MemoryDomain("System Bus", 0x10000000, l,
delegate(int addr) delegate(int addr)
{ {
if (addr < 0 || addr >= 0x10000000) if (addr < 0 || addr >= 0x10000000)

4
BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesCore.cs
View File

@ -1025,7 +1025,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
byte* blockptr = api.QUERY_get_memory_data(LibsnesApi.SNES_MEMORY.WRAM); byte* blockptr = api.QUERY_get_memory_data(LibsnesApi.SNES_MEMORY.WRAM);
var md = new MemoryDomain("BUS", 0x1000000, MemoryDomain.Endian.Little, var md = new MemoryDomain("System Bus", 0x1000000, MemoryDomain.Endian.Little,
(addr) => (addr) =>
{ {
var a = FakeBusMap(addr); var a = FakeBusMap(addr);
@ -1129,7 +1129,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
if (!DeterministicEmulation) if (!DeterministicEmulation)
{ {
_memoryDomains.Add(new MemoryDomain("BUS", 0x1000000, MemoryDomain.Endian.Little, _memoryDomains.Add(new MemoryDomain("System Bus", 0x1000000, MemoryDomain.Endian.Little,
(addr) => api.QUERY_peek(LibsnesApi.SNES_MEMORY.SYSBUS, (uint)addr), (addr) => api.QUERY_peek(LibsnesApi.SNES_MEMORY.SYSBUS, (uint)addr),
(addr, val) => api.QUERY_poke(LibsnesApi.SNES_MEMORY.SYSBUS, (uint)addr, val))); (addr, val) => api.QUERY_poke(LibsnesApi.SNES_MEMORY.SYSBUS, (uint)addr, val)));
} }