--- np2/io/gdc.c 2004/02/26 08:44:32 1.23 +++ np2/io/gdc.c 2004/02/29 03:10:03 1.25 @@ -122,6 +122,24 @@ 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; + i286_vram_dispatch(vramop.operate); + } + 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 + // -------------------------------------------------------------------------- @@ -336,6 +354,12 @@ const GDCCLK *clk; y = lf + vfbs; // TRACEOUT(("h %d:%d / v %d:%d", cr, x, lf, y)); +#if defined(SUPPORT_CRT31KHZ) + if (gdc.display & (1 << GDCDISP_31)) { + clk = gdcclk + 2; + } + else +#endif if (!(gdc.crt15khz & 2)) { // 24.83¡Þ300Hz clk = gdcclk + 1; } @@ -381,7 +405,7 @@ void gdc_restorekacmode(void) { } -// ---- I/O +// ---- I/O master static void IOOUTCALL gdc_o60(UINT port, REG8 dat) { @@ -453,8 +477,9 @@ static void IOOUTCALL gdc_o6a(UINT port, gdc.mode2 ^= (1 << bit); switch(bit) { case 0: - if (gdc.display & 2) { - gdc.analog = dat; + if (gdc.display & (1 << GDCDISP_ANALOG)) { + gdc.analog &= ~(1 << GDCANALOG_16); + gdc.analog |= (dat << GDCANALOG_16); gdcs.palchange = GDCSCRN_REDRAW; vramop.operate &= VOP_ANALOGMASK; vramop.operate |= dat << 4; @@ -474,15 +499,36 @@ 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; + gdc.display &= ~(1 << GDCDISP_PLAZMA); gdcs.textdisp |= GDCSCRN_EXT; break; case 0x41: case 0x81: // EPSON? - gdc.display |= 1; + gdc.display |= (1 << GDCDISP_PLAZMA); gdcs.textdisp |= GDCSCRN_EXT; break; @@ -607,6 +653,8 @@ static REG8 IOINPCALL gdc_i6a(UINT port) } +// ---- I/O slave + static void IOOUTCALL gdc_oa0(UINT port, REG8 dat) { if (gdc.s.cnt < GDCCMD_MAX) { @@ -649,50 +697,6 @@ static void IOOUTCALL gdc_oa6(UINT port, (void)port; } -static void IOOUTCALL gdc_oa8(UINT port, REG8 dat) { - - if (gdc.analog) { - gdc.palnum = dat & 0x0f; - } - else { - gdc_setdegpalpack(3, dat); - } - (void)port; -} - -static void IOOUTCALL gdc_oaa(UINT port, REG8 dat) { - - if (gdc.analog) { - gdc_setanalogpal(gdc.palnum, offsetof(RGB32, p.g), dat); - } - else { - gdc_setdegpalpack(1, dat); - } - (void)port; -} - -static void IOOUTCALL gdc_oac(UINT port, REG8 dat) { - - if (gdc.analog) { - gdc_setanalogpal(gdc.palnum, offsetof(RGB32, p.r), dat); - } - else { - gdc_setdegpalpack(2, dat); - } - (void)port; -} - -static void IOOUTCALL gdc_oae(UINT port, REG8 dat) { - - if (gdc.analog) { - gdc_setanalogpal(gdc.palnum, offsetof(RGB32, p.b), dat); - } - else { - gdc_setdegpalpack(0, dat); - } - (void)port; -} - static REG8 IOINPCALL gdc_ia0(UINT port) { REG8 ret; @@ -774,6 +778,147 @@ static REG8 IOINPCALL gdc_ia6(UINT port) } +// ---- I/O palette + +static void IOOUTCALL gdc_oa8(UINT port, REG8 dat) { + + if (gdc.analog & ((1 << GDCANALOG_256) + (1 << GDCANALOG_16))) { + gdc.palnum = dat; + } + else { + gdc_setdegpalpack(3, dat); + } + (void)port; +} + +static void IOOUTCALL gdc_oaa(UINT port, REG8 dat) { + +#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) + 2] = dat; +#endif + gdc_setanalogpal(gdc.palnum & 15, offsetof(RGB32, p.g), dat); + } + else { + gdc_setdegpalpack(1, dat); + } + (void)port; +} + +static void IOOUTCALL gdc_oac(UINT port, REG8 dat) { + +#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) + 2] = dat; +#endif + gdc_setanalogpal(gdc.palnum & 15, offsetof(RGB32, p.r), dat); + } + else { + gdc_setdegpalpack(2, dat); + } + (void)port; +} + +static void IOOUTCALL gdc_oae(UINT port, REG8 dat) { + +#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)) { + gdc_setanalogpal(gdc.palnum & 15, offsetof(RGB32, p.b), dat); + } + else { + gdc_setdegpalpack(0, dat); + } + (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) + 2]); + } + (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) + 2]); + } + (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_CRT31KHZ) +static void IOOUTCALL gdc_o9a8(UINT port, REG8 dat) { + + if ((gdc.display ^ (dat << GDCDISP_31)) & (1 << GDCDISP_31)) { + gdc.display ^= (1 << GDCDISP_31); + gdcs.textdisp |= GDCSCRN_EXT; + } + (void)port; +} + +static REG8 IOINPCALL gdc_i9a8(UINT port) { + + (void)port; + return((gdc.display >> GDCDISP_31) & 1); +} +#endif + + // ---- I/F static const IOOUT gdco60[8] = { @@ -788,9 +933,16 @@ 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) { @@ -824,18 +976,27 @@ void gdc_reset(void) { gdc_paletteinit(); - gdcs.textdisp = GDCSCRN_ENABLE | GDCSCRN_ALLDRAW2 | GDCSCRN_EXT; - gdcs.grphdisp = GDCSCRN_ALLDRAW2 | GDCSCRN_EXT; if (np2cfg.color16 & 1) { gdc.s.para[GDC_SYNC] = 0x16; - gdc.display = 2; + gdc.display = (1 << GDCDISP_ANALOG); } gdc.bitac = 0xff; + + 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; } void gdc_bind(void) { gdc_updateclock(); +#if defined(SUPPORT_CRT31KHZ) + iocore_attachout(0x09a8, gdc_o9a8); + iocore_attachinp(0x09a8, gdc_i9a8); +#endif iocore_attachsysoutex(0x0060, 0x0cf1, gdco60, 8); iocore_attachsysinpex(0x0060, 0x0cf1, gdci60, 8); iocore_attachsysoutex(0x00a0, 0x0cf1, gdcoa0, 8);