Mapper 85 (VRC7) support

This commit is contained in:
Souryo 2016-01-24 17:05:53 -05:00
parent f4b7dcb1f5
commit dbf038d5b4
4 changed files with 96 additions and 0 deletions

View file

@ -503,6 +503,7 @@
<ClInclude Include="VRC2_4.h" />
<ClInclude Include="VRC3.h" />
<ClInclude Include="VRC6.h" />
<ClInclude Include="VRC7.h" />
<ClInclude Include="VrcIrq.h" />
</ItemGroup>
<ItemGroup>

View file

@ -482,6 +482,9 @@
<ClInclude Include="VrcIrq.h">
<Filter>Nes\Mappers</Filter>
</ClInclude>
<ClInclude Include="VRC7.h">
<Filter>Nes\Mappers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">

View file

@ -85,6 +85,7 @@
#include "VRC2_4.h"
#include "VRC3.h"
#include "VRC6.h"
#include "VRC7.h"
BaseMapper* MapperFactory::GetMapperFromID(ROMLoader &romLoader)
{
@ -145,6 +146,7 @@ BaseMapper* MapperFactory::GetMapperFromID(ROMLoader &romLoader)
case 78: return new JalecoJf16(romLoader.GetSubMapper() == 3);
case 79: return new Nina03_06(false);
case 80: return new TaitoX1005(false);
case 85: return new VRC7();
case 87: return new JalecoJfxx(false);
case 88: return new Namco108_88();
case 89: return new Sunsoft89();

90
Core/VRC7.h Normal file
View file

@ -0,0 +1,90 @@
#pragma once
#include "stdafx.h"
#include "BaseMapper.h"
#include "VrcIrq.h"
//incomplete - missing audio
class VRC7 : public BaseMapper
{
private:
VrcIrq _irq;
uint8_t _controlFlags;
uint8_t _chrRegisters[8];
void UpdatePrgRamAccess()
{
SetCpuMemoryMapping(0x6000, 0x7FFF, 0, HasBattery() ? PrgMemoryType::SaveRam : PrgMemoryType::WorkRam, (_controlFlags & 0x80) ? MemoryAccessType::ReadWrite : MemoryAccessType::NoAccess);
}
protected:
virtual uint16_t GetPRGPageSize() { return 0x2000; }
virtual uint16_t GetCHRPageSize() { return 0x0400; }
void InitMapper()
{
_irq.Reset();
_controlFlags = 0;
memset(_chrRegisters, 0, sizeof(_chrRegisters));
SelectPRGPage(3, -1);
}
virtual void StreamState(bool saving)
{
BaseMapper::StreamState(saving);
Stream(_irq);
Stream<uint8_t>(_controlFlags);
StreamArray<uint8_t>(_chrRegisters, 8);
if(!saving) {
UpdatePrgRamAccess();
}
}
void ProcessCpuClock()
{
_irq.ProcessCpuClock();
}
void UpdateState()
{
switch(_controlFlags & 0x03) {
case 0: SetMirroringType(MirroringType::Vertical); break;
case 1: SetMirroringType(MirroringType::Horizontal); break;
case 2: SetMirroringType(MirroringType::ScreenAOnly); break;
case 3: SetMirroringType(MirroringType::ScreenBOnly); break;
}
UpdatePrgRamAccess();
}
void WriteRegister(uint16_t addr, uint8_t value)
{
if(addr & 0x10 && (addr & 0xF010) != 0x9010) {
addr |= 0x08;
}
switch(addr & 0xF008) {
case 0x8000: SelectPRGPage(0, value & 0x3F); break;
case 0x8008: SelectPRGPage(1, value & 0x3F); break;
case 0x9000: SelectPRGPage(2, value & 0x3F); break;
case 0x9010: break; //Audio
case 0x9030: break; //Audio
case 0xA000: SelectCHRPage(0, value); break;
case 0xA008: SelectCHRPage(1, value); break;
case 0xB000: SelectCHRPage(2, value); break;
case 0xB008: SelectCHRPage(3, value); break;
case 0xC000: SelectCHRPage(4, value); break;
case 0xC008: SelectCHRPage(5, value); break;
case 0xD000: SelectCHRPage(6, value); break;
case 0xD008: SelectCHRPage(7, value); break;
case 0xE000: _controlFlags = value; UpdateState(); break;
case 0xE008: _irq.SetReloadValue(value); break;
case 0xF000: _irq.SetControlValue(value); break;
case 0xF008: _irq.AcknowledgeIrq(); break;
}
}
};