--- np2/io/gdc_pset.c 2004/02/05 11:34:43 1.5 +++ np2/io/gdc_pset.c 2004/02/20 15:20:30 1.7 @@ -8,6 +8,10 @@ static void MEMCALL _nop(GDCPSET pset, UINT addr, UINT bit) { + + (void)pset; + (void)addr; + (void)bit; } static void MEMCALL _replace0(GDCPSET pset, UINT addr, UINT bit) { @@ -93,7 +97,7 @@ static void MEMCALL withegc(GDCPSET pset } -static const GDCPSFN psettbl[4][2] = { +static const GDCPFN psettbl[4][2] = { {_replace0, _replace1}, {_nop, _complemnt}, {_nop, _clear}, @@ -110,7 +114,7 @@ void MEMCALL gdcpset_prepare(GDCPSET pse if (vramop.operate & VOP_EGCBIT) { pset->func[0] = _nop; pset->func[1] = withegc; - pset->base.addr = vramplaneseg[(csrw >> 14) & 3]; + pset->base.addr = gdcplaneseg[(csrw >> 14) & 3]; } else { base = mem; @@ -125,7 +129,7 @@ void MEMCALL gdcpset_prepare(GDCPSET pse if (!(grcg.gdcwithgrcg & 0x8)) { pset->func[0] = psettbl[op][0]; pset->func[1] = psettbl[op][1]; - pset->base.ptr = base + vramplaneseg[(csrw >> 14) & 3]; + pset->base.ptr = base + gdcplaneseg[(csrw >> 14) & 3]; } else { pset->func[0] = _nop; @@ -142,13 +146,15 @@ void MEMCALL gdcpset_prepare(GDCPSET pse pset->dots = 0; } -void MEMCALL gdcpset(GDCPSET pset, UINT16 x, UINT16 y) { +void MEMCALL gdcpset(GDCPSET pset, REG16 x, REG16 y) { UINT dot; dot = pset->pattern & 1; pset->pattern = (pset->pattern >> 1) + (dot << 15); pset->dots++; + x = LOW16(x); + y = LOW16(y); if (y > 409) { return; }