From: K.Ohta <whatisthis.sowhat@gmail.com>
Date: Thu, 16 May 2019 20:33:32 +0000 (+0900)
Subject: [VM][PC9801][DISPLAY] EGC: Add write protect register (03h).
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3281f32df5f4960b396107ba155594810270de8e;p=csp-qt%2Fcommon_source_project-fm7.git

[VM][PC9801][DISPLAY] EGC: Add write protect register (03h).
---

diff --git a/source/src/vm/pc9801/display.cpp b/source/src/vm/pc9801/display.cpp
index 2db7656c4..9b3f16c79 100644
--- a/source/src/vm/pc9801/display.cpp
+++ b/source/src/vm/pc9801/display.cpp
@@ -19,6 +19,7 @@
 
 #include "display.h"
 #include "../i8259.h"
+#include "../i8255.h"
 #include "../upd7220.h"
 #include "../../config.h"
 
@@ -57,7 +58,8 @@
 #define MODE1_DISP	7
 
 #define MODE2_16COLOR	0x00
-#define MODE2_EGC	0x02
+#define MODE2_EGC		0x02
+#define MODE2_EGC_WP	0x03
 #define MDOE2_TXTSHIFT	0x20
 
 #define GRCG_PLANE_0	0x01
@@ -112,7 +114,7 @@ void DISPLAY::initialize()
 	FILEIO* fio = new FILEIO();
 	b_gfx_ff = false; // Q: Is latched beyond resetting?
 #if defined(SUPPORT_EGC)
-	is_use_egc = ((config.dipswitch & (1 << DIPSW_POSITION_EGC)) != 0) ? true : false;
+	is_use_egc = true;
 #endif
 #if !defined(SUPPORT_HIRESO)
 	uint8_t *p = font + 0x81000;
@@ -320,6 +322,7 @@ void DISPLAY::reset()
 	vram_disp_e = vram + VRAM_PLANE_ADDR_3;
 #endif
 	vram_draw   = vram + 0x00000;
+	vram_bank = 0x00000;
 	
 	crtv = 2;
 	
@@ -344,8 +347,14 @@ void DISPLAY::reset()
 	}
 #endif
 #if defined(SUPPORT_EGC)
-	is_use_egc = ((config.dipswitch & (1 << DIPSW_POSITION_EGC)) != 0) ? true : false;
+	is_use_egc = ((config.dipswitch & (1 << DIPSW_POSITION_EGC)) != 0);
+
+	#if defined(SUPPORT_EGC)
 	enable_egc = false;
+//	if(modereg2[MODE2_EGC_WP] != 0) {
+	//		enable_egc = ((is_use_egc) && (modereg2[MODE2_EGC] != 0)) ? true : false;
+//	}
+	#endif
 	egc_access = 0xfff0;
 	egc_fgbg = 0x00ff;
 	egc_ope = 0;
@@ -428,6 +437,9 @@ void DISPLAY::write_signal(int ch, uint32_t data, uint32_t mask)
 		if((data < 0x000a0000) || (data >= 0x000f0000)) data = 0x80000000;
 		bank_table[0x08] = data;
 		bank_table[0x09] = data + 0x00010000;
+	} else if(ch == SIG_DISPLAY98_SET_BANK) {
+		// WIP: Still dummy.
+		vram_bank = ((data & mask) != 0) ? 0x10000 : 0x00000;
 	}
 }
 
@@ -465,13 +477,25 @@ void DISPLAY::write_io8(uint32_t addr, uint32_t data)
 		break;
 #if defined(SUPPORT_16_COLORS)
 	case 0x6a:
+#if !defined(PC9821_VARIANTS)
+		if((data & 0xf0) != 0) { // From MAME 0.208. Disable pages .
+			m_bak = 0;
+			modereg2[(data >> 1) & 127] = 0;
+		} else { 
+			m_bak = modereg2[(data >> 1) & 127];
+			modereg2[(data >> 1) & 127] = data & 1;
+		}
+#else
 		m_bak = modereg2[(data >> 1) & 127];
 		modereg2[(data >> 1) & 127] = data & 1;
-		if(is_use_egc) {
-			enable_egc = (modereg2[MODE2_EGC]) ? true : false;
-		} else {
-			enable_egc = false;
-			//modereg2[MODE2_EGC] = 0;
+#endif
+		if(modereg2[MODE2_EGC_WP] != 0) {
+			if(is_use_egc) {
+				enable_egc = (modereg2[MODE2_EGC]) ? true : false;
+			} else {
+				enable_egc = false;
+				modereg2[MODE2_EGC] = 0;
+			}
 		}
 		if(m_bak != modereg2[(data >> 1) & 127]) {
 			if((data & 0xfe) == 0x82) {
@@ -497,11 +521,12 @@ void DISPLAY::write_io8(uint32_t addr, uint32_t data)
 		break;
 #endif
 	case 0x6c:
-//		border = (data >> 3) & 7;
+		border = (data >> 3) & 7;
 		break;
 	case 0x6e:
-//		border = (data >> 3) & 7;
-#if !defined(_PC9801)
+#if defined(_PC9801)
+		border = (data >> 3) & 7;
+#else
 		if(data & 1) {
 			d_gdc_chr->set_horiz_freq(24830);
 			d_gdc_gfx->set_horiz_freq(24830);
@@ -1433,6 +1458,7 @@ __DECL_ALIGNED(16) static const uint16_t DISPLAY::egc_maskword[16][4] = {
 	{0x0000, 0x0000, 0xffff, 0xffff}, {0xffff, 0x0000, 0xffff, 0xffff},
 	{0x0000, 0xffff, 0xffff, 0xffff}, {0xffff, 0xffff, 0xffff, 0xffff}
 };
+
 // SUBROUTINES are moved to display,h due to making inline. 20190514 K.O
 void DISPLAY::egc_sftb_upn0(uint32_t ext)
 {
@@ -2904,7 +2930,7 @@ void DISPLAY::draw_gfx_screen()
 	}
 }
 
-#define STATE_VERSION	6
+#define STATE_VERSION	7
 
 bool DISPLAY::process_state(FILEIO* state_fio, bool loading)
 {
@@ -2930,6 +2956,7 @@ bool DISPLAY::process_state(FILEIO* state_fio, bool loading)
 	state_fio->StateValue(crtv);
 	state_fio->StateArray(scroll, sizeof(scroll), 1);
 	state_fio->StateArray(modereg1, sizeof(modereg1), 1);
+	state_fio->StateValue(border);
  #if defined(SUPPORT_16_COLORS)
 	state_fio->StateArray(modereg2, sizeof(modereg2), 1);
  #endif
@@ -2976,11 +3003,13 @@ bool DISPLAY::process_state(FILEIO* state_fio, bool loading)
 	state_fio->StateValue(egc_vram_data.q);
 
 	state_fio->StateValue(is_use_egc);
+	state_fio->StateValue(enable_egc);
 #endif
 	state_fio->StateValue(font_code);
 	state_fio->StateValue(font_line);
 //	state_fio->StateValue(font_lr);
 	state_fio->StateValue(b_gfx_ff);
+//	state_fio->StateValue(vram_bank);
 	state_fio->StateArray(bank_table, sizeof(bank_table), 1);
 	
  	// post process
@@ -3016,10 +3045,6 @@ bool DISPLAY::process_state(FILEIO* state_fio, bool loading)
 			grcg_tile_word[i] = ((uint16_t)(grcg_tile[i]) << 8) | grcg_tile[i];
 		}
 	#endif
-	#if defined(SUPPORT_16_COLORS) && defined(SUPPORT_EGC)
-		//is_use_egc = ((config.dipswitch & (1 << DIPSW_POSITION_EGC)) != 0) ? true : false;
-		enable_egc = ((is_use_egc) && (modereg2[MODE2_EGC] != 0)) ? true : false;
-	#endif
  	}
 #endif
  	return true;
diff --git a/source/src/vm/pc9801/display.h b/source/src/vm/pc9801/display.h
index 6f928c590..0c80f7fd0 100644
--- a/source/src/vm/pc9801/display.h
+++ b/source/src/vm/pc9801/display.h
@@ -26,6 +26,7 @@
 
 #define SIG_DISPLAY98_SET_PAGE_80 1
 #define SIG_DISPLAY98_SET_PAGE_A0 2
+#define SIG_DISPLAY98_SET_BANK    3
 
 class UPD7220;
 
@@ -36,6 +37,7 @@ class DISPLAY : public DEVICE
 private:
 	DEVICE *d_pic;
 	DEVICE *d_pio_sys;
+	DEVICE *d_pio_prn;
 	outputs_t output_gdc_freq;
 	
 	UPD7220 *d_gdc_chr, *d_gdc_gfx;
@@ -43,6 +45,7 @@ private:
 	uint8_t *ra_gfx, *cs_gfx;
 	
 	uint8_t tvram[0x4000];
+	uint32_t vram_bank;
 #if !defined(SUPPORT_HIRESO)
 #if defined(SUPPORT_2ND_VRAM)
 	__DECL_ALIGNED(4) uint8_t vram[0x40000];
@@ -76,6 +79,7 @@ private:
 	uint8_t crtv;
 	uint8_t scroll[6];
 	uint8_t modereg1[8];
+	uint8_t border; // ToDo; OVER SCAN.
 #if defined(SUPPORT_16_COLORS)
 	uint8_t modereg2[128];
 	bool is_use_egc;
@@ -266,6 +270,14 @@ public:
 		d_gdc_gfx = device;
 		ra_gfx = ra; cs_gfx = cs;
 	}
+	void set_context_pio_sys(DEVICE* device)
+	{
+		d_pio_sys = device;
+	}
+	void set_context_pio_prn(DEVICE* device)
+	{
+		d_pio_prn = device;
+	}
 	void sound_bios_ok()
 	{
 		tvram[0x3fee] = 8;