--- xmil/io/crtc.c 2004/08/05 04:53:15 1.2 +++ xmil/io/crtc.c 2004/08/08 15:14:08 1.6 @@ -3,17 +3,14 @@ #include "pccore.h" #include "iocore.h" #include "vram.h" -#include "draw.h" #include "palettes.h" +#include "makescrn.h" - BYTE crtc_TEXTPAL[8]; - WORD crtc_GRPHPAL[2][64]; - WORD crtc_PAL4096[4096]; - -static const UINT8 def_TEXTPAL[8] = { +static const UINT8 defpaltext[8] = { 0x00, 0x03, 0x0c, 0x0f, 0x30, 0x33, 0x3c, 0x3f}; -static const UINT16 def_GRPHPAL[64] = { + +static const UINT16 defpalgrph[64] = { 0x000, 0x00a, 0x0a0, 0x0aa, 0xa00, 0xa0a, 0xaa0, 0xaaa, 0x005, 0x00f, 0x0a5, 0x0af, 0xa05, 0xa0f, 0xaa5, 0xaaf, 0x050, 0x05a, 0x0f0, 0x0fa, 0xa50, 0xa5a, 0xaf0, 0xafa, @@ -23,13 +20,12 @@ static const UINT16 def_GRPHPAL[64] = { 0x550, 0x55a, 0x5f0, 0x5fa, 0xf50, 0xf5a, 0xff0, 0xffa, 0x555, 0x55f, 0x5f5, 0x5ff, 0xf55, 0xf5f, 0xff5, 0xfff}; - static const CRTCSTAT crtcdefault = { 0xaa, // PAL_B; 0xcc, // PAL_R; 0xf0, // PAL_G; 0x00, // PLY - {0, 1, 2, 3, 4, 5, 6, 7}, // TEXT_PAL[8] +// {0, 1, 2, 3, 4, 5, 6, 7}, // TEXT_PAL[8] 0, // SCRN_BITS 0, // CRTC_NUM @@ -41,8 +37,8 @@ static const CRTCSTAT crtcdefault = { 28, // TXT_YS 320, // GRP_XL 200, // GRP_YL - 0, // CPU_BANK - 0, // CRT_BANK +// 0, // CPU_BANK +// 0, // CRT_BANK 200, // CRT_YL 232, // CRT_VS @@ -184,7 +180,7 @@ void vrambank_patch(void) { crtc.e.updatemask = updatemask; } -void crtc_updt(void) { +static void crtc_updt(void) { if (crtc.s.SCRN_BITS & SCRN_24KHZ) { crtc.s.fnty = (crtc.s.FNT_YL >> 1) & 0xfffe; @@ -246,13 +242,13 @@ void IOOUTCALL crtc_o(UINT port, REG8 va case 0x0c: crtc.s.TXT_TOP &= 0xff; crtc.s.TXT_TOP |= (value & 7) << 8; - doubleatrchange = 1; + makescrn.remakeattr = 1; break; case 0x0d: crtc.s.TXT_TOP &= 0x7ff; crtc.s.TXT_TOP |= value; - doubleatrchange = 1; + makescrn.remakeattr = 1; break; default: @@ -275,15 +271,14 @@ void IOOUTCALL scrn_o(UINT port, REG8 va modify = crtc.s.SCRN_BITS ^ value; crtc.s.SCRN_BITS = value; if (modify & SCRN_DISPCHANGE) { - textdrawproc_renewal(); - reflesh_palette(); +// pal_reset(); // ¤Ê¤ó¤Ç¡© scrnallflash = 1; - palandply = 1; + makescrn.palandply = 1; crtc_updt(); } vrambank_patch(); - crtc.s.CPU_BANK = (BYTE)((crtc.s.SCRN_BITS & SCRN_ACCESSVRAM)?1:0); - crtc.s.CRT_BANK = (BYTE)((crtc.s.SCRN_BITS & SCRN_DISPVRAM)?1:0); +// crtc.s.CPU_BANK = (BYTE)((crtc.s.SCRN_BITS & SCRN_ACCESSVRAM)?1:0); +// crtc.s.CRT_BANK = (BYTE)((crtc.s.SCRN_BITS & SCRN_DISPVRAM)?1:0); (void)port; } @@ -300,7 +295,7 @@ void IOOUTCALL ply_o(UINT port, REG8 val if (crtc.s.PLY != value) { crtc.s.PLY = value; - palandply = 1; + makescrn.palandply = 1; } (void)port; } @@ -316,75 +311,51 @@ REG8 IOINPCALL ply_i(UINT port) { void IOOUTCALL palette_o(UINT port, REG8 value) { + REG8 sft; + UINT num; UINT pal; - BYTE c; crtc.s.lastpal = (value & 0xf0); if (crtc.s.EXTPALMODE & 0x80) { if ((crtc.s.EXTGRPHPAL & 0x88) != 0x80) { return; } + sft = (port >> (8 - 2)) & (3 << 2); if (pal_bank & PAL_4096) { // use 4096palettes switch(pal_bank & (PAL_4096FULL | PAL_4096BANK)) { case 0: - pal = ((port & 0xcc) << 4) + ((value & 0xc0) >> 4); + num = ((port & 0xcc) << 4) + ((value & 0xc0) >> 4); break; case 1: - pal = ((port & 0xcc) << 2) + ((value & 0xc0) >> 6); + num = ((port & 0xcc) << 2) + ((value & 0xc0) >> 6); break; default: - pal = ((port & 0xff) << 4) + (crtc.s.lastpal >> 4); - break; - } - value &= 0xf; - switch(port & 0xff00) { - case 0x1000: - crtc_PAL4096[pal] &= 0xff0; - crtc_PAL4096[pal] |= value; - break; - - case 0x1100: - crtc_PAL4096[pal] &= 0xf0f; - crtc_PAL4096[pal] |= (value << 4); - break; - - case 0x1200: - crtc_PAL4096[pal] &= 0x0ff; - crtc_PAL4096[pal] |= ((WORD)value << 8); + num = ((port & 0xff) << 4) + (crtc.s.lastpal >> 4); break; } - pal_setgrph4096(pal); + pal = crtc.p.grph4096[num]; + pal &= ~((0x0f) << sft); + pal |= (value & 0x0f) << sft; + crtc.p.grph4096[num] = pal; + pal_setgrph4096(num); } else { - c = ((port & 0x80) >> 5) | ((port & 0x08) >> 2) | + num = ((port & 0x80) >> 5) | ((port & 0x08) >> 2) | ((value & 0x80) >> 7); if ((dispmode & SCRN64_MASK) == SCRN64_INVALID) { - c |= (c << 3); + num |= (num << 3); } else { - c += ((port & 0x40) >> 1) | ((port & 0x04) << 2) | + num += ((port & 0x40) >> 1) | ((port & 0x04) << 2) | ((value & 0x40) >> 3); } - value &= 0xf; - switch(port & 0xff00) { - case 0x1000: - crtc_GRPHPAL[pal_bank][c] &= 0xff0; - crtc_GRPHPAL[pal_bank][c] |= value; - break; - - case 0x1100: - crtc_GRPHPAL[pal_bank][c] &= 0xf0f; - crtc_GRPHPAL[pal_bank][c] |= (value << 4); - break; - - case 0x1200: - crtc_GRPHPAL[pal_bank][c] &= 0x0ff; - crtc_GRPHPAL[pal_bank][c] |= ((WORD)value << 8); - break; - } - pal_setgrph(pal_bank, c); + pal = crtc.p.grph[pal_bank][num]; + pal &= ~((0x0f) << sft); + pal |= (value & 0x0f) << sft; + crtc.p.grph[pal_bank][num] = pal; + pal_setgrph(pal_bank, (REG8)num); } } else { @@ -392,21 +363,21 @@ void IOOUTCALL palette_o(UINT port, REG8 case 0x1000: if (crtc.s.PAL_B != value) { crtc.s.PAL_B = value; - palandply = 1; + makescrn.palandply = 1; } break; case 0x1100: if (crtc.s.PAL_R != value) { crtc.s.PAL_R = value; - palandply = 1; + makescrn.palandply = 1; } break; case 0x1200: if (crtc.s.PAL_G != value) { crtc.s.PAL_G = value; - palandply = 1; + makescrn.palandply = 1; } break; } @@ -415,58 +386,47 @@ void IOOUTCALL palette_o(UINT port, REG8 REG8 IOINPCALL palette_i(UINT port) { - UINT c; + UINT num; + UINT pal; + REG8 sft; if ((crtc.s.EXTPALMODE & 0x80) && ((crtc.s.EXTGRPHPAL & 0x88) == 0x88)) { if (pal_bank & PAL_4096) { // use 4096palettes switch(pal_bank & (PAL_4096FULL | PAL_4096BANK)) { case 0: - c = ((port & 0xcc) << 4) | ((crtc.s.lastpal & 0xc0) >> 4); + num = ((port & 0xcc) << 4) | + ((crtc.s.lastpal & 0xc0) >> 4); break; case 1: - c = ((port & 0xcc) << 2) | ((crtc.s.lastpal & 0xc0) >> 6); + num = ((port & 0xcc) << 2) | + ((crtc.s.lastpal & 0xc0) >> 6); break; default: - c = ((port & 0xff) << 4) | (crtc.s.lastpal >> 4); + num = ((port & 0xff) << 4) | (crtc.s.lastpal >> 4); break; } - switch(port & 0xff00) { - case 0x1000: - return(crtc.s.lastpal | (crtc_PAL4096[c] & 0xf)); - - case 0x1100: - return(crtc.s.lastpal | ((crtc_PAL4096[c] & 0xf0) >> 4)); - - case 0x1200: - return(crtc.s.lastpal | ((crtc_PAL4096[c] & 0xf00) >> 8)); - } + pal = crtc.p.grph4096[num]; } else { - c = ((port & 0x80) >> 5) | ((port & 0x08) >> 2) | + num = ((port & 0x80) >> 5) | ((port & 0x08) >> 2) | ((crtc.s.lastpal & 0x80) >> 7); if ((dispmode & SCRN64_MASK) == SCRN64_INVALID) { - c |= (c << 3); + num |= (num << 3); } else { - c += ((port & 0x40) >> 1) | ((port & 0x04) << 2) | + num += ((port & 0x40) >> 1) | ((port & 0x04) << 2) | ((crtc.s.lastpal & 0x40) >> 3); } - switch(port & 0xff00) { - case 0x1000: - return(crtc.s.lastpal | - (crtc_GRPHPAL[pal_bank][c] & 0xf)); - case 0x1100: - return(crtc.s.lastpal | - ((crtc_GRPHPAL[pal_bank][c] & 0xf0) >> 4)); - case 0x1200: - return(crtc.s.lastpal | - ((crtc_GRPHPAL[pal_bank][c] & 0xf00) >> 8)); - } + pal = crtc.p.grph[pal_bank][num]; } + sft = (port >> (8 - 2)) & (3 << 2); + return((REG8)(crtc.s.lastpal + ((pal >> sft) & 0xf))); + } + else { + return(0xff); } - return(0xff); } @@ -476,10 +436,12 @@ void IOOUTCALL extpal_o(UINT port, REG8 crtc.s.EXTPALMODE = value; vrambank_patch(); + (void)port; } REG8 IOINPCALL extpal_i(UINT port) { + (void)port; return(crtc.s.EXTPALMODE); } @@ -488,6 +450,7 @@ void IOOUTCALL extgrphpal_o(UINT port, R if (crtc.s.EXTPALMODE & 0x80) { crtc.s.EXTGRPHPAL = value; } + (void)port; } REG8 IOINPCALL extgrphpal_i(UINT port) { @@ -495,13 +458,14 @@ REG8 IOINPCALL extgrphpal_i(UINT port) { if (crtc.s.EXTPALMODE & 0x80) { return(crtc.s.EXTGRPHPAL); } + (void)port; return(0xff); } void IOOUTCALL exttextpal_o(UINT port, REG8 value) { if (crtc.s.EXTPALMODE & 0x80) { - crtc_TEXTPAL[port & 7] = value; + crtc.p.text[port & 7] = value; pal_settext((REG8)(port & 7)); } } @@ -509,7 +473,7 @@ void IOOUTCALL exttextpal_o(UINT port, R REG8 IOINPCALL exttextpal_i(UINT port) { if (crtc.s.EXTPALMODE & 0x80) { - return(crtc_TEXTPAL[port & 7]); + return(crtc.p.text[port & 7]); } return(0xff); } @@ -518,6 +482,7 @@ void IOOUTCALL exttextdisp_o(UINT port, crtc.s.ZPRY = value; vrambank_patch(); + (void)port; } REG8 IOINPCALL exttextdisp_i(UINT port) { @@ -525,17 +490,20 @@ REG8 IOINPCALL exttextdisp_i(UINT port) if (crtc.s.EXTPALMODE & 0x80) { return(crtc.s.ZPRY); } + (void)port; return(0xff); } void IOOUTCALL blackctrl_o(UINT port, REG8 value) { crtc.s.BLACKPAL = value; - palandply = 1; + makescrn.palandply = 1; + (void)port; } REG8 IOINPCALL blackctrl_i(UINT port) { + (void)port; return(crtc.s.BLACKPAL); } @@ -544,9 +512,9 @@ REG8 IOINPCALL blackctrl_i(UINT port) { static void resetpal(void) { - CopyMemory(crtc_TEXTPAL, def_TEXTPAL, 8); - CopyMemory(crtc_GRPHPAL[0], def_GRPHPAL, 64*2); - CopyMemory(crtc_GRPHPAL[1], def_GRPHPAL, 64*2); + CopyMemory(crtc.p.text, defpaltext, sizeof(defpaltext)); + CopyMemory(crtc.p.grph[0], defpalgrph, sizeof(defpalgrph)); + CopyMemory(crtc.p.grph[1], defpalgrph, sizeof(defpalgrph)); } void crtc_initialize(void) { @@ -555,7 +523,7 @@ void crtc_initialize(void) { resetpal(); for (p=0; p<4096; p++) { - crtc_PAL4096[p] = p; + crtc.p.grph4096[p] = p; } } @@ -563,7 +531,6 @@ void crtc_reset(void) { crtc.s = crtcdefault; - palandply = 1; dispmode = SCRN64_INVALID; pal_bank = pal_disp = PAL_NORMAL; if (pccore.ROM_TYPE < 3) { @@ -574,12 +541,11 @@ void crtc_reset(void) { crtc.s.FNT_YL = 16; } - textdrawproc_renewal(); - reflesh_palette(); + pal_reset(); crtc_updt(); vrambank_patch(); - palandply = 1; + makescrn.palandply = 1; scrnallflash = 1; }