--- np2/io/gdc.c 2004/02/29 00:57:06 1.24 +++ np2/io/gdc.c 2004/03/21 11:47:20 1.30 @@ -9,8 +9,9 @@ #include "palettes.h" #include "timing.h" - +#if !defined(CPUCORE_IA32) #define SEARCH_SYNC +#endif #define TURE_SYNC typedef struct { @@ -44,8 +45,9 @@ static const UINT8 defsyncs31[8] = {0x06 static const UINT8 defdegpal[4] = {0x04,0x15,0x26,0x37}; - - +static const UINT16 defanapal[16] = { + 0x000,0x007,0x070,0x077,0x700,0x707,0x770,0x777, + 0x444,0x00f,0x0f0,0x0ff,0xf00,0xf0f,0xff0,0xfff}; void gdc_setdegitalpal(int color, REG8 value) { @@ -70,6 +72,14 @@ void gdc_setdegitalpal(int color, REG8 v } } +void gdc_setdegpalpack(int color, REG8 value) { + + if ((gdc.degpal[color] ^ value) & 0x77) { + gdcs.palchange = GDCSCRN_REDRAW; + } + gdc.degpal[color] = (UINT8)value; +} + void gdc_setanalogpal(int color, int rgb, REG8 value) { UINT8 *ptr; @@ -95,14 +105,25 @@ void gdc_setanalogpal(int color, int rgb *ptr = value; } -void gdc_setdegpalpack(int color, REG8 value) { +void gdc_setanalogpalall(const UINT16 *paltbl) { - if ((gdc.degpal[color] ^ value) & 0x77) { - gdcs.palchange = GDCSCRN_REDRAW; + UINT c; + UINT pal; + + for (c=0; c<16; c++) { + pal = *paltbl++; +#if defined(SUPPORT_PC9821) + gdc.anareg[(c * 3) + 0] = (pal >> 8) & 15; + gdc.anareg[(c * 3) + 1] = (pal >> 4) & 15; + gdc.anareg[(c * 3) + 2] = (pal >> 0) & 15; +#endif + gdc_setanalogpal(c, offsetof(RGB32, p.g), (pal >> 8) & 15); + gdc_setanalogpal(c, offsetof(RGB32, p.r), (pal >> 4) & 15); + gdc_setanalogpal(c, offsetof(RGB32, p.b), (pal >> 0) & 15); } - gdc.degpal[color] = (UINT8)value; } + void gdc_paletteinit(void) { int c; @@ -122,6 +143,23 @@ void gdc_paletteinit(void) { gdcs.palchange = GDCSCRN_REDRAW; } +#if defined(SUPPORT_PC9821) +void gdc_analogext(BOOL extend) { + + if (extend) { + gdc.analog |= (1 << GDCANALOG_256); + vramop.operate |= 0x20; + } + else { + gdc.analog &= ~(1 << (GDCANALOG_256)); + vramop.operate &= ~0x20; + } + gdcs.palchange = GDCSCRN_REDRAW; + gdcs.grphdisp |= GDCSCRN_EXT | GDCSCRN_ALLDRAW2; + i286_vram_dispatch(vramop.operate); +} +#endif + // -------------------------------------------------------------------------- @@ -460,8 +498,8 @@ static void IOOUTCALL gdc_o6a(UINT port, switch(bit) { case 0: if (gdc.display & (1 << GDCDISP_ANALOG)) { - gdc.analog &= ~1; - gdc.analog |= dat; + gdc.analog &= ~(1 << GDCANALOG_16); + gdc.analog |= (dat << GDCANALOG_16); gdcs.palchange = GDCSCRN_REDRAW; vramop.operate &= VOP_ANALOGMASK; vramop.operate |= dat << 4; @@ -481,6 +519,27 @@ static void IOOUTCALL gdc_o6a(UINT port, } else { switch(dat) { +#if defined(SUPPORT_PC9821) + case 0x20: + if (gdc.mode2 & 0x08) { + gdc_analogext(FALSE); + } + break; + + case 0x21: + if (gdc.mode2 & 0x08) { + gdc_analogext(TRUE); + } + break; + + case 0x68: + gdc.analog &= ~(1 << GDCANALOG_256E); + break; + + case 0x69: + gdc.analog |= (1 << GDCANALOG_256E); + break; +#endif case 0x40: case 0x80: // EPSON? gdc.display &= ~(1 << GDCDISP_PLAZMA); @@ -557,18 +616,21 @@ static REG8 IOINPCALL gdc_i60(UINT port) else { gdc_work(GDCWORK_MASTER); } -#ifdef SEARCH_SYNC +#ifdef SEARCH_SYNC // ToDo: フェッチキューを参照するように… if ((CPU_INPADRS) && (CPU_REMCLOCK >= 5)) { - UINT16 jadr = 0xfa74; + UINT32 addr; + UINT16 jadr; UINT16 memv; - memv = i286_memoryread_w(CPU_INPADRS); + addr = CPU_INPADRS; + jadr = 0xfa74; + memv = i286_memoryread_w(addr); while((memv == 0x00eb) || (memv == 0x5fe6)) { jadr -= 0x200; - CPU_INPADRS += 2; - memv = i286_memoryread_w(CPU_INPADRS); + addr += 2; + memv = i286_memoryread_w(addr); } if ((memv == 0x20a8) || (memv == 0x2024)) { - memv = i286_memoryread_w(CPU_INPADRS + 2); + memv = i286_memoryread_w(addr + 2); if (memv == jadr) { // je if (!gdc.vsync) { CPU_REMCLOCK = -1; @@ -684,16 +746,19 @@ static REG8 IOINPCALL gdc_ia0(UINT port) } #ifdef SEARCH_SYNC if ((CPU_INPADRS) && (CPU_REMCLOCK >= 5)) { - UINT16 jadr = 0xfa74; + UINT32 addr; + UINT16 jadr; UINT16 memv; - memv = i286_memoryread_w(CPU_INPADRS); + addr = CPU_INPADRS; + jadr = 0xfa74; + memv = i286_memoryread_w(addr); while((memv == 0x00eb) || (memv == 0x5fe6)) { jadr -= 0x200; - CPU_INPADRS += 2; - memv = i286_memoryread_w(CPU_INPADRS); + addr += 2; + memv = i286_memoryread_w(addr); } if ((memv == 0x20a8) || (memv == 0x2024)) { - memv = i286_memoryread_w(CPU_INPADRS + 2); + memv = i286_memoryread_w(addr + 2); if (memv == jadr) { // je if (!gdc.vsync) { CPU_REMCLOCK = -1; @@ -743,7 +808,7 @@ static REG8 IOINPCALL gdc_ia6(UINT port) static void IOOUTCALL gdc_oa8(UINT port, REG8 dat) { - if (gdc.analog) { + if (gdc.analog & ((1 << GDCANALOG_256) + (1 << GDCANALOG_16))) { gdc.palnum = dat; } else { @@ -754,7 +819,17 @@ static void IOOUTCALL gdc_oa8(UINT port, static void IOOUTCALL gdc_oaa(UINT port, REG8 dat) { - if (gdc.analog) { +#if defined(SUPPORT_PC9821) + if (gdc.analog & (1 << GDCANALOG_256)) { + gdcs.palchange = GDCSCRN_REDRAW; + gdc.anareg[(16 * 3) + (gdc.palnum * 4) + 0] = dat; + } + else +#endif + if (gdc.analog & (1 << GDCANALOG_16)) { +#if defined(SUPPORT_PC9821) + gdc.anareg[(gdc.palnum * 3) + 0] = dat; +#endif gdc_setanalogpal(gdc.palnum & 15, offsetof(RGB32, p.g), dat); } else { @@ -765,7 +840,17 @@ static void IOOUTCALL gdc_oaa(UINT port, static void IOOUTCALL gdc_oac(UINT port, REG8 dat) { - if (gdc.analog) { +#if defined(SUPPORT_PC9821) + if (gdc.analog & (1 << GDCANALOG_256)) { + gdcs.palchange = GDCSCRN_REDRAW; + gdc.anareg[(16 * 3) + (gdc.palnum * 4) + 1] = dat; + } + else +#endif + if (gdc.analog & (1 << GDCANALOG_16)) { +#if defined(SUPPORT_PC9821) + gdc.anareg[(gdc.palnum * 3) + 1] = dat; +#endif gdc_setanalogpal(gdc.palnum & 15, offsetof(RGB32, p.r), dat); } else { @@ -776,7 +861,17 @@ static void IOOUTCALL gdc_oac(UINT port, static void IOOUTCALL gdc_oae(UINT port, REG8 dat) { - if (gdc.analog) { +#if defined(SUPPORT_PC9821) + if (gdc.analog & (1 << GDCANALOG_256)) { + gdcs.palchange = GDCSCRN_REDRAW; + gdc.anareg[(16 * 3) + (gdc.palnum * 4) + 2] = dat; + } + else +#endif + if (gdc.analog & (1 << GDCANALOG_16)) { +#if defined(SUPPORT_PC9821) + gdc.anareg[(gdc.palnum * 3) + 2] = dat; +#endif gdc_setanalogpal(gdc.palnum & 15, offsetof(RGB32, p.b), dat); } else { @@ -785,9 +880,70 @@ static void IOOUTCALL gdc_oae(UINT port, (void)port; } +#if defined(SUPPORT_PC9821) +static REG8 IOINPCALL gdc_ia8(UINT port) { + + if (gdc.analog & ((1 << GDCANALOG_256) + (1 << GDCANALOG_16))) { + return(gdc.palnum); + } + (void)port; + return(gdc.degpal[3]); +} + +static REG8 IOINPCALL gdc_iaa(UINT port) { + + if (gdc.analog & (1 << GDCANALOG_256)) { + return(gdc.anareg[(16 * 3) + (gdc.palnum * 4) + 0]); + } + if (gdc.analog & (1 << GDCANALOG_16)) { + return(gdc.anareg[(gdc.palnum * 3) + 0]); + } + (void)port; + return(gdc.degpal[1]); +} + +static REG8 IOINPCALL gdc_iac(UINT port) { + + if (gdc.analog & (1 << GDCANALOG_256)) { + return(gdc.anareg[(16 * 3) + (gdc.palnum * 4) + 1]); + } + if (gdc.analog & (1 << GDCANALOG_16)) { + return(gdc.anareg[(gdc.palnum * 3) + 1]); + } + (void)port; + return(gdc.degpal[2]); +} + +static REG8 IOINPCALL gdc_iae(UINT port) { + + if (gdc.analog & (1 << GDCANALOG_256)) { + return(gdc.anareg[(16 * 3) + (gdc.palnum * 4) + 2]); + } + if (gdc.analog & (1 << GDCANALOG_16)) { + return(gdc.anareg[(gdc.palnum * 3) + 2]); + } + (void)port; + return(gdc.degpal[0]); +} +#endif + // ---- extend +#if defined(SUPPORT_PC9821) +static void IOOUTCALL gdc_o9a0(UINT port, REG8 dat) { + + (void)port; + (void)dat; +} + +static REG8 IOINPCALL gdc_i9a0(UINT port) { + + (void)port; + return(0); +} +#endif + #if defined(SUPPORT_CRT31KHZ) static void IOOUTCALL gdc_o9a8(UINT port, REG8 dat) { @@ -820,15 +976,24 @@ static const IOINP gdci60[8] = { gdc_i60, gdc_i62, NULL, NULL, gdc_i68, gdc_i6a, NULL, NULL}; +#if defined(SUPPORT_PC9821) +static const IOINP gdcia0[8] = { + gdc_ia0, gdc_ia2, gdc_ia4, gdc_ia6, + gdc_ia8, gdc_iaa, gdc_iac, gdc_iae}; +#else static const IOINP gdcia0[8] = { gdc_ia0, gdc_ia2, gdc_ia4, gdc_ia6, NULL, NULL, NULL, NULL}; +#endif -void gdc_reset(void) { +void gdc_biosreset(void) { - ZeroMemory(&gdc, sizeof(gdc)); - ZeroMemory(&gdcs, sizeof(gdcs)); +#if defined(SUPPORT_PC9821) + UINT i, j; + UINT8 tmp; + UINT8 *pal; +#endif if (!(np2cfg.dipsw[0] & 0x01)) { gdc.mode1 = 0x98; @@ -848,6 +1013,9 @@ void gdc_reset(void) { CopyMemory(gdc.m.para + GDC_SYNC, defsyncm15, 8); CopyMemory(gdc.s.para + GDC_SYNC, defsyncs15, 8); } + if (np2cfg.dipsw[0] & 0x80) { + gdc.s.para[GDC_SYNC] = 0x16; + } gdc_vectreset(&gdc.m); gdc_vectreset(&gdc.s); @@ -855,25 +1023,74 @@ void gdc_reset(void) { gdc.m.para[GDC_PITCH] = 80; gdc.s.para[GDC_PITCH] = 40; - gdc_paletteinit(); + gdc.bitac = 0xff; - if (np2cfg.color16 & 1) { - gdc.s.para[GDC_SYNC] = 0x16; - gdc.display = (1 << GDCDISP_ANALOG); + // vram bank + gdcs.disp = 0; + gdcs.access = 0; + gdc.analog &= ~(1 << GDCANALOG_16); + gdcs.palchange = GDCSCRN_REDRAW; + vramop.operate &= VOP_ACCESSMASK; + vramop.operate &= VOP_EGCMASK; + vramop.operate &= VOP_ANALOGMASK; +#if defined(SUPPORT_PC9821) + gdc.analog &= ~(1 << (GDCANALOG_256)); + vramop.operate &= ~0x20; +#endif + i286_vram_dispatch(vramop.operate); + + // palette + CopyMemory(gdc.degpal, defdegpal, 4); + if (gdc.display & (1 << GDCDISP_ANALOG)) { + gdc_setanalogpalall(defanapal); } - gdc.bitac = 0xff; +#if defined(SUPPORT_PC9821) + pal = gdc.anareg + (16 * 3); + for (i=0; i<256; i+=8) { + tmp = (UINT8)((i)?(i - 4):0); + pal[0] = tmp; + pal[1] = tmp; + pal[2] = tmp; + pal += 4; + for (j=1; j<8; j++) { + pal[0] = (UINT8)((i + 7) * ((j >> 2) & 1)); + pal[1] = (UINT8)((i + 7) * ((j >> 1) & 1)); + pal[2] = (UINT8)((i + 7) * ((j >> 0) & 1)); + pal += 4; + } + } +#endif + gdcs.textdisp = GDCSCRN_ALLDRAW2 | GDCSCRN_EXT; + gdcs.grphdisp = GDCSCRN_ALLDRAW2 | GDCSCRN_EXT; + gdcs.palchange = GDCSCRN_REDRAW; + screenupdate |= 2; +} +void gdc_reset(void) { + + ZeroMemory(&gdc, sizeof(gdc)); + ZeroMemory(&gdcs, sizeof(gdcs)); + +#if defined(SUPPORT_PC9821) + gdc.display |= (1 << GDCDISP_ANALOG); +#else + if (np2cfg.color16 & 1) { + gdc.display |= (1 << GDCDISP_ANALOG); + } +#endif if (!(np2cfg.dipsw[0] & 0x04)) { // dipsw1-3 on gdc.display |= (1 << GDCDISP_PLAZMA2); } - - gdcs.textdisp = GDCSCRN_ENABLE | GDCSCRN_ALLDRAW2 | GDCSCRN_EXT; - gdcs.grphdisp = GDCSCRN_ALLDRAW2 | GDCSCRN_EXT; + gdc_biosreset(); } void gdc_bind(void) { gdc_updateclock(); +#if defined(SUPPORT_PC9821) // とりあえずフックだけ + iocore_attachout(0x09a0, gdc_o9a0); + iocore_attachinp(0x09a0, gdc_i9a0); +#endif #if defined(SUPPORT_CRT31KHZ) iocore_attachout(0x09a8, gdc_o9a8); iocore_attachinp(0x09a8, gdc_i9a8);