From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Thu, 1 Oct 2015 16:31:26 +0000 (+0900)
Subject: [VM][FM77][FM77AV][MAINMEM] Trim around MMR segment, whense extend MMR.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=628ccac314ce959d13c61cb96466f1da60386ea5;p=csp-qt%2Fcommon_source_project-fm7.git

[VM][FM77][FM77AV][MAINMEM] Trim around MMR segment, whense extend MMR.
---

diff --git a/source/src/vm/fm7/fm7_mainmem.cpp b/source/src/vm/fm7/fm7_mainmem.cpp
index 225ad9b76..c3b6d625e 100644
--- a/source/src/vm/fm7/fm7_mainmem.cpp
+++ b/source/src/vm/fm7/fm7_mainmem.cpp
@@ -765,12 +765,11 @@ void FM7_MAINMEM::write_data8(uint32 addr, uint32 data)
 			window_offset = data;
 			break;
 		case FM7_MAINIO_MMR_SEGMENT:
-# if !defined(_FM77AV20) && !defined(_FM77AV20EX) && !defined(_FM77AV20SX) && \
-     !defined(_FM77AV40) && !defined(_FM77AV40EX) && !defined(_FM77AV40SX)
-			mmr_segment = data & 0x03;
-# else		   
-			mmr_segment = data & 0x07;
-# endif		   
+			if(mmr_extend) {
+				mmr_segment = data & 0x07;
+			} else {
+				mmr_segment = data & 0x03;
+			}
 			break;
 		default:
 			if((addr >= FM7_MAINIO_MMR_BANK) && (addr < (FM7_MAINIO_MMR_BANK + 0x80))){