--- np2/io/gdc.c 2004/02/09 20:39:39 1.14 +++ np2/io/gdc.c 2004/02/21 00:25:33 1.22 @@ -3,13 +3,14 @@ #include "cpucore.h" #include "pccore.h" #include "iocore.h" +#include "gdc_cmd.tbl" +#include "gdc_sub.h" #include "vram.h" #include "palettes.h" -#include "gdc_cmd.tbl" #include "timing.h" -#define SEARHC_SYNC +#define SEARCH_SYNC #define TURE_SYNC typedef struct { @@ -26,11 +27,10 @@ static const GDCCLK gdcclk[] = { {25056815 / 8, 106 - 6, 106 + 6, 400, 575}, {25175000 / 8, 100 - 4, 100 + 4, 400, 575}}; - static const UINT8 defdegpal[4] = {0x04,0x15,0x26,0x37}; static const UINT8 defsyncm15[8] = {0x10,0x4e,0x07,0x25,0x0d,0x0f,0xc8,0x94}; -static const UINT8 defsyncs15[8] = {0x06,0x26,0x03,0x11,0x86,0x0f,0xc8,0x84}; +static const UINT8 defsyncs15[8] = {0x06,0x26,0x03,0x11,0x86,0x0f,0xc8,0x94}; static const UINT8 defsyncm24[8] = {0x10,0x4e,0x07,0x25,0x07,0x07,0x90,0x65}; static const UINT8 defsyncs24[8] = {0x06,0x26,0x03,0x11,0x83,0x07,0x90,0x65}; @@ -113,38 +113,73 @@ void gdc_paletteinit(void) { // -------------------------------------------------------------------------- +void gdc_vectreset(GDCDATA item) { + + item->para[GDC_VECTW+1] = 0x00; + item->para[GDC_VECTW+2] = 0x00; + item->para[GDC_VECTW+3] = 0x08; + item->para[GDC_VECTW+4] = 0x00; + item->para[GDC_VECTW+5] = 0x08; + item->para[GDC_VECTW+6] = 0x00; + item->para[GDC_VECTW+7] = 0xff; + item->para[GDC_VECTW+8] = 0xff; + item->para[GDC_VECTW+9] = 0xff; + item->para[GDC_VECTW+10] = 0xff; +} + static void vectdraw(void) { - UINT32 csrw; - UINT16 textw; + UINT32 csrw; +const GDCVECT *vect; + REG16 textw; + REG8 ope; csrw = LOADINTELDWORD(gdc.s.para + GDC_CSRW); + vect = (GDCVECT *)(gdc.s.para + GDC_VECTW); textw = LOADINTELWORD(gdc.s.para + GDC_TEXTW); + ope = gdc.s.para[GDC_WRITE]; - if (gdc.s.para[GDC_VECTW] & 0x8) { - gdcsub_line(csrw, (GDCVECT *)(gdc.s.para + GDC_VECTW), - textw, gdc.s.para[GDC_WRITE]); - } - if (gdc.s.para[GDC_VECTW] & 0x20) { - gdcsub_circle(csrw, (GDCVECT *)(gdc.s.para + GDC_VECTW), - textw, gdc.s.para[GDC_WRITE]); - } - if (gdc.s.para[GDC_VECTW] & 0x40) { - gdcsub_box(csrw, (GDCVECT *)(gdc.s.para + GDC_VECTW), - textw, gdc.s.para[GDC_WRITE]); + if (vect->ope & 0x08) { + gdcsub_vectl(csrw, vect, textw, ope); + } + if (vect->ope & 0x10) { // undocumented + gdcsub_vectt(csrw, vect, textw, ope); + } + if (vect->ope & 0x20) { + gdcsub_vectc(csrw, vect, textw, ope); + } + if (vect->ope & 0x40) { + gdcsub_vectr(csrw, vect, textw, ope); } + gdc_vectreset(&gdc.s); } static void textdraw(void) { - UINT32 csrw; + UINT32 csrw; +const GDCVECT *vect; + REG16 textw; + REG8 ope; - if (gdc.s.para[GDC_VECTW] & 0x10) { - csrw = LOADINTELDWORD(gdc.s.para + GDC_CSRW); - gdcsub_text(csrw, (GDCVECT *)(gdc.s.para + GDC_VECTW), - gdc.s.para + GDC_TEXTW, - gdc.s.para[GDC_WRITE]); + csrw = LOADINTELDWORD(gdc.s.para + GDC_CSRW); + vect = (GDCVECT *)(gdc.s.para + GDC_VECTW); + textw = gdc.s.para[GDC_TEXTW + 7]; + textw = (textw << 8) + textw; + ope = gdc.s.para[GDC_WRITE]; + + if (vect->ope & 0x08) { // undocumented + gdcsub_vectl(csrw, vect, textw, ope); + } + if (vect->ope & 0x10) { + gdcsub_text(csrw, vect, gdc.s.para + GDC_TEXTW, ope); + } + if (vect->ope & 0x20) { // undocumented + gdcsub_vectc(csrw, vect, textw, ope); } + if (vect->ope & 0x40) { // undocumented + gdcsub_vectr(csrw, vect, textw, ope); + } + gdc_vectreset(&gdc.s); } void gdc_work(int id) { @@ -152,15 +187,15 @@ void gdc_work(int id) { GDCDATA item; UINT8 *dispflag; UINT i; - BYTE data; + UINT8 data; - item = (id==GDCWORK_MASTER)?&gdc.m:&gdc.s; - dispflag = (id==GDCWORK_MASTER)?&gdcs.textdisp:&gdcs.grphdisp; + item = (id == GDCWORK_MASTER)?&gdc.m:&gdc.s; + dispflag = (id == GDCWORK_MASTER)?&gdcs.textdisp:&gdcs.grphdisp; for (i=0; icnt; i++) { - data = (BYTE)item->fifo[i]; + data = (UINT8)item->fifo[i]; if (item->fifo[i] & 0xff00) { - item->cmd = data; // ver0.29 + item->cmd = data; item->paracb = 0; if ((data & 0x60) == 0x20) { item->para[GDC_WRITE] = data; @@ -189,7 +224,7 @@ void gdc_work(int id) { case CMD_START: case CMD_SYNC_ON: (*dispflag) |= GDCSCRN_ENABLE | GDCSCRN_ALLDRAW2; - screenupdate |= 2; // ver0.28 + screenupdate |= 2; break; case CMD_STOP_: @@ -197,7 +232,7 @@ void gdc_work(int id) { case CMD_SYNC_OFF: (*dispflag) &= (~GDCSCRN_ENABLE); // (*dispflag) |= GDCSCRN_ALLDRAW2; - screenupdate |= 2; // ver0.28 + screenupdate |= 2; break; case CMD_VECTE: @@ -206,12 +241,11 @@ void gdc_work(int id) { } break; - case CMD_TEXTE: // ver0.30 + case CMD_TEXTE: if (id != GDCWORK_MASTER) { textdraw(); } break; - } item->ptr = gdc_cmd[data].pos; item->rcv = gdc_cmd[data].outdatas; @@ -234,11 +268,11 @@ void gdc_work(int id) { (*dispflag) |= gdc_dirtyflag[id][item->ptr]; } (item->ptr)++; - (item->rcv)--; // ver0.29 + (item->rcv)--; if ((!(item->rcv)) && (id == GDCWORK_SLAVE) && (((item->cmd) & 0xe4) == 0x20)) { gdcsub_write(); - item->paracb = 0; // ver0.29 + item->paracb = 0; } } } @@ -246,8 +280,13 @@ void gdc_work(int id) { } // BIOSとかで弄った時にリセット -void gdc_forceready(GDCDATA item) { +void gdc_forceready(int id) { + GDCDATA item; + item = (id == GDCWORK_MASTER)?&gdc.m:&gdc.s; + if (item->cnt) { + gdc_work(id); + } item->rcv = 0; item->snd = 0; } @@ -360,7 +399,7 @@ static void IOOUTCALL gdc_o68(UINT port, REG8 bit; - if (!(dat & 0xf0)) { // ver0.28 + if (!(dat & 0xf0)) { bit = 1 << ((dat >> 1) & 7); if (dat & 1) { gdc.mode1 |= bit; @@ -371,7 +410,7 @@ static void IOOUTCALL gdc_o68(UINT port, if (bit & (0x01 | 0x04 | 0x10)) { gdcs.grphdisp |= GDCSCRN_ALLDRAW2; } - else if (bit == 0x02) { // ver0.28 + else if (bit == 0x02) { gdcs.grphdisp |= GDCSCRN_ALLDRAW2; gdcs.palchange = GDCSCRN_REDRAW; } @@ -499,7 +538,7 @@ static REG8 IOINPCALL gdc_i60(UINT port) else { gdc_work(GDCWORK_MASTER); } -#ifdef SEARHC_SYNC +#ifdef SEARCH_SYNC if ((CPU_INPADRS) && (CPU_REMCLOCK >= 5)) { UINT16 jadr = 0xfa74; UINT16 memv; @@ -561,8 +600,8 @@ static void IOOUTCALL gdc_oa0(UINT port, if (gdc.s.cnt < GDCCMD_MAX) { gdc.s.fifo[gdc.s.cnt++] = dat; } -// TRACEOUT(("GDC-B %.2x", dat)); - if (gdc.s.paracb) { // ver0.29 +// TRACEOUT(("GDC-B %.2x [%.4x:%.4x]", dat, CPU_CS, CPU_IP)); + if (gdc.s.paracb) { gdc_work(GDCWORK_SLAVE); } (void)port; @@ -665,9 +704,8 @@ static REG8 IOINPCALL gdc_ia0(UINT port) } else { gdc_work(GDCWORK_SLAVE); - TRACEOUT(("gdc.s.cnt=%d", gdc.s.cnt)); } -#ifdef SEARHC_SYNC +#ifdef SEARCH_SYNC if ((CPU_INPADRS) && (CPU_REMCLOCK >= 5)) { UINT16 jadr = 0xfa74; UINT16 memv; @@ -765,6 +803,8 @@ void gdc_reset(void) { CopyMemory(gdc.m.para + GDC_SYNC, defsyncm15, 8); CopyMemory(gdc.s.para + GDC_SYNC, defsyncs15, 8); } + gdc_vectreset(&gdc.m); + gdc_vectreset(&gdc.s); gdc.clock = 0; gdc.m.para[GDC_PITCH] = 80; @@ -779,13 +819,6 @@ void gdc_reset(void) { gdc.display = 2; } gdc.bitac = 0xff; - -#if 0 // bind で計算される筈 - gdc.rasterclock = pccore.realclock / 24816; - gdc.hsyncclock = (gdc.rasterclock * 4) / 5; - gdc.dispclock = pccore.realclock * 50 / 3102; - gdc.vsyncclock = pccore.realclock * 5 / 3102; -#endif } void gdc_bind(void) {