From c57a56f43a112d3d3d89dcb0cbdc6183d58d045e Mon Sep 17 00:00:00 2001 From: NewRisingSun <8vytz1+dhp372pv94ebg@sharklasers.com> Date: Thu, 10 Apr 2025 09:49:19 +0200 Subject: [PATCH] Mapper 530: Update to use modular VRC2/VRC4 emulation. --- src/boards/530.c | 55 +++++++++++++++++++++ src/boards/ax5705.c | 116 -------------------------------------------- 2 files changed, 55 insertions(+), 116 deletions(-) create mode 100644 src/boards/530.c delete mode 100644 src/boards/ax5705.c diff --git a/src/boards/530.c b/src/boards/530.c new file mode 100644 index 0000000..eaf6d44 --- /dev/null +++ b/src/boards/530.c @@ -0,0 +1,55 @@ +/* FCE Ultra - NES/Famicom Emulator + * + * Copyright notice for this file: + * Copyright (C) 2025 NewRisingSun + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "mapinc.h" +#include "vrc2and4.h" + +static void sync () { + VRC24_syncPRG(0x01F, 0x000); + VRC24_syncCHR(0x1FF, 0x000); + VRC24_syncMirror(); +} + +int UNLAX5705_getPRGBank(int bank) { + int result =VRC24_getPRGBank(bank); + return result <<2 &0x8 | result >>2 &0x2 | result &~0xA; +} + +int UNLAX5705_getCHRBank(int bank) { + int result =VRC24_getCHRBank(bank); + return result <<1 &0x40 | result >>1 &0x20 | result &~0x60; +} + +DECLFW(UNLAX5705_unscrambleAddress) { + VRC24_writeReg(A &~0x1000 | A <<9 &0x1000, V); +} + + +void UNLAX5705_power (void) { + VRC24_power(); + SetWriteHandler(0x8000, 0xFFFF, UNLAX5705_unscrambleAddress); +} + +void UNLAX5705_Init (CartInfo *info) { + VRC24_init(info, sync, 0x01, 0x02, 1, 1, 0); + info->Power =UNLAX5705_power; + VRC24_GetPRGBank =UNLAX5705_getPRGBank; + VRC24_GetCHRBank =UNLAX5705_getCHRBank; +} diff --git a/src/boards/ax5705.c b/src/boards/ax5705.c deleted file mode 100644 index d2f98f6..0000000 --- a/src/boards/ax5705.c +++ /dev/null @@ -1,116 +0,0 @@ -/* FCE Ultra - NES/Famicom Emulator - * - * Copyright notice for this file: - * Copyright (C) 2007 CaH4e3 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Super Bros. Pocker Mali (VRC4 mapper) - */ - -#include "mapinc.h" - -static uint8 IRQCount; /*, IRQPre; */ -static uint8 IRQa; -static uint8 prg_reg[2]; -static uint8 chr_reg[8]; -static uint8 mirr; - -static SFORMAT StateRegs[] = -{ - { &IRQCount, 1, "IRQC" }, - { &IRQa, 1, "IRQA" }, - { prg_reg, 2, "PRG" }, - { chr_reg, 8, "CHR" }, - { &mirr, 1, "MIRR" }, - { 0 } -}; - -#if 0 -static void UNLAX5705IRQ(void) { - if(IRQa) { - IRQCount++; - if(IRQCount>=238) { - X6502_IRQBegin(FCEU_IQEXT); -/* IRQa=0; */ - } - } -} -#endif - -static void Sync(void) { - int i; - setprg8(0x8000, prg_reg[0]); - setprg8(0xA000, prg_reg[1]); - setprg8(0xC000, ~1); - setprg8(0xE000, ~0); - for (i = 0; i < 8; i++) - setchr1(i << 10, chr_reg[i]); - setmirror(mirr ^ 1); -} - -static DECLFW(UNLAX5705Write) { -#if 0 - if((A>=0xA008)&&(A<=0xE003)) { - int ind=(((A>>11)-6)|(A&1))&7; - int sar=((A&2)<<1); - chr_reg[ind]=(chr_reg[ind]&(0xF0>>sar))|((V&0x0F)<> 2) | (V & 5); break; /* EPROM dump have mixed PRG and CHR banks, data lines to mapper seems to be mixed */ - case 0x8008: mirr = V & 1; break; - case 0xA000: prg_reg[1] = ((V & 2) << 2) | ((V & 8) >> 2) | (V & 5); break; - case 0xA008: chr_reg[0] = (chr_reg[0] & 0xF0) | (V & 0x0F); break; - case 0xA009: chr_reg[0] = (chr_reg[0] & 0x0F) | ((((V & 4) >> 1) | ((V & 2) << 1) | (V & 0x09)) << 4); break; - case 0xA00A: chr_reg[1] = (chr_reg[1] & 0xF0) | (V & 0x0F); break; - case 0xA00B: chr_reg[1] = (chr_reg[1] & 0x0F) | ((((V & 4) >> 1) | ((V & 2) << 1) | (V & 0x09)) << 4); break; - case 0xC000: chr_reg[2] = (chr_reg[2] & 0xF0) | (V & 0x0F); break; - case 0xC001: chr_reg[2] = (chr_reg[2] & 0x0F) | ((((V & 4) >> 1) | ((V & 2) << 1) | (V & 0x09)) << 4); break; - case 0xC002: chr_reg[3] = (chr_reg[3] & 0xF0) | (V & 0x0F); break; - case 0xC003: chr_reg[3] = (chr_reg[3] & 0x0F) | ((((V & 4) >> 1) | ((V & 2) << 1) | (V & 0x09)) << 4); break; - case 0xC008: chr_reg[4] = (chr_reg[4] & 0xF0) | (V & 0x0F); break; - case 0xC009: chr_reg[4] = (chr_reg[4] & 0x0F) | ((((V & 4) >> 1) | ((V & 2) << 1) | (V & 0x09)) << 4); break; - case 0xC00A: chr_reg[5] = (chr_reg[5] & 0xF0) | (V & 0x0F); break; - case 0xC00B: chr_reg[5] = (chr_reg[5] & 0x0F) | ((((V & 4) >> 1) | ((V & 2) << 1) | (V & 0x09)) << 4); break; - case 0xE000: chr_reg[6] = (chr_reg[6] & 0xF0) | (V & 0x0F); break; - case 0xE001: chr_reg[6] = (chr_reg[6] & 0x0F) | ((((V & 4) >> 1) | ((V & 2) << 1) | (V & 0x09)) << 4); break; - case 0xE002: chr_reg[7] = (chr_reg[7] & 0xF0) | (V & 0x0F); break; - case 0xE003: chr_reg[7] = (chr_reg[7] & 0x0F) | ((((V & 4) >> 1) | ((V & 2) << 1) | (V & 0x09)) << 4); break; -#if 0 - case 0x800A: X6502_IRQEnd(FCEU_IQEXT); IRQa=0; break; - case 0xE00B: X6502_IRQEnd(FCEU_IQEXT); IRQa=IRQCount=V; /*if(scanline<240) IRQCount-=8; else IRQCount+=4;*/ break; -#endif - } - Sync(); -} - -static void UNLAX5705Power(void) { - Sync(); - SetReadHandler(0x8000, 0xFFFF, CartBR); - SetWriteHandler(0x8000, 0xFFFF, UNLAX5705Write); -} - -static void StateRestore(int version) { - Sync(); -} - -void UNLAX5705_Init(CartInfo *info) { - info->Power = UNLAX5705Power; -/* GameHBIRQHook=UNLAX5705IRQ; */ - GameStateRestore = StateRestore; - AddExState(&StateRegs, ~0, 0, 0); -}