From cfc3b17e34e9133f8c09811961fdac207de75f5b Mon Sep 17 00:00:00 2001 From: negativeExponent Date: Sun, 27 Feb 2022 06:47:59 +0800 Subject: [PATCH 1/2] M134: Update copyright info negativeExponent did not write (or re-write) this. I have already removed the name from the last PR as well. --- src/boards/134.c | 2 +- src/boards/KS7030.c | 2 +- src/boards/addrlatch.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/boards/134.c b/src/boards/134.c index 0ffa5ef..3f2f99f 100644 --- a/src/boards/134.c +++ b/src/boards/134.c @@ -1,7 +1,7 @@ /* FCEUmm - NES/Famicom Emulator * * Copyright notice for this file: - * Copyright (C) 2020 negativeExponent + * 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 diff --git a/src/boards/KS7030.c b/src/boards/KS7030.c index fb61a7e..a35b184 100644 --- a/src/boards/KS7030.c +++ b/src/boards/KS7030.c @@ -25,7 +25,7 @@ * */ -/* 2020-3-6 - update mirroring (negativeExponent) +/* 2020-3-6 - update mirroring * PRG-ROM Bank Select #1/Mirroring Select ($8000-$8FFF, write) * A~FEDC BA98 7654 3210 * ------------------- diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c index 31235eb..01c1360 100644 --- a/src/boards/addrlatch.c +++ b/src/boards/addrlatch.c @@ -265,7 +265,7 @@ void Mapper200_Init(CartInfo *info) { /*------------------ Map 201 ---------------------------*/ /* 2020-3-6 - Support for 21-in-1 (CF-043) (2006-V) (Unl) [p1].nes which has mixed mirroring - * found at the time labeled as submapper 15 (negativeExponent) + * found at the time labeled as submapper 15 * 0x05658DED 128K PRG, 32K CHR */ static uint32 submapper = 0; static void M201Sync(void) { From 54fed71574bb1ef64ab0c315ebd196341c2d5efe Mon Sep 17 00:00:00 2001 From: negativeExponent Date: Sun, 27 Feb 2022 15:45:18 +0800 Subject: [PATCH 2/2] 8237A: Fixed outer PRG banking for NROM mode --- src/boards/8237.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boards/8237.c b/src/boards/8237.c index fa0c279..4c5b869 100644 --- a/src/boards/8237.c +++ b/src/boards/8237.c @@ -86,7 +86,7 @@ static void UNL8237PW(uint32 A, uint8 V) { if (EXPREGS[0] & 0x40) { uint8 sbank = (EXPREGS[1] & 0x10); if (EXPREGS[0] & 0x80) { /* NROM */ - uint8 bank = ((EXPREGS[1] & 3) << 4) | (EXPREGS[0] & 0x7) | (sbank >> 1); + uint8 bank = (outer_bank >> 1) | (EXPREGS[0] & 0x7) | (sbank >> 1); if (EXPREGS[0] & 0x20) /* NROM-256 */ setprg32(0x8000, bank >> 1); else { /* NROM-128 */ @@ -97,7 +97,7 @@ static void UNL8237PW(uint32 A, uint8 V) { setprg8(A, outer_bank | (V & 0x0F) | sbank); } else { if (EXPREGS[0] & 0x80) { /* NROM */ - uint8 bank = ((EXPREGS[1] & 3) << 4) | (EXPREGS[0] & 0xF); + uint8 bank = (outer_bank >> 1) | (EXPREGS[0] & 0xF); if (EXPREGS[0] & 0x20) /* NROM-256 */ setprg32(0x8000, bank >> 1); else { /* NROM-128 */