--- np2/io/gdc_sub.c	2004/02/18 03:56:57	1.12
+++ np2/io/gdc_sub.c	2004/02/21 00:25:33	1.17
@@ -3,6 +3,7 @@
 #include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"gdc_sub.h"
 #include	"gdc_pset.h"
 #include	"vram.h"
 
@@ -20,6 +21,8 @@ typedef struct {
 	SINT16	y2;
 } VECTDIR;
 
+const UINT32 gdcplaneseg[4] = {VRAM_E, VRAM_B, VRAM_R, VRAM_G};
+
 static	UINT16	gdc_rt[RT_TABLEMAX+1];
 
 static const VECTDIR vectdir[16] = {
@@ -36,22 +39,22 @@ static const VECTDIR vectdir[16] = {
 
 #if !defined(MEMOPTIMIZE) || (MEMOPTIMIZE < 2)
 const UINT8 gdcbitreverse[0x100] = {
-				0x00, 0x01, 0x01, 0x03, 0x01, 0x05, 0x03, 0x07,
-				0x01, 0x09, 0x05, 0x0d, 0x03, 0x0b, 0x07, 0x0f,
-				0x01, 0x11, 0x09, 0x19, 0x05, 0x15, 0x0d, 0x1d,
-				0x03, 0x13, 0x0b, 0x1b, 0x07, 0x17, 0x0f, 0x1f,
-				0x01, 0x21, 0x11, 0x31, 0x09, 0x29, 0x19, 0x39,
-				0x05, 0x25, 0x15, 0x35, 0x0d, 0x2d, 0x1d, 0x3d,
-				0x03, 0x23, 0x13, 0x33, 0x0b, 0x2b, 0x1b, 0x3b,
-				0x07, 0x27, 0x17, 0x37, 0x0f, 0x2f, 0x1f, 0x3f,
-				0x01, 0x41, 0x21, 0x61, 0x11, 0x51, 0x31, 0x71,
-				0x09, 0x49, 0x29, 0x69, 0x19, 0x59, 0x39, 0x79,
-				0x05, 0x45, 0x25, 0x65, 0x15, 0x55, 0x35, 0x75,
-				0x0d, 0x4d, 0x2d, 0x6d, 0x1d, 0x5d, 0x3d, 0x7d,
-				0x03, 0x43, 0x23, 0x63, 0x13, 0x53, 0x33, 0x73,
-				0x0b, 0x4b, 0x2b, 0x6b, 0x1b, 0x5b, 0x3b, 0x7b,
-				0x07, 0x47, 0x27, 0x67, 0x17, 0x57, 0x37, 0x77,
-				0x0f, 0x4f, 0x2f, 0x6f, 0x1f, 0x5f, 0x3f, 0x7f,
+				0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+				0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+				0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+				0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+				0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+				0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+				0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+				0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+				0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+				0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+				0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+				0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+				0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+				0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+				0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+				0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
 				0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
 				0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
 				0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
@@ -85,7 +88,7 @@ REG8 gdcbitreverse(REG8 data) {
 #endif
 
 
-void gdcsub_init(void) {
+void gdcsub_initialize(void) {
 
 	int		i;
 
@@ -102,24 +105,98 @@ void gdcslavewait(NEVENTITEM item) {
 	}
 }
 
+void gdcsub_setslavewait(UINT32 wait) {
+
+	SINT32	clk;
+
+	clk = nevent_getremain(NEVENT_GDCSLAVE);
+	if (clk < 0) {
+		clk = 0;
+	}
+	gdc.s_drawing = 8;							// GDC DRAWING!
+	nevent_set(NEVENT_GDCSLAVE, clk + wait, gdcslavewait, NEVENT_ABSOLUTE);
+}
+
 static void calc_gdcslavewait(UINT dots) {
 
 	SINT32	clk;
 
 	clk = dots;
-	if (pccore.baseclock != PCBASECLOCK20) {
-		clk *= 27648;
+	if (pccore.cpumode & CPUMODE_8MHZ) {
+		clk *= 22464;
 	}
 	else {
-		clk *= 22464;
+		clk *= 27648;
 	}
 	clk *= pccore.multiple;
 	clk /= 15625;
 	clk += 30 * pccore.multiple;
-	gdc.s_drawing = 8;							// GDC DRAWING!
-	nevent_set(NEVENT_GDCSLAVE, clk, gdcslavewait, NEVENT_ABSOLUTE);
+	gdcsub_setslavewait(clk);
+}
+
+void gdcsub_setvectl(GDCVECT *vect, int x1, int y1, int x2, int y2) {
+
+	UINT	ope;
+	int		dy;
+	int		dx;
+	int		tmp;
+
+	ope = 0;
+	dy = y2 - y1;
+	if (dy < 0) {
+		dy = 0 - dy;
+	}
+	dx = x2 - x1;
+	if (dx == 0) {
+		if (y1 <= y2) {
+			ope = 7;
+		}
+		else {
+			ope = 3;
+		}
+	}
+	else {
+		if (dx > 0) {
+			if (y1 >= y2) {
+				ope += 2;
+			}
+		}
+		else {
+			dx = 0 - dx;
+			ope += 4;
+			if (y1 <= y2) {
+				ope += 2;
+			}
+		}
+		if (ope & 2) {
+			if (dx <= dy) {
+				ope += 1;
+			}
+		}
+		else {
+			if (dx >= dy) {
+				ope += 1;
+			}
+		}
+	}
+	if (ope & 1) {
+		tmp = dx;
+		dx = dy;
+		dy = tmp;
+	}
+	vect->ope = (UINT8)(ope + 0x08);
+	STOREINTELWORD(vect->DC, (UINT16)dx);
+	dy = dy * 2;
+	STOREINTELWORD(vect->D1, (UINT16)dy);
+	dy -= dx;
+	STOREINTELWORD(vect->D, (UINT16)dy);
+	dy -= dx;
+	STOREINTELWORD(vect->D2, (UINT16)dy);
 }
 
+
+// ----
+
 void gdcsub_vect0(UINT32 csrw, const GDCVECT *vect, REG16 pat, REG8 ope) {
 
 	(void)csrw;
@@ -546,7 +623,7 @@ void gdcsub_write(void) {
 	}
 	gdcs.grphdisp |= (BYTE)updatebit;
 
-	ptr += vramplaneseg[(adrs >> 14) & 3];
+	ptr += gdcplaneseg[(adrs >> 14) & 3];
 	adrs = (adrs & 0x3fff) << 1;
 	calc_gdcslavewait(leng);