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

Atari mappers - Fix E0, add aux ram to FA but incorrectly most likely

This commit is contained in:
adelikat 2012-04-02 02:53:43 +00:00
parent a8de23fb79
commit 73b55dbf2e
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mE0.cs
View File

@ -10,7 +10,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
int toggle1 = 0; int toggle1 = 0;
int toggle2 = 0; int toggle2 = 0;
int toggle3 = 0; int toggle3 = 0;
int toggle4 = 0;
public override byte ReadMemory(ushort addr) public override byte ReadMemory(ushort addr)
{ {
@ -34,7 +33,6 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
ser.Sync("toggle1", ref toggle1); ser.Sync("toggle1", ref toggle1);
ser.Sync("toggle2", ref toggle2); ser.Sync("toggle2", ref toggle2);
ser.Sync("toggle3", ref toggle3); ser.Sync("toggle3", ref toggle3);
ser.Sync("toggle4", ref toggle4);
} }
void Address(ushort addr) void Address(ushort addr)
@ -67,53 +65,53 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
break; break;
case 0x1FE8: case 0x1FE8:
toggle1 = 0; toggle2 = 0;
break; break;
case 0x1FE9: case 0x1FE9:
toggle1 = 1; toggle2 = 1;
break; break;
case 0x1FEA: case 0x1FEA:
toggle1 = 2; toggle2 = 2;
break; break;
case 0x1FEB: case 0x1FEB:
toggle1 = 3; toggle2 = 3;
break; break;
case 0x1FEC: case 0x1FEC:
toggle1 = 4; toggle2 = 4;
break; break;
case 0x1FED: case 0x1FED:
toggle1 = 5; toggle2 = 5;
break; break;
case 0x1FEE: case 0x1FEE:
toggle1 = 6; toggle2 = 6;
break; break;
case 0x1FEF: case 0x1FEF:
toggle1 = 7; toggle2 = 7;
break; break;
case 0x1FF0: case 0x1FF0:
toggle1 = 0; toggle3 = 0;
break; break;
case 0x1FF1: case 0x1FF1:
toggle1 = 1; toggle3 = 1;
break; break;
case 0x1FF2: case 0x1FF2:
toggle1 = 2; toggle3 = 2;
break; break;
case 0x1FF3: case 0x1FF3:
toggle1 = 3; toggle3 = 3;
break; break;
case 0x1FF4: case 0x1FF4:
toggle1 = 4; toggle3 = 4;
break; break;
case 0x1FF5: case 0x1FF5:
toggle1 = 5; toggle3 = 5;
break; break;
case 0x1FF6: case 0x1FF6:
toggle1 = 6; toggle3 = 6;
break; break;
case 0x1FF7: case 0x1FF7:
toggle1 = 7; toggle3 = 7;
break; break;
} }
} }

16
BizHawk.Emulation/Consoles/Atari/2600/Mappers/mFA.cs
View File

@ -16,9 +16,11 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
accessing 1FF8, 1FF9, and 1FFA. There's also 256 bytes of RAM mapped into 1000-11FF. accessing 1FF8, 1FF9, and 1FFA. There's also 256 bytes of RAM mapped into 1000-11FF.
The write port is at 1000-10FF, and the read port is 1100-11FF. The write port is at 1000-10FF, and the read port is 1100-11FF.
*/ */
class mFA : MapperBase class mFA : MapperBase
{ {
int toggle = 0; int toggle = 0;
ByteBuffer aux_ram = new ByteBuffer(256);
public override byte ReadMemory(ushort addr) public override byte ReadMemory(ushort addr)
{ {
@ -26,23 +28,27 @@ namespace BizHawk.Emulation.Consoles.Atari._2600
if (addr < 0x1000) if (addr < 0x1000)
return base.ReadMemory(addr); return base.ReadMemory(addr);
else if (addr < 0x10FF) else if (addr < 0x1100)
return 0xFF; return 0xFF;
else if (addr < 0x11FF) else if (addr < 0x1200)
return core.BaseReadMemory(addr); return aux_ram[addr & 0xFF];
else else
return core.rom[toggle * 4 * 1024 + (addr & 0xFFF)]; return core.rom[(toggle * 4 * 1024) + (addr & 0xFFF)];
} }
public override void WriteMemory(ushort addr, byte value) public override void WriteMemory(ushort addr, byte value)
{ {
Address(addr); Address(addr);
if (addr < 0x1000) base.WriteMemory(addr, value); if (addr < 0x1000)
base.WriteMemory(addr, value);
if (addr < 0x10FF)
aux_ram[addr & 0xFF] = value;
} }
public override void SyncState(Serializer ser) public override void SyncState(Serializer ser)
{ {
base.SyncState(ser); base.SyncState(ser);
ser.Sync("toggle", ref toggle); ser.Sync("toggle", ref toggle);
ser.Sync("ram", ref aux_ram);
} }
void Address(ushort addr) void Address(ushort addr)