summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/video/homedata.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/video/homedata.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/video/homedata.cpp')
-rw-r--r--src/mame/video/homedata.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mame/video/homedata.cpp b/src/mame/video/homedata.cpp
index aec14eb5888..36c9de30cce 100644
--- a/src/mame/video/homedata.cpp
+++ b/src/mame/video/homedata.cpp
@@ -37,7 +37,7 @@
***************************************************************************/
-void homedata_state::mrokumei_handleblit( int rom_base )
+void homedata_state::mrokumei_handleblit( address_space &space, int rom_base )
{
int i;
int dest_param;
@@ -45,7 +45,7 @@ void homedata_state::mrokumei_handleblit( int rom_base )
int dest_addr;
int base_addr;
int opcode, data, num_tiles;
- uint8_t *pBlitData = &m_blit_rom[rom_base & m_blit_rom.mask()];
+ uint8_t *pBlitData = memregion("user1")->base() + rom_base;
dest_param = m_blitter_param[(m_blitter_param_count - 4) & 3] * 256 +
m_blitter_param[(m_blitter_param_count - 3) & 3];
@@ -103,7 +103,7 @@ void homedata_state::mrokumei_handleblit( int rom_base )
} /* i!=0 */
if (data) /* 00 is a nop */
- mrokumei_videoram_w(base_addr + dest_addr, data);
+ mrokumei_videoram_w(space, base_addr + dest_addr, data);
if (m_vreg[1] & 0x80) /* flip screen */
{
@@ -123,14 +123,14 @@ finish:
m_maincpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE);
}
-void homedata_state::reikaids_handleblit( int rom_base )
+void homedata_state::reikaids_handleblit( address_space &space, int rom_base )
{
int i;
uint16_t dest_param;
int flipx;
int source_addr, base_addr;
int dest_addr;
- uint8_t *pBlitData = &m_blit_rom[rom_base & m_blit_rom.mask()];
+ uint8_t *pBlitData = memregion("user1")->base() + rom_base;
int opcode, data, num_tiles;
@@ -205,7 +205,7 @@ void homedata_state::reikaids_handleblit( int rom_base )
addr ^= 0x007c;
}
- reikaids_videoram_w(addr, dat);
+ reikaids_videoram_w(space, addr, dat);
}
}
@@ -220,14 +220,14 @@ finish:
m_maincpu->set_input_line(M6809_FIRQ_LINE, HOLD_LINE);
}
-void homedata_state::pteacher_handleblit( int rom_base )
+void homedata_state::pteacher_handleblit( address_space &space, int rom_base )
{
int i;
int dest_param;
int source_addr;
int dest_addr, base_addr;
int opcode, data, num_tiles;
- uint8_t *pBlitData = &m_blit_rom[rom_base & m_blit_rom.mask()];
+ uint8_t *pBlitData = memregion("user1")->base() + rom_base;
dest_param = m_blitter_param[(m_blitter_param_count - 4) & 3] * 256 +
m_blitter_param[(m_blitter_param_count - 3) & 3];
@@ -291,7 +291,7 @@ void homedata_state::pteacher_handleblit( int rom_base )
if ((addr & 0x2080) == 0)
{
addr = ((addr & 0xc000) >> 2) | ((addr & 0x1f00) >> 1) | (addr & 0x7f);
- mrokumei_videoram_w(addr, data);
+ mrokumei_videoram_w(space, addr, data);
}
}
@@ -681,13 +681,13 @@ VIDEO_START_MEMBER(homedata_state,mirderby)
***************************************************************************/
-void homedata_state::mrokumei_videoram_w(offs_t offset, u8 data)
+WRITE8_MEMBER(homedata_state::mrokumei_videoram_w)
{
m_videoram[offset] = data;
m_bg_tilemap[(offset & 0x2000) >> 13][(offset & 0x1000) >> 12]->mark_tile_dirty((offset & 0xffe) >> 1);
}
-void homedata_state::reikaids_videoram_w(offs_t offset, u8 data)
+WRITE8_MEMBER(homedata_state::reikaids_videoram_w)
{
m_videoram[offset] = data;
m_bg_tilemap[(offset & 0x2000) >> 13][offset & 3]->mark_tile_dirty((offset & 0xffc) >> 2);
@@ -764,7 +764,7 @@ WRITE8_MEMBER(homedata_state::pteacher_blitter_bank_w)
WRITE8_MEMBER(homedata_state::mrokumei_blitter_start_w)
{
if (data & 0x80)
- mrokumei_handleblit(((m_blitter_bank & 0x04) >> 2) * 0x10000);
+ mrokumei_handleblit(space, ((m_blitter_bank & 0x04) >> 2) * 0x10000);
/* bit 0 = bank switch; used by hourouki to access the
optional service mode ROM (not available in current dump) */
@@ -772,12 +772,12 @@ WRITE8_MEMBER(homedata_state::mrokumei_blitter_start_w)
WRITE8_MEMBER(homedata_state::reikaids_blitter_start_w)
{
- reikaids_handleblit((m_blitter_bank & 3) * 0x10000);
+ reikaids_handleblit(space, (m_blitter_bank & 3) * 0x10000);
}
WRITE8_MEMBER(homedata_state::pteacher_blitter_start_w)
{
- pteacher_handleblit((m_blitter_bank >> 5) * 0x10000 & m_blit_rom.mask());
+ pteacher_handleblit(space, (m_blitter_bank >> 5) * 0x10000 & (memregion("user1")->bytes() - 1));
}
@@ -1014,7 +1014,7 @@ uint32_t homedata_state::screen_update_mirderby(screen_device &screen, bitmap_in
}
-WRITE_LINE_MEMBER(homedata_state::screen_vblank)
+WRITE_LINE_MEMBER(homedata_state::screen_vblank_homedata)
{
// rising edge
if (state)