diff --git a/src/boards/571.c b/src/boards/571.c new file mode 100644 index 0000000..c759426 --- /dev/null +++ b/src/boards/571.c @@ -0,0 +1,72 @@ +/* FCEUmm - NES/Famicom Emulator + * + * Copyright notice for this file: + * Copyright (C) 2020 + * + * 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 "asic_vrc2and4.h" + +static uint8 reg; + +static void sync () { + int prgAND = reg &0x10? 0x1F: 0x0F; + int chrAND = reg &0x10? 0xFF: 0x7F; + int prgOR = reg <<1; + int chrOR = reg <<4; + if (reg &0x20) + VRC24_syncPRG(prgAND, prgOR &~prgAND); + else + if (reg &0x6) + setprg32(0x8000, reg >>1); + else { + setprg16(0x8000, reg); + setprg16(0xC000, reg); + } + VRC24_syncCHR(chrAND, chrOR &~chrAND); + VRC24_syncMirror(); + if (reg &0x10) + VRC24_reconfigure(8, 4); + else + VRC24_reconfigure(4, 8); +} + +static DECLFW (writeReg) { + if (~reg &0x01) { + reg = A &0xFF; + sync(); + } +} + +static void reset () { + reg = 0; + sync(); +} + +static void power () { + reg = 0; + VRC24_power(); +} + +void Mapper571_Init (CartInfo *info) { + VRC4_init(info, sync, 4, 8, 1, NULL, NULL, NULL, writeReg, NULL); + info->Power = power; + info->Reset = reset; + AddExState(®, 1, 0, "EXPR"); +} diff --git a/src/boards/asic_vrc2and4.c b/src/boards/asic_vrc2and4.c index 16166bf..6dfe81d 100644 --- a/src/boards/asic_vrc2and4.c +++ b/src/boards/asic_vrc2and4.c @@ -239,6 +239,11 @@ static void VRC4_configure (void (*sync)(), int A0, int A1, uint8 useRepeatBit, VRC24_cbExternalSelect = externalSelect; } +void VRC24_reconfigure(int A0, int A1) { + VRC24_A0 = A0; + VRC24_A1 = A1; +} + void VRC2_activate (uint8 clear, void (*sync)(), int A0, int A1, int (*prg)(uint8), int (*chr)(uint8), DECLFR((*read)), DECLFW((*write))) { VRC2_configure(sync, A0, A1, prg, chr, read, write); VRC24_setHandlers(); diff --git a/src/boards/asic_vrc2and4.h b/src/boards/asic_vrc2and4.h index c5ae48c..ed82969 100644 --- a/src/boards/asic_vrc2and4.h +++ b/src/boards/asic_vrc2and4.h @@ -37,6 +37,7 @@ void VRC24_syncMirror (); DECLFW(VRC24_writeReg); void FP_FASTAPASS(1) VRC4_cpuCycle(int); +void VRC24_reconfigure (int, int); void VRC2_activate (uint8, void (*)(), int, int, int (*)(uint8), int (*)(uint8), DECLFR((*)), DECLFW((*))); void VRC4_activate (uint8, void (*)(), int, int, uint8, int (*)(uint8), int (*)(uint8), DECLFR((*)), DECLFW((*)), DECLFW((*))); void VRC2_addExState (); diff --git a/src/ines.c b/src/ines.c index 04431f2..75ec390 100644 --- a/src/ines.c +++ b/src/ines.c @@ -953,6 +953,7 @@ INES_BOARD_BEGIN() INES_BOARD( "J-2020", 563, Mapper563_Init ) INES_BOARD( "Top Ten Variety (SF III)", 567, Mapper567_Init ) INES_BOARD( "9052", 570, Mapper570_Init ) + INES_BOARD( "JC-011", 571, Mapper571_Init ) INES_BOARD( "F-648", 572, Mapper572_Init ) INES_BOARD( "5068", 573, Mapper573_Init ) INES_BOARD( "FC-40", 574, Mapper574_Init ) diff --git a/src/ines.h b/src/ines.h index 30c073c..172ae2b 100644 --- a/src/ines.h +++ b/src/ines.h @@ -419,6 +419,7 @@ void Mapper561_562_Init(CartInfo *); void Mapper563_Init(CartInfo *); void Mapper567_Init(CartInfo *); void Mapper570_Init(CartInfo *); +void Mapper571_Init(CartInfo *); void Mapper572_Init(CartInfo *); void Mapper573_Init(CartInfo *); void Mapper574_Init(CartInfo *);