--- np2/io/crtc.c	2004/02/07 21:23:22	1.4
+++ np2/io/crtc.c	2007/11/11 13:54:14	1.11
@@ -22,12 +22,12 @@ static void IOOUTCALL crtc_o7c(UINT port
 	if (grcg.chip) {
 		grcg.modereg = (UINT8)dat;
 		grcg.counter = 0;
-		vramop.operate &= VOP_GRCGMASK;
-		vramop.operate |= ((dat & 0xc0) >> 4);
+		vramop.operate &= ~(3 << VOPBIT_GRCG);
+		vramop.operate |= ((dat & 0xc0) >> (6 - VOPBIT_GRCG));
 		if (grcg.chip >= 2) {
 			grcg.gdcwithgrcg = (dat >> 4) & 0x0c;
 		}
-		i286_vram_dispatch(vramop.operate);
+		MEMM_VRAM(vramop.operate);
 	}
 	(void)port;
 }
@@ -60,19 +60,41 @@ static const IOINP crtci70[8] = {
 				NULL,		NULL,		NULL,		NULL,
 				NULL,		NULL,		crtc_i7c,	NULL};
 
-void crtc_reset(void) {
 
-	ZeroMemory(&grcg, sizeof(grcg));
-	ZeroMemory(&crtc, sizeof(crtc));
-	if (!(np2cfg.dipsw[0] & 0x01)) {
+void crtc_biosreset(void) {
+
+	if (!(pccore.dipsw[0] & 0x01)) {
+		crtc.reg.pl = 0;
 		crtc.reg.bl = 0x0f;
 		crtc.reg.cl = 0x10;
+		crtc.reg.ssl = 0;
 	}
 	else {
+		crtc.reg.pl = 0;
 		crtc.reg.bl = 0x07;
 		crtc.reg.cl = 0x08;
+		crtc.reg.ssl = 0;
 	}
-	grcg.chip = np2cfg.grcg & 3;			// GRCG動作のコピー
+	gdcs.textdisp |= GDCSCRN_ALLDRAW;
+
+	grcg.modereg = 0;
+	grcg.counter = 0;
+	vramop.operate &= ~(3 << VOPBIT_GRCG);
+	grcg.gdcwithgrcg = 0;
+	ZeroMemory(grcg.tile, sizeof(grcg.tile));
+	MEMM_VRAM(vramop.operate);
+}
+
+void crtc_reset(const NP2CFG *pConfig) {
+
+	ZeroMemory(&grcg, sizeof(grcg));
+	ZeroMemory(&crtc, sizeof(crtc));
+#if defined(SUPPORT_PC9821)
+	grcg.chip = 3;							// PC-9821は EGC必須
+#else
+	grcg.chip = pConfig->grcg & 3;			// GRCG動作のコピー
+#endif
+	crtc_biosreset();
 }
 
 void crtc_bind(void) {