From 5dc540dd5c3ba42dac1807be6953a449ceccd1a3 Mon Sep 17 00:00:00 2001 From: negativeExponent Date: Tue, 17 Mar 2020 10:27:57 +0800 Subject: [PATCH 1/3] Remove duplicate code in bmc-fk23c --- src/boards/fk23c.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c index 159d9f7..0d924f0 100644 --- a/src/boards/fk23c.c +++ b/src/boards/fk23c.c @@ -232,15 +232,6 @@ static DECLFW(WriteLo) static DECLFW(WriteHi) { - if (CHR_CNROM_MODE && ((A < 0xA000) || (A >= 0xC000))) - { - cnrom_chr = V & 3; - if ((fk23_regs[0] & 0x07) == 0x03) - cnrom_chr = 0; - - SyncCHR(); - } - switch (A & 0xE000) { case 0x8000: @@ -248,12 +239,13 @@ static DECLFW(WriteHi) case 0xC000: case 0xD000: case 0xE000: + case 0xF000: if (CHR_CNROM_MODE) { + cnrom_chr = V & 0x03; + if ((fk23_regs[0] & 0x07) == 0x03) cnrom_chr = 0; - else - cnrom_chr = V & 3; SyncCHR(); } From d50f2e26e6b14e1797c23a428481d55073f07c34 Mon Sep 17 00:00:00 2001 From: negativeExponent Date: Tue, 17 Mar 2020 10:35:56 +0800 Subject: [PATCH 2/3] Cleanup --- src/boards/fk23c.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/boards/fk23c.c b/src/boards/fk23c.c index 0d924f0..41714c6 100644 --- a/src/boards/fk23c.c +++ b/src/boards/fk23c.c @@ -71,8 +71,6 @@ static SFORMAT StateRegs[] = { static void cwrap(uint16 A, uint16 V) { - uint8 bank = 0; - /* some workaround for chr rom / ram access */ if (!UNIFchrrama && !CHRRAMSIZE) fk23_regs[0] &= ~0x20; /* chr rom with no chr ram always write to bank 0 */ @@ -81,16 +79,14 @@ static void cwrap(uint16 A, uint16 V) if (UNIFchrrama && WRAM_EXTENDED && (mmc3_wram & 0x04)) fk23_regs[0] &= ~0x20; - bank = (fk23_regs[0] & 0x20) ? 0x10 : 0; - setchr1r(bank, A, V); + setchr1r((fk23_regs[0] & 0x20) >> 1, A, V); } static void SyncCHR(void) { if (CHR_CNROM_MODE) { - uint8 cnrom_mode = fk23_regs[3] & 0x46; - uint8 mask = cnrom_mode ? (CHR_OUTER_BANK_SIZE ? 0x01 : 0x03) : 0; + uint8 mask = (fk23_regs[3] & 0x46) ? (CHR_OUTER_BANK_SIZE ? 0x01 : 0x03) : 0; uint16 bank = (fk23_regs[2] | (cnrom_chr & mask)) << 3; cwrap(0x0000, bank); @@ -109,11 +105,11 @@ static void SyncCHR(void) if (MMC3_EXTENDED) { - uint16 outer = fk23_regs[2] << 3; + uint16 outer = fk23_regs[2] << 3; - cwrap(cbase ^ 0x0000, mmc3_regs[0] | outer); + cwrap(cbase ^ 0x0000, mmc3_regs[0] | outer); cwrap(cbase ^ 0x0400, mmc3_regs[10] | outer); - cwrap(cbase ^ 0x0800, mmc3_regs[1] | outer); + cwrap(cbase ^ 0x0800, mmc3_regs[1] | outer); cwrap(cbase ^ 0x0c00, mmc3_regs[11] | outer); cwrap(cbase ^ 0x1000, mmc3_regs[2] | outer); @@ -142,7 +138,9 @@ static void SyncCHR(void) static void SyncPRG(void) { uint8 prg_mode = fk23_regs[0] & 7; - uint16 prg_base = (fk23_regs[1] & 0x07F) | ((fk23_regs[0] << 4) & 0x080) | ((fk23_regs[0] << 1) & 0x100) | ((fk23_regs[2] << 3) & 0x600) | ((fk23_regs[2] << 6) & 0x800); + uint16 prg_base = (fk23_regs[1] & 0x07F) | ((fk23_regs[0] << 4) & 0x080) | + ((fk23_regs[0] << 1) & 0x100) | ((fk23_regs[2] << 3) & 0x600) | + ((fk23_regs[2] << 6) & 0x800); switch (prg_mode) { @@ -158,8 +156,8 @@ static void SyncPRG(void) case 2: if (MMC3_EXTENDED) { - uint16 cbase = INVERT_PRG ? 0x4000 : 0; - uint16 outer = prg_base << 1; + uint16 cbase = INVERT_PRG ? 0x4000 : 0; + uint16 outer = prg_base << 1; setprg8(0x8000 ^ cbase, mmc3_regs[6] | outer); setprg8(0xA000, mmc3_regs[7] | outer); From 4d06f77e100f734d7b26075d836ea7d013ed0d90 Mon Sep 17 00:00:00 2001 From: negativeExponent Date: Tue, 17 Mar 2020 10:53:04 +0800 Subject: [PATCH 3/3] Remove unneeded code in BMC-Super24in1SC03 - remove remnants of last mapper update and code section that does not work anymore with fceumm's board handling --- src/boards/super24.c | 114 ++++++++----------------------------------- 1 file changed, 20 insertions(+), 94 deletions(-) diff --git a/src/boards/super24.c b/src/boards/super24.c index 465de17..40862bb 100644 --- a/src/boards/super24.c +++ b/src/boards/super24.c @@ -18,90 +18,50 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/* BMC-Super24in1SC03, basically is just a duplicate of BMC-FK23C (mapper 176) + * This should be merge with the said mapper soon... */ + #include "mapinc.h" #include "mmc3.h" static uint8 *CHRRAM = NULL; -static int masko8[8] = { 63, 31, 15, 1, 3, 0, 0, 0 }; - -static uint8 oldversion = 0; -/* this mapper is 176 rip mapper. */ +static const int masko8[8] = { 63, 31, 15, 1, 3, 0, 0, 0 }; static void Super24PW(uint32 A, uint8 V) { - if (oldversion == 1) - { - uint32 NV = V & masko8[EXPREGS[0] & 7]; - NV |= (EXPREGS[1] << 1); - setprg8r((NV >> 6) & 0xF, A, NV); - } - else - { - setprg8(A, (EXPREGS[1] << 1) | (V & masko8[EXPREGS[0] & 0x7])); - } - + setprg8(A, (EXPREGS[1] << 1) | (V & masko8[EXPREGS[0] & 0x7])); } static void Super24CW(uint32 A, uint8 V) { - if (oldversion == 1) - { - if (EXPREGS[0] & 0x20) - setchr1r(0x10, A, V); - else { - uint32 NV = V | (EXPREGS[2] << 3); - setchr1r((NV >> 9) & 0xF, A, NV); - } - } - else - { - if (EXPREGS[0] & 0x20) - setchr1r(0x10, A, (EXPREGS[2] << 3) | V); - else - setchr1r(0x00, A, (EXPREGS[2] << 3) | V); - } + setchr1r((EXPREGS[0] & 0x20) >> 1, A, (EXPREGS[2] << 3) | V); } static DECLFW(Super24Write) { - if (oldversion == 1) - { - switch (A) { - case 0x5FF0: + switch (A & 0xF003) { + case 0x5000: + if (EXPREGS[0] != V) { EXPREGS[0] = V; FixMMC3PRG(MMC3_cmd); FixMMC3CHR(MMC3_cmd); - break; - case 0x5FF1: + } + break; + case 0x5001: + if (EXPREGS[1] != V) { EXPREGS[1] = V; FixMMC3PRG(MMC3_cmd); - break; - case 0x5FF2: + } + break; + case 0x5002: + if (EXPREGS[2] != V) { EXPREGS[2] = V; FixMMC3CHR(MMC3_cmd); - break; - } - } - else - { - switch (A & 0xF003) { - case 0x5000: - EXPREGS[0] = V; - FixMMC3PRG(MMC3_cmd); - FixMMC3CHR(MMC3_cmd); - break; - case 0x5001: - EXPREGS[1] = V; - FixMMC3PRG(MMC3_cmd); - break; - case 0x5002: - EXPREGS[2] = V; - FixMMC3CHR(MMC3_cmd); - break; } + break; } } static void Super24Power(void) { EXPREGS[0] = 0x24; - EXPREGS[1] = 159; + EXPREGS[1] = 0x9F; EXPREGS[2] = 0; GenMMC3Power(); SetWriteHandler(0x5000, 0x7FFF, Super24Write); @@ -110,7 +70,7 @@ static void Super24Power(void) { static void Super24Reset(void) { EXPREGS[0] = 0x24; - EXPREGS[1] = 159; + EXPREGS[1] = 0x9F; EXPREGS[2] = 0; MMC3RegReset(); } @@ -122,40 +82,6 @@ static void Super24Close(void) { } void Super24_Init(CartInfo *info) { - - if (oldversion == 0) - { - uint8* _CHRptr; - uint8* _PRGptr; - uint32 _CHROffset = 0; - uint32 _PRGOffset = 0; - uint32 _PRGsize = 0; - uint32 _CHRsize = 0; - int i = 0; - - for (i = 0;i < 4;i++) - { - _PRGsize += PRGsize[i]; - _CHRsize += CHRsize[i]; - } - - _CHRptr = (uint8*)FCEU_gmalloc(_CHRsize); - for (i = 0;i < 4;i++) - { - memcpy(&_CHRptr[_CHROffset], CHRptr[i], CHRsize[i]); - _CHROffset += CHRsize[i]; - } - - _PRGptr = (uint8*)FCEU_gmalloc(_PRGsize); - for (i = 0;i < 4;i++) - { - memcpy(&_PRGptr[_PRGOffset], PRGptr[i], PRGsize[i]); - _PRGOffset += PRGsize[i]; - } - SetupCartCHRMapping(0, _CHRptr, _CHRsize, 0); - SetupCartPRGMapping(0, _PRGptr, _PRGsize, 0); - } - GenMMC3_Init(info, 512, 512, 0, 0); info->Power = Super24Power; info->Reset = Super24Reset;