--- np2/lio/gscreen.c 2004/03/07 07:51:26 1.12 +++ np2/lio/gscreen.c 2005/02/07 14:46:12 1.14 @@ -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; @@ -67,7 +67,7 @@ REG8 lio_ginit(GLIO lio) { STOREINTELWORD(lio->work.viewy2, 399); lio->palmode = 0; MEML_WRITESTR(CPU_DS, 0x0620, &lio->work, sizeof(lio->work)); - i286_membyte_write(CPU_DS, 0x0a08, lio->palmode); + MEML_WRITE8(CPU_DS, 0x0a08, lio->palmode); return(LIO_SUCCESS); } @@ -271,7 +271,7 @@ REG8 lio_gcolor1(GLIO lio) { lio->palmode = dat.palmode; } MEML_WRITESTR(CPU_DS, 0x0620, &lio->work, sizeof(lio->work)); - i286_membyte_write(CPU_DS, 0x0a08, lio->palmode); + MEML_WRITE8(CPU_DS, 0x0a08, lio->palmode); return(LIO_SUCCESS); gcolor1_err5: