Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 17:30:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

niyanpai.c: blitter registers are 8-bit; fix m68000 regression (nw)

Browse Source
This commit is contained in:
Alex W. Jackson 2014-05-30 21:30:14 +00:00
parent a2cb0b3d7e
commit eb2484ec9d
3 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/mame/drivers/niyanpai.c
View File

@ -190,22 +190,22 @@ static ADDRESS_MAP_START( niyanpai_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x240000, 0x240009) AM_WRITENOP // unknown
AM_RANGE(0x240200, 0x2403ff) AM_WRITENOP // unknown
AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r)
AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w)
AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w)
AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r)
AM_RANGE(0x240600, 0x24061f) AM_WRITE(niyanpai_blitter_1_w)
AM_RANGE(0x240620, 0x24063f) AM_WRITE(niyanpai_clut_1_w)
AM_RANGE(0x240800, 0x240803) AM_READ(niyanpai_blitter_2_r)
AM_RANGE(0x240800, 0x24081f) AM_WRITE(niyanpai_blitter_2_w)
AM_RANGE(0x240820, 0x24083f) AM_WRITE(niyanpai_clut_2_w)
AM_RANGE(0x240400, 0x240403) AM_READ8(niyanpai_blitter_0_r, 0x00ff)
AM_RANGE(0x240400, 0x24041f) AM_WRITE8(niyanpai_blitter_0_w, 0x00ff)
AM_RANGE(0x240420, 0x24043f) AM_WRITE8(niyanpai_clut_0_w, 0x00ff)
AM_RANGE(0x240600, 0x240603) AM_READ8(niyanpai_blitter_1_r, 0x00ff)
AM_RANGE(0x240600, 0x24061f) AM_WRITE8(niyanpai_blitter_1_w, 0x00ff)
AM_RANGE(0x240620, 0x24063f) AM_WRITE8(niyanpai_clut_1_w, 0x00ff)
AM_RANGE(0x240800, 0x240803) AM_READ8(niyanpai_blitter_2_r, 0x00ff)
AM_RANGE(0x240800, 0x24081f) AM_WRITE8(niyanpai_blitter_2_w, 0x00ff)
AM_RANGE(0x240820, 0x24083f) AM_WRITE8(niyanpai_clut_2_w, 0x00ff)
AM_RANGE(0x280000, 0x280001) AM_READ(niyanpai_dipsw_r)
AM_RANGE(0x280200, 0x280201) AM_READ_PORT("P1_P2")
AM_RANGE(0x280400, 0x280401) AM_READ_PORT("SYSTEM")
AM_RANGE(0x240a00, 0x240a01) AM_WRITE(niyanpai_clutsel_0_w)
AM_RANGE(0x240c00, 0x240c01) AM_WRITE(niyanpai_clutsel_1_w)
AM_RANGE(0x240e00, 0x240e01) AM_WRITE(niyanpai_clutsel_2_w)
AM_RANGE(0x240a00, 0x240a01) AM_WRITE8(niyanpai_clutsel_0_w, 0x00ff)
AM_RANGE(0x240c00, 0x240c01) AM_WRITE8(niyanpai_clutsel_1_w, 0x00ff)
AM_RANGE(0x240e00, 0x240e01) AM_WRITE8(niyanpai_clutsel_2_w, 0x00ff)
AM_RANGE(0xfffc00, 0xffffff) AM_DEVREADWRITE("tmp68301", tmp68301_device, regs_r, regs_w) // TMP68301 Registers
ADDRESS_MAP_END
@ -226,20 +226,20 @@ static ADDRESS_MAP_START( musobana_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x240000, 0x240009) AM_WRITENOP // unknown
AM_RANGE(0x240200, 0x2403ff) AM_WRITENOP // unknown
AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r)
AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w)
AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w)
AM_RANGE(0x240400, 0x240403) AM_READ8(niyanpai_blitter_0_r, 0x00ff)
AM_RANGE(0x240400, 0x24041f) AM_WRITE8(niyanpai_blitter_0_w, 0x00ff)
AM_RANGE(0x240420, 0x24043f) AM_WRITE8(niyanpai_clut_0_w, 0x00ff)
AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r)
AM_RANGE(0x240600, 0x24061f) AM_WRITE(niyanpai_blitter_1_w)
AM_RANGE(0x240620, 0x24063f) AM_WRITE(niyanpai_clut_1_w)
AM_RANGE(0x240600, 0x240603) AM_READ8(niyanpai_blitter_1_r, 0x00ff)
AM_RANGE(0x240600, 0x24061f) AM_WRITE8(niyanpai_blitter_1_w, 0x00ff)
AM_RANGE(0x240620, 0x24063f) AM_WRITE8(niyanpai_clut_1_w, 0x00ff)
AM_RANGE(0x240800, 0x240803) AM_READ(niyanpai_blitter_2_r)
AM_RANGE(0x240800, 0x24081f) AM_WRITE(niyanpai_blitter_2_w)
AM_RANGE(0x240820, 0x24083f) AM_WRITE(niyanpai_clut_2_w)
AM_RANGE(0x240a00, 0x240a01) AM_WRITE(niyanpai_clutsel_0_w)
AM_RANGE(0x240c00, 0x240c01) AM_WRITE(niyanpai_clutsel_1_w)
AM_RANGE(0x240e00, 0x240e01) AM_WRITE(niyanpai_clutsel_2_w)
AM_RANGE(0x240800, 0x240803) AM_READ8(niyanpai_blitter_2_r, 0x00ff)
AM_RANGE(0x240800, 0x24081f) AM_WRITE8(niyanpai_blitter_2_w, 0x00ff)
AM_RANGE(0x240820, 0x24083f) AM_WRITE8(niyanpai_clut_2_w, 0x00ff)
AM_RANGE(0x240a00, 0x240a01) AM_WRITE8(niyanpai_clutsel_0_w, 0x00ff)
AM_RANGE(0x240c00, 0x240c01) AM_WRITE8(niyanpai_clutsel_1_w, 0x00ff)
AM_RANGE(0x240e00, 0x240e01) AM_WRITE8(niyanpai_clutsel_2_w, 0x00ff)
AM_RANGE(0x280000, 0x280001) AM_READ(niyanpai_dipsw_r)
AM_RANGE(0x280200, 0x280201) AM_READ(musobana_inputport_0_r)
@ -265,21 +265,21 @@ static ADDRESS_MAP_START( mhhonban_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x240000, 0x240009) AM_WRITENOP // unknown
AM_RANGE(0x240200, 0x2403ff) AM_WRITENOP // unknown
AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r)
AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w)
AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w)
AM_RANGE(0x240400, 0x240403) AM_READ8(niyanpai_blitter_0_r, 0x00ff)
AM_RANGE(0x240400, 0x24041f) AM_WRITE8(niyanpai_blitter_0_w, 0x00ff)
AM_RANGE(0x240420, 0x24043f) AM_WRITE8(niyanpai_clut_0_w, 0x00ff)
AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r)
AM_RANGE(0x240600, 0x24061f) AM_WRITE(niyanpai_blitter_1_w)
AM_RANGE(0x240620, 0x24063f) AM_WRITE(niyanpai_clut_1_w)
AM_RANGE(0x240600, 0x240603) AM_READ8(niyanpai_blitter_1_r, 0x00ff)
AM_RANGE(0x240600, 0x24061f) AM_WRITE8(niyanpai_blitter_1_w, 0x00ff)
AM_RANGE(0x240620, 0x24063f) AM_WRITE8(niyanpai_clut_1_w, 0x00ff)
AM_RANGE(0x240800, 0x240803) AM_READ(niyanpai_blitter_2_r)
AM_RANGE(0x240800, 0x24081f) AM_WRITE(niyanpai_blitter_2_w)
AM_RANGE(0x240820, 0x24083f) AM_WRITE(niyanpai_clut_2_w)
AM_RANGE(0x240800, 0x240803) AM_READ8(niyanpai_blitter_2_r, 0x00ff)
AM_RANGE(0x240800, 0x24081f) AM_WRITE8(niyanpai_blitter_2_w, 0x00ff)
AM_RANGE(0x240820, 0x24083f) AM_WRITE8(niyanpai_clut_2_w, 0x00ff)
AM_RANGE(0x240a00, 0x240a01) AM_WRITE(niyanpai_clutsel_0_w)
AM_RANGE(0x240c00, 0x240c01) AM_WRITE(niyanpai_clutsel_1_w)
AM_RANGE(0x240e00, 0x240e01) AM_WRITE(niyanpai_clutsel_2_w)
AM_RANGE(0x240a00, 0x240a01) AM_WRITE8(niyanpai_clutsel_0_w, 0x00ff)
AM_RANGE(0x240c00, 0x240c01) AM_WRITE8(niyanpai_clutsel_1_w, 0x00ff)
AM_RANGE(0x240e00, 0x240e01) AM_WRITE8(niyanpai_clutsel_2_w, 0x00ff)
AM_RANGE(0x280000, 0x280001) AM_READ(niyanpai_dipsw_r)
AM_RANGE(0x280200, 0x280201) AM_READ(musobana_inputport_0_r)
@ -304,21 +304,21 @@ static ADDRESS_MAP_START( zokumahj_map, AS_PROGRAM, 16, niyanpai_state )
AM_RANGE(0x240000, 0x240009) AM_WRITENOP // unknown
AM_RANGE(0x240200, 0x2403ff) AM_WRITENOP // unknown
AM_RANGE(0x240400, 0x240403) AM_READ(niyanpai_blitter_0_r)
AM_RANGE(0x240400, 0x24041f) AM_WRITE(niyanpai_blitter_0_w)
AM_RANGE(0x240420, 0x24043f) AM_WRITE(niyanpai_clut_0_w)
AM_RANGE(0x240400, 0x240403) AM_READ8(niyanpai_blitter_0_r, 0x00ff)
AM_RANGE(0x240400, 0x24041f) AM_WRITE8(niyanpai_blitter_0_w, 0x00ff)
AM_RANGE(0x240420, 0x24043f) AM_WRITE8(niyanpai_clut_0_w, 0x00ff)
AM_RANGE(0x240600, 0x240603) AM_READ(niyanpai_blitter_1_r)
AM_RANGE(0x240600, 0x24061f) AM_WRITE(niyanpai_blitter_1_w)
AM_RANGE(0x240620, 0x24063f) AM_WRITE(niyanpai_clut_1_w)
AM_RANGE(0x240600, 0x240603) AM_READ8(niyanpai_blitter_1_r, 0x00ff)
AM_RANGE(0x240600, 0x24061f) AM_WRITE8(niyanpai_blitter_1_w, 0x00ff)
AM_RANGE(0x240620, 0x24063f) AM_WRITE8(niyanpai_clut_1_w, 0x00ff)
AM_RANGE(0x240800, 0x240803) AM_READ(niyanpai_blitter_2_r)
AM_RANGE(0x240800, 0x24081f) AM_WRITE(niyanpai_blitter_2_w)
AM_RANGE(0x240820, 0x24083f) AM_WRITE(niyanpai_clut_2_w)
AM_RANGE(0x240800, 0x240803) AM_READ8(niyanpai_blitter_2_r, 0x00ff)
AM_RANGE(0x240800, 0x24081f) AM_WRITE8(niyanpai_blitter_2_w, 0x00ff)
AM_RANGE(0x240820, 0x24083f) AM_WRITE8(niyanpai_clut_2_w, 0x00ff)
AM_RANGE(0x240a00, 0x240a01) AM_WRITE(niyanpai_clutsel_0_w)
AM_RANGE(0x240c00, 0x240c01) AM_WRITE(niyanpai_clutsel_1_w)
AM_RANGE(0x240e00, 0x240e01) AM_WRITE(niyanpai_clutsel_2_w)
AM_RANGE(0x240a00, 0x240a01) AM_WRITE8(niyanpai_clutsel_0_w, 0x00ff)
AM_RANGE(0x240c00, 0x240c01) AM_WRITE8(niyanpai_clutsel_1_w, 0x00ff)
AM_RANGE(0x240e00, 0x240e01) AM_WRITE8(niyanpai_clutsel_2_w, 0x00ff)
AM_RANGE(0x280000, 0x280001) AM_READ(niyanpai_dipsw_r)
AM_RANGE(0x280200, 0x280201) AM_READ(musobana_inputport_0_r)

30
src/mame/includes/niyanpai.h
View File

@ -60,18 +60,18 @@ public:
DECLARE_WRITE16_MEMBER(musobana_inputport_w);
DECLARE_READ16_MEMBER(niyanpai_palette_r);
DECLARE_WRITE16_MEMBER(niyanpai_palette_w);
DECLARE_WRITE16_MEMBER(niyanpai_blitter_0_w);
DECLARE_WRITE16_MEMBER(niyanpai_blitter_1_w);
DECLARE_WRITE16_MEMBER(niyanpai_blitter_2_w);
DECLARE_READ16_MEMBER(niyanpai_blitter_0_r);
DECLARE_READ16_MEMBER(niyanpai_blitter_1_r);
DECLARE_READ16_MEMBER(niyanpai_blitter_2_r);
DECLARE_WRITE16_MEMBER(niyanpai_clut_0_w);
DECLARE_WRITE16_MEMBER(niyanpai_clut_1_w);
DECLARE_WRITE16_MEMBER(niyanpai_clut_2_w);
DECLARE_WRITE16_MEMBER(niyanpai_clutsel_0_w);
DECLARE_WRITE16_MEMBER(niyanpai_clutsel_1_w);
DECLARE_WRITE16_MEMBER(niyanpai_clutsel_2_w);
DECLARE_WRITE8_MEMBER(niyanpai_blitter_0_w);
DECLARE_WRITE8_MEMBER(niyanpai_blitter_1_w);
DECLARE_WRITE8_MEMBER(niyanpai_blitter_2_w);
DECLARE_READ8_MEMBER(niyanpai_blitter_0_r);
DECLARE_READ8_MEMBER(niyanpai_blitter_1_r);
DECLARE_READ8_MEMBER(niyanpai_blitter_2_r);
DECLARE_WRITE8_MEMBER(niyanpai_clut_0_w);
DECLARE_WRITE8_MEMBER(niyanpai_clut_1_w);
DECLARE_WRITE8_MEMBER(niyanpai_clut_2_w);
DECLARE_WRITE8_MEMBER(niyanpai_clutsel_0_w);
DECLARE_WRITE8_MEMBER(niyanpai_clutsel_1_w);
DECLARE_WRITE8_MEMBER(niyanpai_clutsel_2_w);
DECLARE_CUSTOM_INPUT_MEMBER(musobana_outcoin_flag_r);
DECLARE_DRIVER_INIT(niyanpai);
DECLARE_WRITE16_MEMBER(tmp68301_parallel_port_w);
@ -81,9 +81,9 @@ public:
UINT32 screen_update_niyanpai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
INTERRUPT_GEN_MEMBER(niyanpai_interrupt);
int niyanpai_blitter_r(int vram, int offset);
void niyanpai_blitter_w(int vram, int offset, int data);
void niyanpai_clutsel_w(int vram, int data);
void niyanpai_clut_w(int vram, int offset, int data);
void niyanpai_blitter_w(int vram, int offset, UINT8 data);
void niyanpai_clutsel_w(int vram, UINT8 data);
void niyanpai_clut_w(int vram, int offset, UINT8 data);
void niyanpai_vramflip(int vram);
void update_pixel(int vram, int x, int y);
void niyanpai_gfxdraw(int vram);

30
src/mame/video/niyanpai.c
View File

@ -72,7 +72,7 @@ int niyanpai_state::niyanpai_blitter_r(int vram, int offset)
return ret;
}
void niyanpai_state::niyanpai_blitter_w(int vram, int offset, int data)
void niyanpai_state::niyanpai_blitter_w(int vram, int offset, UINT8 data)
{
switch (offset)
{
@ -105,12 +105,12 @@ void niyanpai_state::niyanpai_blitter_w(int vram, int offset, int data)
}
}
void niyanpai_state::niyanpai_clutsel_w(int vram, int data)
void niyanpai_state::niyanpai_clutsel_w(int vram, UINT8 data)
{
m_clutsel[vram] = data;
}
void niyanpai_state::niyanpai_clut_w(int vram, int offset, int data)
void niyanpai_state::niyanpai_clut_w(int vram, int offset, UINT8 data)
{
m_clut[vram][((m_clutsel[vram] & 0xff) * 0x10) + (offset & 0x0f)] = data;
}
@ -331,21 +331,21 @@ void niyanpai_state::niyanpai_gfxdraw(int vram)
******************************************************************************/
WRITE16_MEMBER(niyanpai_state::niyanpai_blitter_0_w){ niyanpai_blitter_w(0, offset, data); }
WRITE16_MEMBER(niyanpai_state::niyanpai_blitter_1_w){ niyanpai_blitter_w(1, offset, data); }
WRITE16_MEMBER(niyanpai_state::niyanpai_blitter_2_w){ niyanpai_blitter_w(2, offset, data); }
WRITE8_MEMBER(niyanpai_state::niyanpai_blitter_0_w){ niyanpai_blitter_w(0, offset, data); }
WRITE8_MEMBER(niyanpai_state::niyanpai_blitter_1_w){ niyanpai_blitter_w(1, offset, data); }
WRITE8_MEMBER(niyanpai_state::niyanpai_blitter_2_w){ niyanpai_blitter_w(2, offset, data); }
READ16_MEMBER(niyanpai_state::niyanpai_blitter_0_r){ return niyanpai_blitter_r(0, offset); }
READ16_MEMBER(niyanpai_state::niyanpai_blitter_1_r){ return niyanpai_blitter_r(1, offset); }
READ16_MEMBER(niyanpai_state::niyanpai_blitter_2_r){ return niyanpai_blitter_r(2, offset); }
READ8_MEMBER(niyanpai_state::niyanpai_blitter_0_r){ return niyanpai_blitter_r(0, offset); }
READ8_MEMBER(niyanpai_state::niyanpai_blitter_1_r){ return niyanpai_blitter_r(1, offset); }
READ8_MEMBER(niyanpai_state::niyanpai_blitter_2_r){ return niyanpai_blitter_r(2, offset); }
WRITE16_MEMBER(niyanpai_state::niyanpai_clut_0_w){ niyanpai_clut_w(0, offset, data); }
WRITE16_MEMBER(niyanpai_state::niyanpai_clut_1_w){ niyanpai_clut_w(1, offset, data); }
WRITE16_MEMBER(niyanpai_state::niyanpai_clut_2_w){ niyanpai_clut_w(2, offset, data); }
WRITE8_MEMBER(niyanpai_state::niyanpai_clut_0_w){ niyanpai_clut_w(0, offset, data); }
WRITE8_MEMBER(niyanpai_state::niyanpai_clut_1_w){ niyanpai_clut_w(1, offset, data); }
WRITE8_MEMBER(niyanpai_state::niyanpai_clut_2_w){ niyanpai_clut_w(2, offset, data); }
WRITE16_MEMBER(niyanpai_state::niyanpai_clutsel_0_w){ niyanpai_clutsel_w(0, data); }
WRITE16_MEMBER(niyanpai_state::niyanpai_clutsel_1_w){ niyanpai_clutsel_w(1, data); }
WRITE16_MEMBER(niyanpai_state::niyanpai_clutsel_2_w){ niyanpai_clutsel_w(2, data); }
WRITE8_MEMBER(niyanpai_state::niyanpai_clutsel_0_w){ niyanpai_clutsel_w(0, data); }
WRITE8_MEMBER(niyanpai_state::niyanpai_clutsel_1_w){ niyanpai_clutsel_w(1, data); }
WRITE8_MEMBER(niyanpai_state::niyanpai_clutsel_2_w){ niyanpai_clutsel_w(2, data); }
/******************************************************************************