--- xmil/io/ppi.c 2004/08/12 17:57:36 1.12 +++ xmil/io/ppi.c 2008/06/02 20:07:31 1.19 @@ -1,39 +1,49 @@ #include "compiler.h" +#include "z80core.h" #include "pccore.h" #include "iocore.h" -#include "makescrn.h" -// ---- 8255 PPI〜 +/* 8255 PPI〜 */ static REG8 getportb(void) { REG8 ret; - UINT v; - - ret = cmt_test(); // | cmt_read(); // THUNDER BALL + REG8 ppib; +#if defined(MAINFRAMES_OLD) + SINT32 clock; +#endif - v = pccore_getraster(NULL); - if (v < crtc.e.dl) { - ret |= 0x80; // 1:DISP - } +#if 0 if (subcpu.IBF) { subcpu.IBF = 0; - ret |= 0x40; // 1:SUB-CPU BUSY + ret |= 0x40; /* 1:SUB-CPU BUSY */ } if (subcpu.OBF) { - ret |= 0x20; // 1:SUB-CPU Data empty + ret |= 0x20; /* 1:SUB-CPU Data empty */ } - if (memio.ram) { - ret |= 0x10; // 1:RAM +#endif /* 0 */ + + ppib = iocore.s.ppib; + ret = ppib; + + /* ret |= cmt_test(); */ /* THUNDER BALL */ + + iocore.s.ppib = (UINT8)((ppib & (~0x40)) | 0x01); + + /* ret |= cmt_read(); */ + +#if defined(MAINFRAMES_OLD) + clock = CPU_CLOCKCOUNT - iocore.e.framestartclock; + if (clock < iocore.e.dispclock) { + ret |= 0x80; /* 1:DISP */ } -#if 1 - if (!(v < crtc.e.vs)) { - ret |= 0x04; // V-SYNC - } -#else // ラプラステスト…VYSNCが長すぎるらしい - if (v_cnt == crtc.e.vs) { - ret |= 0x04; + + /* 実機の動きを見ると どうも 読み込んだらリセットされるようだ? */ + /* 有効範囲が絞れるならそうすべき(VSYNCを取りこぼすソフトがある) */ + clock -= iocore.e.vsyncstart; + if ((clock >= 0) && (clock < iocore.e.vpulseclock)) { + ret |= 0x04; /* 1:V-SYNC */ } #endif return(ret); @@ -41,33 +51,22 @@ static REG8 getportb(void) { static void setportc(REG8 dat) { - REG8 oldc; - UINT8 xl; + REG8 modify; - oldc = ppi.portc; - if (crtc.s.TXT_XL == 40) { - oldc |= 0x40; - } - else { - oldc &= ~0x40; - } + modify = ppi.portc ^ dat; ppi.portc = dat; - -// cmt_write((REG8)(dat & 1)); - if ((oldc & 0x20) && (!(dat & 0x20))) { + /* cmt_write((REG8)(dat & 1)); */ + if ((modify & 0x20) && (!(dat & 0x20))) { iocore.s.mode = 1; + /* TRACEOUT(("iocore.s.mode = 1")); */ } - xl = ((dat & 0x40)?40:80); - if (crtc.s.TXT_XL != xl) { - crtc.s.TXT_XL = (UINT8)xl; -// crtc.s.GRP_XL = xl << 3; - crtc_bankupdate(); - scrnallflash = 1; + if (modify & 0x40) { + crtc_setwidth((REG8)(dat & 0x40)); } } -// ---- +/* ---- */ void IOOUTCALL ppi_o(UINT port, REG8 value) { @@ -108,9 +107,11 @@ REG8 IOINPCALL ppi_i(UINT port) { switch(port & 0x0f) { case 0: - // if (!(ppi.mode & 0x10)) { - // return(ppi.porta); - // } +#if 0 + if (!(ppi.mode & 0x10)) { + return(ppi.porta); + } +#endif /* 0 */ return(ppi.porta); case 1: @@ -120,14 +121,7 @@ REG8 IOINPCALL ppi_i(UINT port) { return(getportb()); case 2: -#if 1 - if (crtc.s.TXT_XL == 40) { - ppi.portc |= 0x40; - } - else { - ppi.portc &= ~0x40; - } -#endif + /* mode? */ return(ppi.portc); case 3: @@ -137,14 +131,14 @@ REG8 IOINPCALL ppi_i(UINT port) { } -// ---- +/* initialize & reset */ void ppi_initialize(void) { ppi.porta = 0x00; ppi.portb = 0xff; ppi.portc = 0xff; - ppi.mode = 0x9b; + ppi.mode = 0x82; } void ppi_reset(void) {