--- np2/lio/gscreen.c	2004/02/21 20:48:52	1.10
+++ np2/lio/gscreen.c	2005/02/16 09:31:55	1.15
@@ -9,33 +9,33 @@
 
 
 typedef struct {
-	BYTE	mode;
-	BYTE	sw;
-	BYTE	act;
-	BYTE	disp;
+	UINT8	mode;
+	UINT8	sw;
+	UINT8	act;
+	UINT8	disp;
 } GSCREEN;
 
 typedef struct {
-	BYTE	x1[2];
-	BYTE	y1[2];
-	BYTE	x2[2];
-	BYTE	y2[2];
-	BYTE	vdraw_bg;
-	BYTE	vdraw_ln;
+	UINT8	x1[2];
+	UINT8	y1[2];
+	UINT8	x2[2];
+	UINT8	y2[2];
+	UINT8	vdraw_bg;
+	UINT8	vdraw_ln;
 } GVIEW;
 
 typedef struct {
-	BYTE	dummy;
-	BYTE	bgcolor;
-	BYTE	bdcolor;
-	BYTE	fgcolor;
-	BYTE	palmode;
+	UINT8	dummy;
+	UINT8	bgcolor;
+	UINT8	bdcolor;
+	UINT8	fgcolor;
+	UINT8	palmode;
 } GCOLOR1;
 
 typedef struct {
-	BYTE	pal;
-	BYTE	color1;
-	BYTE	color2;
+	UINT8	pal;
+	UINT8	color1;
+	UINT8	color2;
 } GCOLOR2;
 
 
@@ -45,7 +45,7 @@ REG8 lio_ginit(GLIO lio) {
 
 	UINT	i;
 
-	vramop.operate &= VOP_ACCESSMASK;
+	vramop.operate &= ~(1 << VOPBIT_ACCESS);
 	i286_vram_dispatch(vramop.operate);
 	bios0x18_42(0x80);
 	bios0x18_40();
@@ -66,8 +66,8 @@ REG8 lio_ginit(GLIO lio) {
 	STOREINTELWORD(lio->work.viewx2, 639);
 	STOREINTELWORD(lio->work.viewy2, 399);
 	lio->palmode = 0;
-	i286_memstr_write(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
-	i286_membyte_write(CPU_DS, 0x0a08, lio->palmode);
+	MEML_WRITESTR(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
+	MEML_WRITE8(CPU_DS, 0x0a08, lio->palmode);
 	return(LIO_SUCCESS);
 }
 
@@ -93,7 +93,7 @@ REG8 lio_gscreen(GLIO lio) {
 	else {
 		colorbit = 4;
 	}
-	i286_memstr_read(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
 	scrnmode = dat.mode;
 	if (scrnmode == 0xff) {
 		scrnmode = lio->work.scrnmode;
@@ -181,6 +181,7 @@ REG8 lio_gscreen(GLIO lio) {
 	}
 
 	lio->work.scrnmode = scrnmode;
+	pos = lio->work.pos;
 	switch(scrnmode) {
 		case 0:
 			mode = (pos)?0x40:0x80;
@@ -200,10 +201,9 @@ REG8 lio_gscreen(GLIO lio) {
 			break;
 	}
 	mode |= disp << 4;
-	TRACEOUT(("bios1842 - %.2x", mode));
 	bios0x18_42(mode);
 	iocore_out8(0x00a6, lio->work.access);
-	i286_memstr_write(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
+	MEML_WRITESTR(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
 	return(LIO_SUCCESS);
 
 gscreen_err5:
@@ -223,7 +223,7 @@ REG8 lio_gview(GLIO lio) {
 	int		x2;
 	int		y2;
 
-	i286_memstr_read(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
 	x1 = (SINT16)LOADINTELWORD(dat.x1);
 	y1 = (SINT16)LOADINTELWORD(dat.y1);
 	x2 = (SINT16)LOADINTELWORD(dat.x2);
@@ -235,7 +235,7 @@ REG8 lio_gview(GLIO lio) {
 	STOREINTELWORD(lio->work.viewy1, (UINT16)y1);
 	STOREINTELWORD(lio->work.viewx2, (UINT16)x2);
 	STOREINTELWORD(lio->work.viewy2, (UINT16)y2);
-	i286_memstr_write(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
+	MEML_WRITESTR(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
 	return(LIO_SUCCESS);
 }
 
@@ -246,7 +246,7 @@ REG8 lio_gcolor1(GLIO lio) {
 
 	GCOLOR1	dat;
 
-	i286_memstr_read(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
 	if (dat.bgcolor != 0xff) {
 		lio->work.bgcolor = dat.bgcolor;
 	}
@@ -270,8 +270,8 @@ REG8 lio_gcolor1(GLIO lio) {
 		}
 		lio->palmode = dat.palmode;
 	}
-	i286_memstr_write(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
-	i286_membyte_write(CPU_DS, 0x0a08, lio->palmode);
+	MEML_WRITESTR(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
+	MEML_WRITE8(CPU_DS, 0x0a08, lio->palmode);
 	return(LIO_SUCCESS);
 
 gcolor1_err5:
@@ -285,7 +285,7 @@ REG8 lio_gcolor2(GLIO lio) {
 
 	GCOLOR2	dat;
 
-	i286_memstr_read(CPU_DS, CPU_BX, &dat, sizeof(dat));
+	MEML_READSTR(CPU_DS, CPU_BX, &dat, sizeof(dat));
 	if (dat.pal >= ((lio->palmode == 2)?16:8)) {
 		goto gcolor2_err5;
 	}
@@ -302,7 +302,7 @@ REG8 lio_gcolor2(GLIO lio) {
 		gdc_setanalogpal(dat.pal, offsetof(RGB32, p.g),
 												(UINT8)(dat.color2 & 0x0f));
 	}
-	i286_memstr_write(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
+	MEML_WRITESTR(CPU_DS, 0x0620, &lio->work, sizeof(lio->work));
 	return(LIO_SUCCESS);
 
 gcolor2_err5: