xmil/io/crtc.c - diff

Return to crtc.c CVS log

Up to [RetroPC.NET] / xmil / io

Diff for /xmil/io/crtc.c between versions 1.17 and 1.18

version 1.17, 2004/08/17 14:46:37	version 1.18, 2004/08/18 08:08:13
Line 45 static const GDCCLK gdcclk[] = {	Line 45 static const GDCCLK gdcclk[] = {
{14318180 / 8, 112 - 8, 112 + 8, 200, 300},	{14318180 / 8, 112 - 8, 112 + 8, 200, 300},
{21052600 / 8, 108 - 6, 108 + 6, 400, 575}};	{21052600 / 8, 108 - 6, 108 + 6, 400, 575}};

enum {
CRTCUPD_CLOCK = 0x01,
CRTCUPD_TIMING = 0x02,
CRTCUPD_POS = 0x04
};

	static void crtc_bankupdate(void) {

static void crtc_clkupdate(void) {	if (!(crtc.s.SCRN_BITS & SCRN_ACCESSVRAM)) {
	crtc.e.gram = gram + GRAM_BANK0;
UINT clksync;	crtc.e.updatebit = UPDATE_VRAM0;
const GDCCLK *clk;
UINT h;
UINT fonty;
UINT v;

clksync = (crtc.s.SCRN_BITS & SCRN_24KHZ);
clk = gdcclk + clksync;
h = crtc.s.reg[CRTCREG_HSIZE] + 1;
if (crtc.s.width40) {
h = h * 2;
}
if (h < clk->minx) {
h = clk->minx;
}
else if (h > clk->maxx) {
h = clk->maxx;
}
crtc.e.rasterclock8 = (4000000 * h) / (clk->clock >> 8);

fonty = crtc.s.reg[CRTCREG_CHRCY] & 0x1f;
fonty >>= clksync;
fonty += 1;
crtc.e.fonty = fonty;

v = (crtc.s.reg[CRTCREG_CHRCY] & 0x1f) + 1;
v = v * ((crtc.s.reg[CRTCREG_VSIZE] & 0x7f) + 1);
v = v + (crtc.s.reg[CRTCREG_VSIZEA] & 0x1f);
if (v < clk->miny) {
v = clk->miny;
}	}
else if (v > clk->maxy) {	else {
v = clk->maxy;	crtc.e.gram = gram + GRAM_BANK1;
	crtc.e.updatebit = UPDATE_VRAM1;
}	}
crtc.e.frameclock = ((4000000 * h) / clk->clock) * v;
}	}

static void crtc_timingupdate(void) {	static void crtc_dispupdate(void) {

UINT32 fontclock;
UINT yl;

// とりあえず…ね
crtc.e.rasterdisp8 = (crtc.e.rasterclock8 * 40) / 56;

fontclock = (crtc.s.reg[CRTCREG_CHRCY] & 0x1f) + 1;
fontclock = (fontclock * crtc.e.rasterclock8) >> 8;

// YsIIIが yl==0で disp信号見る…なんで？
yl = (crtc.s.reg[CRTCREG_VDISP] & 0x7f);
crtc.e.yl = yl;
crtc.e.dispclock = fontclock * max(yl, 1);
crtc.e.vsyncstart = fontclock * ((crtc.s.reg[CRTCREG_VSYNC] & 0x7f) + 1);
crtc.e.vpulseclock = ((crtc.s.reg[CRTCREG_PULSE] >> 4)
* crtc.e.rasterclock8) >> 8;

crtc.e.pos = crtc.s.reg[CRTCREG_POSL]
+ ((crtc.s.reg[CRTCREG_POSH] & 7) << 8);
}

static void crtc_bankupdate(void) {

	REG8 scrnpage;
	REG8 dispmode;
#if defined(SUPPORT_TURBOZ)	#if defined(SUPPORT_TURBOZ)
UINT updatemask;	UINT updatemask;
UINT8 dispmode;	REG8 pal_bank;
UINT8 pal_bank;	REG8 pal_disp;
UINT8 pal_disp;
#endif	#endif

if (crtc.s.SCRN_BITS & 0x10) {	scrnpage = (crtc.s.SCRN_BITS & SCRN_DISPVRAM)?SCRN_BANK1:SCRN_BANK0;
crtc.e.gram = gram + GRAM_BANK1;	if (!crtc.s.width40) {
crtc.e.updatebit = UPDATE_VRAM1;	scrnpage += SCRN_WIDTH80;
}
else {
crtc.e.gram = gram + GRAM_BANK0;
crtc.e.updatebit = UPDATE_VRAM0;
}	}
	dispmode = scrnpage;
	dispmode += (crtc.s.SCRN_BITS & SCRN_UNDERLINE) >> 4;
	dispmode += (crtc.s.SCRN_BITS & 7);

#if !defined(SUPPORT_TURBOZ)	#if !defined(SUPPORT_TURBOZ)
crtc.e.updatemask = (crtc.s.SCRN_BITS & SCRN_TEXTYx2)?0x3ff:0x7ff;	crtc.e.updatemask = (crtc.s.SCRN_BITS & SCRN_TEXTYx2)?0x3ff:0x7ff;
crtc.e.dispmode =	crtc.e.dispmode = dispmode;
(crtc.s.SCRN_BITS & SCRN_DISPVRAM)?SCRN_BANK1:SCRN_BANK0;
#else	#else
dispmode = (crtc.s.SCRN_BITS & SCRN_DISPVRAM)?SCRN_BANK1:SCRN_BANK0;
pal_bank = PAL_NORMAL;	pal_bank = PAL_NORMAL;
pal_disp = PAL_NORMAL;	pal_disp = PAL_NORMAL;
if ((!(crtc.s.EXTPALMODE & 0x80)) \|\| (crtc.s.SCRN_BITS & SCRN_UNDERLINE)) {	if ((!(crtc.s.EXTPALMODE & 0x80)) \|\| (crtc.s.SCRN_BITS & SCRN_UNDERLINE)) {
Line 156 static void crtc_bankupdate(void) {	Line 98 static void crtc_bankupdate(void) {
if (crtc.s.SCRN_BITS & SCRN_24KHZ) {	if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
if (crtc.s.width40) {	if (crtc.s.width40) {
if (crtc.s.SCRN_BITS & SCRN_200LINE) { // width 40,25,0,2	if (crtc.s.SCRN_BITS & SCRN_200LINE) { // width 40,25,0,2
dispmode \|= SCRN64_320x200;	dispmode = scrnpage + SCRN64_320x200;
}	}
else { // width 40,25,1,2	else { // width 40,25,1,2
dispmode = SCRN64_H320x400;	dispmode = SCRN64_H320x400;
Line 164 static void crtc_bankupdate(void) {	Line 106 static void crtc_bankupdate(void) {
}	}
else { // width 80,25,?,2	else { // width 80,25,?,2
updatemask = 0x7ff;	updatemask = 0x7ff;
pal_bank = pal_disp = PAL_HIGHRESO;	pal_bank = PAL_HIGHRESO;
	pal_disp = PAL_HIGHRESO;
}	}
}	}
else {	else {
if (crtc.s.width40) { // width 40,25,0,1	if (crtc.s.width40) { // width 40,25,0,1
if (crtc.s.EXTPALMODE & 0x10) {	if (crtc.s.EXTPALMODE & 0x10) {
if (crtc.s.ZPRY & 0x10) {	if (crtc.s.ZPRY & 0x10) {
dispmode = SCRN64_L320x200x2 \|	dispmode = SCRN64_L320x200x2 +
((crtc.s.ZPRY & 8) ? SCRN_BANK1 : SCRN_BANK0);	((crtc.s.ZPRY & 8)?SCRN_BANK1:SCRN_BANK0);
pal_disp = PAL_4096 \| PAL_64x2 \|	pal_disp = PAL_4096 + PAL_64x2 +
((crtc.s.ZPRY & 8) ? PAL_4096L : PAL_4096H);	((crtc.s.ZPRY & 8)?PAL_4096L:PAL_4096H);
}	}
else {	else {
dispmode \|= SCRN64_320x200;	dispmode = scrnpage + SCRN64_320x200;
pal_disp = PAL_4096 \|	pal_disp = PAL_4096 +
((crtc.s.SCRN_BITS & SCRN_DISPVRAM)	((crtc.s.SCRN_BITS & SCRN_DISPVRAM)
? PAL_4096L : PAL_4096H);	?PAL_4096L:PAL_4096H);
}	}
pal_bank = PAL_4096 \|	pal_bank = PAL_4096 +
((crtc.s.SCRN_BITS & SCRN_ACCESSVRAM)	((crtc.s.SCRN_BITS & SCRN_ACCESSVRAM)
? PAL_4096L : PAL_4096H);	?PAL_4096L:PAL_4096H);
}	}
else {	else {
dispmode = SCRN64_320x200x4096 \| SCRN_DRAW4096;	dispmode = SCRN_DRAW4096 + SCRN64_320x200x4096;
pal_bank = pal_disp = PAL_4096 \| PAL_4096FULL;	pal_bank = PAL_4096 + PAL_4096FULL;
	pal_disp = PAL_4096 + PAL_4096FULL;
}	}
}	}
else { // width 80,25,0,1	else { // width 80,25,0,1
updatemask = 0x7ff;	updatemask = 0x7ff;
dispmode = SCRN64_L640x200;	dispmode = SCRN_WIDTH80 + SCRN64_L640x200;
}	}
}	}
}	}
Line 201 static void crtc_bankupdate(void) {	Line 145 static void crtc_bankupdate(void) {
if (crtc.s.SCRN_BITS & SCRN_24KHZ) {	if (crtc.s.SCRN_BITS & SCRN_24KHZ) {
if (crtc.s.width40) {	if (crtc.s.width40) {
if (crtc.s.SCRN_BITS & SCRN_200LINE) { // width 40,12,0,2	if (crtc.s.SCRN_BITS & SCRN_200LINE) { // width 40,12,0,2
dispmode \|= SCRN64_320x100;	dispmode = scrnpage + SCRN64_320x100;
}	}
else { // width 40,12,1,2	else { // width 40,12,1,2
dispmode = SCRN64_H320x200;	dispmode = SCRN64_H320x200;
}	}
}	}
else { // width 80,12,?,2	else { // width 80,12,?,2
pal_bank = pal_disp = PAL_HIGHRESO;	pal_bank = PAL_HIGHRESO;
	pal_disp = PAL_HIGHRESO;
}	}
}	}
else {	else {
if (crtc.s.width40) { // width 40,12,0,1	if (crtc.s.width40) { // width 40,12,0,1
if (crtc.s.EXTPALMODE & 0x10) {	if (crtc.s.EXTPALMODE & 0x10) {
if (crtc.s.ZPRY & 0x10) {	if (crtc.s.ZPRY & 0x10) {
dispmode = SCRN64_320x100x2 \|	dispmode = SCRN64_320x100x2 +
((crtc.s.ZPRY & 8) ? SCRN_BANK1 : SCRN_BANK0);	((crtc.s.ZPRY & 8)?SCRN_BANK1:SCRN_BANK0);
pal_disp = PAL_4096 \| PAL_64x2 \|	pal_disp = PAL_4096 + PAL_64x2 +
((crtc.s.ZPRY & 8) ? PAL_4096L : PAL_4096H);	((crtc.s.ZPRY & 8)?PAL_4096L:PAL_4096H);
}	}
else {	else {
dispmode \|= SCRN64_320x100;	dispmode = scrnpage + SCRN64_320x100;
pal_disp = PAL_4096 \|	pal_disp = PAL_4096 +
((crtc.s.SCRN_BITS & SCRN_DISPVRAM)	((crtc.s.SCRN_BITS & SCRN_DISPVRAM)
? PAL_4096L : PAL_4096H);	?PAL_4096L:PAL_4096H);
}	}
pal_bank = PAL_4096 \|	pal_bank = PAL_4096 +
((crtc.s.SCRN_BITS & SCRN_ACCESSVRAM)	((crtc.s.SCRN_BITS & SCRN_ACCESSVRAM)
? PAL_4096L : PAL_4096H);	?PAL_4096L:PAL_4096H);
}	}
else {	else {
dispmode = SCRN64_320x100x4096 \| SCRN_DRAW4096;	dispmode = SCRN_DRAW4096 + SCRN64_320x100x4096;
pal_bank = pal_disp = PAL_4096 \| PAL_4096FULL;	pal_bank = PAL_4096 + PAL_4096FULL;
	pal_disp = PAL_4096 + PAL_4096FULL;
}	}
}	}
else { // width 80,12,0,1	else { // width 80,12,0,1
dispmode = SCRN64_L640x100;	dispmode = SCRN_WIDTH80 + SCRN64_L640x100;
}	}
}	}
}	}
Line 248 static void crtc_bankupdate(void) {	Line 194 static void crtc_bankupdate(void) {
#endif	#endif
}	}

	static void crtc_clkupdate(void) {

	UINT clksync;
	const GDCCLK *clk;
	UINT h;
	UINT fonty;
	UINT v;

	clksync = (crtc.s.SCRN_BITS & SCRN_24KHZ);
	clk = gdcclk + clksync;
	h = crtc.s.reg[CRTCREG_HSIZE] + 1;
	if (crtc.s.width40) {
	h = h * 2;
	}
	if (h < clk->minx) {
	h = clk->minx;
	}
	else if (h > clk->maxx) {
	h = clk->maxx;
	}
	crtc.e.rasterclock8 = (4000000 * h) / (clk->clock >> 8);

	fonty = crtc.s.reg[CRTCREG_CHRCY] & 0x1f;
	fonty >>= clksync;
	fonty += 1;
	crtc.e.fonty = fonty;

	v = (crtc.s.reg[CRTCREG_CHRCY] & 0x1f) + 1;
	v = v * ((crtc.s.reg[CRTCREG_VSIZE] & 0x7f) + 1);
	v = v + (crtc.s.reg[CRTCREG_VSIZEA] & 0x1f);
	if (v < clk->miny) {
	v = clk->miny;
	}
	else if (v > clk->maxy) {
	v = clk->maxy;
	}
	crtc.e.frameclock = ((4000000 * h) / clk->clock) * v;
	}

	static void crtc_timingupdate(void) {

	UINT32 fontclock;
	UINT yl;

	// とりあえず…ね
	crtc.e.rasterdisp8 = (crtc.e.rasterclock8 * 40) / 56;

	fontclock = (crtc.s.reg[CRTCREG_CHRCY] & 0x1f) + 1;
	fontclock = (fontclock * crtc.e.rasterclock8) >> 8;

	// YsIIIが yl==0で disp信号見る…なんで？
	yl = (crtc.s.reg[CRTCREG_VDISP] & 0x7f);
	crtc.e.yl = yl;
	crtc.e.dispclock = fontclock * max(yl, 1);
	crtc.e.vsyncstart = fontclock * ((crtc.s.reg[CRTCREG_VSYNC] & 0x7f) + 1);
	crtc.e.vpulseclock = ((crtc.s.reg[CRTCREG_PULSE] >> 4)
	* crtc.e.rasterclock8) >> 8;

	crtc.e.pos = crtc.s.reg[CRTCREG_POSL]
	+ ((crtc.s.reg[CRTCREG_POSH] & 7) << 8);
	}


// ---- CRTC	// ---- CRTC

Line 263 void IOOUTCALL crtc_o(UINT port, REG8 va	Line 271 void IOOUTCALL crtc_o(UINT port, REG8 va
crtc.s.reg[crtc.s.regnum] = value;	crtc.s.reg[crtc.s.regnum] = value;
crtc_clkupdate();	crtc_clkupdate();
crtc_timingupdate();	crtc_timingupdate();
crtc_bankupdate();
makescrn.remakeattr = 1;	makescrn.remakeattr = 1;
scrnallflash = 1;	scrnallflash = 1;
}	}
Line 280 void IOOUTCALL scrn_o(UINT port, REG8 va	Line 287 void IOOUTCALL scrn_o(UINT port, REG8 va

modify = crtc.s.SCRN_BITS ^ value;	modify = crtc.s.SCRN_BITS ^ value;
crtc.s.SCRN_BITS = value;	crtc.s.SCRN_BITS = value;
	if (modify & SCRN_ACCESSVRAM) {
	crtc_bankupdate();
	}
if (modify & SCRN_DISPCHANGE) {	if (modify & SCRN_DISPCHANGE) {
// pal_reset(); // なんで？	// pal_reset(); // なんで？
scrnallflash = 1;	scrnallflash = 1;
makescrn.palandply = 1;	crtc_dispupdate();
crtc_clkupdate();	crtc_clkupdate();
crtc_timingupdate();	crtc_timingupdate();
	makescrn.palandply = 1;
}	}
crtc_bankupdate();
(void)port;	(void)port;
}	}

Line 371 void IOOUTCALL palette_o(UINT port, REG8	Line 381 void IOOUTCALL palette_o(UINT port, REG8
else {	else {
num = ((port & 0x80) >> 5) \| ((port & 0x08) >> 2) \|	num = ((port & 0x80) >> 5) \| ((port & 0x08) >> 2) \|
((value & 0x80) >> 7);	((value & 0x80) >> 7);
if ((crtc.e.dispmode & SCRN64_MASK) == SCRN64_INVALID) {	if (crtc.e.dispmode & SCRN64_ENABLE) {
num \|= (num << 3);
}
else {
num += ((port & 0x40) >> 1) \| ((port & 0x04) << 2) \|	num += ((port & 0x40) >> 1) \| ((port & 0x04) << 2) \|
((value & 0x40) >> 3);	((value & 0x40) >> 3);
}	}
	else {
	num \|= (num << 3);
	}
pal = crtc.p.grph[crtc.e.pal_bank][num];	pal = crtc.p.grph[crtc.e.pal_bank][num];
pal &= ~((0x0f) << sft);	pal &= ~((0x0f) << sft);
pal \|= (value & 0x0f) << sft;	pal \|= (value & 0x0f) << sft;
Line 442 REG8 IOINPCALL palette_i(UINT port) {	Line 452 REG8 IOINPCALL palette_i(UINT port) {
else {	else {
num = ((port & 0x80) >> 5) \| ((port & 0x08) >> 2) \|	num = ((port & 0x80) >> 5) \| ((port & 0x08) >> 2) \|
((crtc.s.lastpal & 0x80) >> 7);	((crtc.s.lastpal & 0x80) >> 7);
if ((crtc.e.dispmode & SCRN64_MASK) == SCRN64_INVALID) {	if (crtc.e.dispmode & SCRN64_ENABLE) {
num \|= (num << 3);
}
else {
num += ((port & 0x40) >> 1) \| ((port & 0x04) << 2) \|	num += ((port & 0x40) >> 1) \| ((port & 0x04) << 2) \|
((crtc.s.lastpal & 0x40) >> 3);	((crtc.s.lastpal & 0x40) >> 3);
}	}
	else {
	num \|= (num << 3);
	}
pal = crtc.p.grph[crtc.e.pal_bank][num];	pal = crtc.p.grph[crtc.e.pal_bank][num];
}	}
sft = (port >> (8 - 2)) & (3 << 2);	sft = (port >> (8 - 2)) & (3 << 2);
Line 463 REG8 IOINPCALL palette_i(UINT port) {	Line 473 REG8 IOINPCALL palette_i(UINT port) {
void IOOUTCALL extpal_o(UINT port, REG8 value) {	void IOOUTCALL extpal_o(UINT port, REG8 value) {

crtc.s.EXTPALMODE = value;	crtc.s.EXTPALMODE = value;
crtc_bankupdate();	crtc_dispupdate();
(void)port;	(void)port;
}	}

Line 509 REG8 IOINPCALL exttextpal_i(UINT port) {	Line 519 REG8 IOINPCALL exttextpal_i(UINT port) {
void IOOUTCALL exttextdisp_o(UINT port, REG8 value) {	void IOOUTCALL exttextdisp_o(UINT port, REG8 value) {

crtc.s.ZPRY = value;	crtc.s.ZPRY = value;
crtc_bankupdate();	crtc_dispupdate();
(void)port;	(void)port;
}	}

Line 528 REG8 IOINPCALL exttextdisp_i(UINT port)	Line 538 REG8 IOINPCALL exttextdisp_i(UINT port)

void crtc_update(void) {	void crtc_update(void) {

	crtc_bankupdate();
	crtc_dispupdate();
crtc_clkupdate();	crtc_clkupdate();
crtc_timingupdate();	crtc_timingupdate();
crtc_bankupdate();
makescrn.palandply = 1;	makescrn.palandply = 1;
scrnallflash = 1;	scrnallflash = 1;
}	}
Line 590 void crtc_reset(void) {	Line 601 void crtc_reset(void) {
void crtc_forcesetwidth(REG8 width) {	void crtc_forcesetwidth(REG8 width) {

crtc.s.reg[CRTCREG_HDISP] = (UINT8)width;	crtc.s.reg[CRTCREG_HDISP] = (UINT8)width;
crtc_bankupdate();	crtc_dispupdate();
scrnallflash = 1;	scrnallflash = 1;
}	}

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.17
changed lines
	Added in v.1.18