diff options
-rw-r--r-- | src/mame/video/taito_h.cpp | 63 | ||||
-rw-r--r-- | src/mame/video/taito_o.cpp | 21 | ||||
-rw-r--r-- | src/mame/video/taitoair.cpp | 25 | ||||
-rw-r--r-- | src/mame/video/tc0080vco.cpp | 8 | ||||
-rw-r--r-- | src/mame/video/tc0080vco.h | 8 |
5 files changed, 60 insertions, 65 deletions
diff --git a/src/mame/video/taito_h.cpp b/src/mame/video/taito_h.cpp index b8384c36aef..8f62a15c907 100644 --- a/src/mame/video/taito_h.cpp +++ b/src/mame/video/taito_h.cpp @@ -76,7 +76,6 @@ void taitoh_state::syvalion_draw_sprites( bitmap_ind16 &bitmap, const rectangle /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ - address_space &space = machine().dummy_space(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, ex, zx; int ysize; @@ -87,11 +86,11 @@ void taitoh_state::syvalion_draw_sprites( bitmap_ind16 &bitmap, const rectangle for (offs = 0x03f8 / 2; offs >= 0; offs -= 0x008 / 2) { - x0 = m_tc0080vco->sprram_r(space, offs + 1, 0xffff) & 0x3ff; - y0 = m_tc0080vco->sprram_r(space, offs + 0, 0xffff) & 0x3ff; - zoomx = (m_tc0080vco->sprram_r(space, offs + 2, 0xffff) & 0x7f00) >> 8; - tile_offs = (m_tc0080vco->sprram_r(space, offs + 3, 0xffff) & 0x1fff) << 2; - ysize = size[(m_tc0080vco->sprram_r(space, offs, 0xffff) & 0x0c00) >> 10]; + x0 = m_tc0080vco->sprram_r(offs + 1) & 0x3ff; + y0 = m_tc0080vco->sprram_r(offs + 0) & 0x3ff; + zoomx = (m_tc0080vco->sprram_r(offs + 2) & 0x7f00) >> 8; + tile_offs = (m_tc0080vco->sprram_r(offs + 3) & 0x1fff) << 2; + ysize = size[(m_tc0080vco->sprram_r(offs) & 0x0c00) >> 10]; if (tile_offs) { @@ -135,10 +134,10 @@ void taitoh_state::syvalion_draw_sprites( bitmap_ind16 &bitmap, const rectangle { int tile, color, flipx, flipy; - tile = m_tc0080vco->cram_0_r(space, tile_offs, 0xffff) & 0x7fff; - color = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x001f; - flipx = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0040; - flipy = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0080; + tile = m_tc0080vco->cram_0_r(tile_offs) & 0x7fff; + color = m_tc0080vco->cram_1_r(tile_offs) & 0x001f; + flipx = m_tc0080vco->cram_1_r(tile_offs) & 0x0040; + flipy = m_tc0080vco->cram_1_r(tile_offs) & 0x0080; if (m_tc0080vco->flipscreen_r()) { @@ -169,7 +168,6 @@ void taitoh_state::recordbr_draw_sprites( bitmap_ind16 &bitmap, const rectangle /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ - address_space &space = machine().dummy_space(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, dy, ex, ey, zx, zy; int ysize; @@ -183,12 +181,12 @@ void taitoh_state::recordbr_draw_sprites( bitmap_ind16 &bitmap, const rectangle if (offs < 0x01b0 && priority == 0) continue; if (offs >= 0x01b0 && priority == 1) continue; - x0 = m_tc0080vco->sprram_r(space, offs + 1, 0xffff) & 0x3ff; - y0 = m_tc0080vco->sprram_r(space, offs + 0, 0xffff) & 0x3ff; - zoomx = (m_tc0080vco->sprram_r(space, offs + 2, 0xffff) & 0x7f00) >> 8; - zoomy = (m_tc0080vco->sprram_r(space, offs + 2, 0xffff) & 0x007f); - tile_offs = (m_tc0080vco->sprram_r(space, offs + 3, 0xffff) & 0x1fff) << 2; - ysize = size[(m_tc0080vco->sprram_r(space, offs, 0xffff) & 0x0c00) >> 10]; + x0 = m_tc0080vco->sprram_r(offs + 1) & 0x3ff; + y0 = m_tc0080vco->sprram_r(offs + 0) & 0x3ff; + zoomx = (m_tc0080vco->sprram_r(offs + 2) & 0x7f00) >> 8; + zoomy = (m_tc0080vco->sprram_r(offs + 2) & 0x007f); + tile_offs = (m_tc0080vco->sprram_r(offs + 3) & 0x1fff) << 2; + ysize = size[(m_tc0080vco->sprram_r(offs) & 0x0c00) >> 10]; if (tile_offs) { @@ -247,10 +245,10 @@ void taitoh_state::recordbr_draw_sprites( bitmap_ind16 &bitmap, const rectangle { int tile, color, flipx, flipy; - tile = m_tc0080vco->cram_0_r(space, tile_offs, 0xffff) & 0x7fff; - color = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x001f; - flipx = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0040; - flipy = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0080; + tile = m_tc0080vco->cram_0_r(tile_offs) & 0x7fff; + color = m_tc0080vco->cram_1_r(tile_offs) & 0x001f; + flipx = m_tc0080vco->cram_1_r(tile_offs) & 0x0040; + flipy = m_tc0080vco->cram_1_r(tile_offs) & 0x0080; if (m_tc0080vco->flipscreen_r()) { @@ -281,7 +279,6 @@ void taitoh_state::dleague_draw_sprites( bitmap_ind16 &bitmap, const rectangle & /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ - address_space &space = machine().dummy_space(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, ex, zx; int ysize; @@ -293,12 +290,12 @@ void taitoh_state::dleague_draw_sprites( bitmap_ind16 &bitmap, const rectangle & for (offs = 0x03f8 / 2; offs >= 0; offs -= 0x008 / 2) { - x0 = m_tc0080vco->sprram_r(space, offs + 1, 0xffff) & 0x3ff; - y0 = m_tc0080vco->sprram_r(space, offs + 0, 0xffff) & 0x3ff; - zoomx = (m_tc0080vco->sprram_r(space, offs + 2, 0xffff) & 0x7f00) >> 8; - tile_offs = (m_tc0080vco->sprram_r(space, offs + 3, 0xffff) & 0x1fff) << 2; - pribit = (m_tc0080vco->sprram_r(space, offs + 0, 0xffff) & 0x1000) >> 12; - ysize = size[(m_tc0080vco->sprram_r(space, offs, 0xffff) & 0x0c00) >> 10]; + x0 = m_tc0080vco->sprram_r(offs + 1) & 0x3ff; + y0 = m_tc0080vco->sprram_r(offs + 0) & 0x3ff; + zoomx = (m_tc0080vco->sprram_r(offs + 2) & 0x7f00) >> 8; + tile_offs = (m_tc0080vco->sprram_r(offs + 3) & 0x1fff) << 2; + pribit = (m_tc0080vco->sprram_r(offs + 0) & 0x1000) >> 12; + ysize = size[(m_tc0080vco->sprram_r(offs) & 0x0c00) >> 10]; if (tile_offs) { @@ -318,7 +315,7 @@ void taitoh_state::dleague_draw_sprites( bitmap_ind16 &bitmap, const rectangle & zx = (dx + ex) << 12; } - if (m_tc0080vco->scrram_r(space, 0x0002, 0xffff) & 0x8000) + if (m_tc0080vco->scrram_r(0x0002) & 0x8000) pribit = 1; if (x0 >= 0x200) x0 -= 0x400; @@ -348,10 +345,10 @@ void taitoh_state::dleague_draw_sprites( bitmap_ind16 &bitmap, const rectangle & { int tile, color, flipx, flipy; - tile = m_tc0080vco->cram_0_r(space, tile_offs, 0xffff) & 0x7fff; - color = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x001f; - flipx = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0040; - flipy = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0080; + tile = m_tc0080vco->cram_0_r(tile_offs) & 0x7fff; + color = m_tc0080vco->cram_1_r(tile_offs) & 0x001f; + flipx = m_tc0080vco->cram_1_r(tile_offs) & 0x0040; + flipy = m_tc0080vco->cram_1_r(tile_offs) & 0x0080; if (m_tc0080vco->flipscreen_r()) diff --git a/src/mame/video/taito_o.cpp b/src/mame/video/taito_o.cpp index 9482c64e315..513a251e5d4 100644 --- a/src/mame/video/taito_o.cpp +++ b/src/mame/video/taito_o.cpp @@ -31,7 +31,6 @@ void taitoo_state::parentj_draw_sprites( bitmap_ind16 &bitmap, const rectangle & /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ - address_space &space = machine().dummy_space(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, dy, ex, ey, zx, zy; int ysize; @@ -45,12 +44,12 @@ void taitoo_state::parentj_draw_sprites( bitmap_ind16 &bitmap, const rectangle & if (offs < 0x01b0 && priority == 0) continue; if (offs >= 0x01b0 && priority == 1) continue; - x0 = m_tc0080vco->sprram_r(space, offs + 1, 0xffff) & 0x3ff; - y0 = m_tc0080vco->sprram_r(space, offs + 0, 0xffff) & 0x3ff; - zoomx = (m_tc0080vco->sprram_r(space, offs + 2, 0xffff) & 0x7f00) >> 8; - zoomy = (m_tc0080vco->sprram_r(space, offs + 2, 0xffff) & 0x007f); - tile_offs = (m_tc0080vco->sprram_r(space, offs + 3, 0xffff) & 0x1fff) << 2; - ysize = size[(m_tc0080vco->sprram_r(space, offs, 0xffff) & 0x0c00) >> 10]; + x0 = m_tc0080vco->sprram_r(offs + 1) & 0x3ff; + y0 = m_tc0080vco->sprram_r(offs + 0) & 0x3ff; + zoomx = (m_tc0080vco->sprram_r(offs + 2) & 0x7f00) >> 8; + zoomy = (m_tc0080vco->sprram_r(offs + 2) & 0x007f); + tile_offs = (m_tc0080vco->sprram_r(offs + 3) & 0x1fff) << 2; + ysize = size[(m_tc0080vco->sprram_r(offs) & 0x0c00) >> 10]; if (tile_offs) { @@ -109,10 +108,10 @@ void taitoo_state::parentj_draw_sprites( bitmap_ind16 &bitmap, const rectangle & { int tile, color, flipx, flipy; - tile = m_tc0080vco->cram_0_r(space, tile_offs, 0xffff) & 0x7fff; - color = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x001f; - flipx = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0040; - flipy = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0080; + tile = m_tc0080vco->cram_0_r(tile_offs) & 0x7fff; + color = m_tc0080vco->cram_1_r(tile_offs) & 0x001f; + flipx = m_tc0080vco->cram_1_r(tile_offs) & 0x0040; + flipy = m_tc0080vco->cram_1_r(tile_offs) & 0x0080; if (m_tc0080vco->flipscreen_r()) { diff --git a/src/mame/video/taitoair.cpp b/src/mame/video/taitoair.cpp index 81597a912f1..d61fd4386db 100644 --- a/src/mame/video/taitoair.cpp +++ b/src/mame/video/taitoair.cpp @@ -84,7 +84,6 @@ int taitoair_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec /* Y chain size is 16/32?/64/64? pixels. X chain size is always 64 pixels. */ //const uint16_t stop_values[4] = { 0xc00, 0, 0, 0 }; - address_space &space = machine().dummy_space(); static const int size[] = { 1, 2, 4, 4 }; int x0, y0, x, y, dx, dy, ex, ey, zx, zy; int ysize; @@ -102,16 +101,16 @@ int taitoair_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec @todo reported sequence for DMA pause flag is 0x0c** 0x0000 0x0000 0x0000. Verify how exactly via HW test. Continuing may be determined by a DMA bit write. */ - if(m_tc0080vco->sprram_r(space, offs + 0, 0xffff) == 0xc00 || - m_tc0080vco->sprram_r(space, offs + 0, 0xffff) == 0xcff) // Air Inferno + if(m_tc0080vco->sprram_r(offs + 0) == 0xc00 || + m_tc0080vco->sprram_r(offs + 0) == 0xcff) // Air Inferno return offs - 8/2; - x0 = m_tc0080vco->sprram_r(space, offs + 1, 0xffff) & 0x3ff; - y0 = m_tc0080vco->sprram_r(space, offs + 0, 0xffff) & 0x3ff; - zoomx = (m_tc0080vco->sprram_r(space, offs + 2, 0xffff) & 0x7f00) >> 8; - zoomy = (m_tc0080vco->sprram_r(space, offs + 2, 0xffff) & 0x007f); - tile_offs = (m_tc0080vco->sprram_r(space, offs + 3, 0xffff) & 0x1fff) << 2; - ysize = size[(m_tc0080vco->sprram_r(space, offs, 0xffff) & 0x0c00) >> 10]; + x0 = m_tc0080vco->sprram_r(offs + 1) & 0x3ff; + y0 = m_tc0080vco->sprram_r(offs + 0) & 0x3ff; + zoomx = (m_tc0080vco->sprram_r(offs + 2) & 0x7f00) >> 8; + zoomy = (m_tc0080vco->sprram_r(offs + 2) & 0x007f); + tile_offs = (m_tc0080vco->sprram_r(offs + 3) & 0x1fff) << 2; + ysize = size[(m_tc0080vco->sprram_r(offs) & 0x0c00) >> 10]; if (tile_offs) @@ -171,10 +170,10 @@ int taitoair_state::draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprec { int tile, color, flipx, flipy; - tile = m_tc0080vco->cram_0_r(space, tile_offs, 0xffff) & 0x7fff; - color = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x001f; - flipx = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0040; - flipy = m_tc0080vco->cram_1_r(space, tile_offs, 0xffff) & 0x0080; + tile = m_tc0080vco->cram_0_r(tile_offs) & 0x7fff; + color = m_tc0080vco->cram_1_r(tile_offs) & 0x001f; + flipx = m_tc0080vco->cram_1_r(tile_offs) & 0x0040; + flipy = m_tc0080vco->cram_1_r(tile_offs) & 0x0080; if (m_tc0080vco->flipscreen_r()) { diff --git a/src/mame/video/tc0080vco.cpp b/src/mame/video/tc0080vco.cpp index 36cc0681226..788446f07fe 100644 --- a/src/mame/video/tc0080vco.cpp +++ b/src/mame/video/tc0080vco.cpp @@ -665,22 +665,22 @@ void tc0080vco_device::tilemap_draw( screen_device &screen, bitmap_ind16 &bitmap /* FIXME: maybe it would be better to provide pointers to these RAM regions which can be accessed directly by the drivers... */ -READ16_MEMBER( tc0080vco_device::cram_0_r ) +uint16_t tc0080vco_device::cram_0_r(int offset) { return m_chain_ram_0[offset]; } -READ16_MEMBER( tc0080vco_device::cram_1_r ) +uint16_t tc0080vco_device::cram_1_r(int offset) { return m_chain_ram_1[offset]; } -READ16_MEMBER( tc0080vco_device::sprram_r ) +uint16_t tc0080vco_device::sprram_r(int offset) { return m_spriteram[offset]; } -READ16_MEMBER( tc0080vco_device::scrram_r ) +uint16_t tc0080vco_device::scrram_r(int offset) { return m_scroll_ram[offset]; } diff --git a/src/mame/video/tc0080vco.h b/src/mame/video/tc0080vco.h index 52670b67efc..0d998666706 100644 --- a/src/mame/video/tc0080vco.h +++ b/src/mame/video/tc0080vco.h @@ -29,10 +29,10 @@ public: void tilemap_draw(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int layer, int flags, uint32_t priority); void set_fg0_debug(bool debug) { m_has_fg0 = debug ? 0 : 1; } - DECLARE_READ16_MEMBER( cram_0_r ); - DECLARE_READ16_MEMBER( cram_1_r ); - DECLARE_READ16_MEMBER( sprram_r ); - DECLARE_READ16_MEMBER( scrram_r ); + uint16_t cram_0_r(int offset); + uint16_t cram_1_r(int offset); + uint16_t sprram_r(int offset); + uint16_t scrram_r(int offset); DECLARE_WRITE16_MEMBER( scrollram_w ); READ_LINE_MEMBER( flipscreen_r ); void postload(); |