diff options
author | 2014-07-30 20:35:53 +0000 | |
---|---|---|
committer | 2014-07-30 20:35:53 +0000 | |
commit | 71caae493206306e349b53b9d3ae4a094dd6fb8a (patch) | |
tree | 9d894826a272e8ca3943285ed0a6740c7c99e8bb /src/emu/video/epic12.c | |
parent | 78e76eea17e7594a0c90c871c4f3230c32eb6501 (diff) |
fix prev commit again + removed unneeded class member names prefixes
Diffstat (limited to 'src/emu/video/epic12.c')
-rw-r--r-- | src/emu/video/epic12.c | 242 |
1 files changed, 117 insertions, 125 deletions
diff --git a/src/emu/video/epic12.c b/src/emu/video/epic12.c index bfc7a757383..de5e98e5c2c 100644 --- a/src/emu/video/epic12.c +++ b/src/emu/video/epic12.c @@ -13,61 +13,54 @@ epic12_device::epic12_device(const machine_config &mconfig, const char *tag, dev { m_is_unsafe = 0; m_delay_scale = 0; - m_maincpu = 0; - queue = 0; - blitter_request = 0; - epic12_device_blitter_delay_timer = 0; - blitter_busy = 0; - use_ram = 0; - epic12_device_ram16 = 0; - epic12_device_gfx_addr = 0; - epic12_device_gfx_scroll_0_x = 0; - epic12_device_gfx_scroll_0_y = 0; - epic12_device_gfx_scroll_1_x = 0; - epic12_device_gfx_scroll_1_y = 0; - epic12_device_gfx_size = 0; - epic12_device_gfx_addr_shadowcopy = 0; - epic12_device_gfx_scroll_0_x_shadowcopy = 0; - epic12_device_gfx_scroll_0_y_shadowcopy = 0; - epic12_device_gfx_scroll_1_x_shadowcopy = 0; - epic12_device_gfx_scroll_1_y_shadowcopy = 0; - epic12_device_ram16_copy = 0; + m_blitter_request = 0; + m_blitter_delay_timer = 0; + m_blitter_busy = 0; + m_gfx_addr = 0; + m_gfx_scroll_0_x = 0; + m_gfx_scroll_0_y = 0; + m_gfx_scroll_1_x = 0; + m_gfx_scroll_1_y = 0; + m_gfx_addr_shadowcopy = 0; + m_gfx_scroll_0_x_shadowcopy = 0; + m_gfx_scroll_0_y_shadowcopy = 0; + m_gfx_scroll_1_x_shadowcopy = 0; + m_gfx_scroll_1_y_shadowcopy = 0; epic12_device_blit_delay = 0; } -TIMER_CALLBACK_MEMBER( epic12_device::epic12_device_blitter_delay_callback ) +TIMER_CALLBACK_MEMBER( epic12_device::blitter_delay_callback ) { - blitter_busy = 0; + m_blitter_busy = 0; } void epic12_device::device_start() { - epic12_device_gfx_size = 0x2000 * 0x1000; - epic12_device_bitmaps = auto_bitmap_rgb32_alloc(machine(), 0x2000, 0x1000); - epic12_device_clip = epic12_device_bitmaps->cliprect(); - epic12_device_clip.set(0, 0x2000-1, 0, 0x1000-1); + m_gfx_size = 0x2000 * 0x1000; + m_bitmaps = auto_bitmap_rgb32_alloc(machine(), 0x2000, 0x1000); + m_clip = m_bitmaps->cliprect(); + m_clip.set(0, 0x2000-1, 0, 0x1000-1); - epic12_device_ram16_copy = auto_alloc_array(machine(), UINT16, m_main_ramsize/2); + m_ram16_copy = auto_alloc_array(machine(), UINT16, m_main_ramsize/2); - epic12_device_blitter_delay_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(epic12_device::epic12_device_blitter_delay_callback),this)); - epic12_device_blitter_delay_timer->adjust(attotime::never); + m_blitter_delay_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(epic12_device::blitter_delay_callback),this)); + m_blitter_delay_timer->adjust(attotime::never); } void epic12_device::device_reset() { if (m_is_unsafe) { - use_ram = epic12_device_ram16; - queue = osd_work_queue_alloc(WORK_QUEUE_FLAG_HIGH_FREQ|WORK_QUEUE_FLAG_MULTI); + m_use_ram = m_ram16; + m_work_queue = osd_work_queue_alloc(WORK_QUEUE_FLAG_HIGH_FREQ|WORK_QUEUE_FLAG_MULTI); } else { - use_ram = epic12_device_ram16_copy; // slow mode - queue = osd_work_queue_alloc(WORK_QUEUE_FLAG_HIGH_FREQ); + m_use_ram = m_ram16_copy; // slow mode + m_work_queue = osd_work_queue_alloc(WORK_QUEUE_FLAG_HIGH_FREQ); } - // cache table to avoid divides in blit code, also pre-clamped int x,y; for (y=0;y<0x40;y++) @@ -92,8 +85,7 @@ void epic12_device::device_reset() } } - blitter_busy = 0; - + m_blitter_busy = 0; } // todo, get these into the device class without ruining performance @@ -105,7 +97,7 @@ UINT64 epic12_device_blit_delay; inline UINT16 epic12_device::READ_NEXT_WORD(offs_t *addr) { // UINT16 data = space.read_word(*addr); // going through the memory system is 'more correct' but noticably slower - UINT16 data = use_ram[((*addr & m_main_rammask) >> 1) ^ NATIVE_ENDIAN_VALUE_LE_BE(3, 0)]; + UINT16 data = m_use_ram[((*addr & m_main_rammask) >> 1) ^ NATIVE_ENDIAN_VALUE_LE_BE(3, 0)]; *addr += 2; @@ -116,8 +108,8 @@ inline UINT16 epic12_device::READ_NEXT_WORD(offs_t *addr) inline UINT16 epic12_device::COPY_NEXT_WORD(address_space &space, offs_t *addr) { // UINT16 data = space.read_word(*addr); // going through the memory system is 'more correct' but noticably slower - UINT16 data = epic12_device_ram16[((*addr & m_main_rammask) >> 1) ^ NATIVE_ENDIAN_VALUE_LE_BE(3, 0)]; - epic12_device_ram16_copy[((*addr & m_main_rammask) >> 1) ^ NATIVE_ENDIAN_VALUE_LE_BE(3, 0)] = data; + UINT16 data = m_ram16[((*addr & m_main_rammask) >> 1) ^ NATIVE_ENDIAN_VALUE_LE_BE(3, 0)]; + m_ram16_copy[((*addr & m_main_rammask) >> 1) ^ NATIVE_ENDIAN_VALUE_LE_BE(3, 0)] = data; *addr += 2; @@ -126,7 +118,7 @@ inline UINT16 epic12_device::COPY_NEXT_WORD(address_space &space, offs_t *addr) } -inline void epic12_device::epic12_device_gfx_upload_shadow_copy(address_space &space, offs_t *addr) +inline void epic12_device::gfx_upload_shadow_copy(address_space &space, offs_t *addr) { UINT32 x,y, dimx,dimy; COPY_NEXT_WORD(space, addr); @@ -148,7 +140,7 @@ inline void epic12_device::epic12_device_gfx_upload_shadow_copy(address_space &s } } -inline void epic12_device::epic12_device_gfx_upload(offs_t *addr) +inline void epic12_device::gfx_upload(offs_t *addr) { UINT32 x,y, dst_p,dst_x_start,dst_y_start, dimx,dimy; UINT32 *dst; @@ -175,7 +167,7 @@ inline void epic12_device::epic12_device_gfx_upload(offs_t *addr) for (y = 0; y < dimy; y++) { - dst = &epic12_device_bitmaps->pix(dst_y_start + y, 0); + dst = &m_bitmaps->pix(dst_y_start + y, 0); dst += dst_x_start; for (x = 0; x < dimx; x++) @@ -191,7 +183,7 @@ inline void epic12_device::epic12_device_gfx_upload(offs_t *addr) } } -#define draw_params epic12_device_bitmaps, &epic12_device_clip, &epic12_device_bitmaps->pix(0,0),src_x,src_y, x,y, dimx,dimy, flipy, s_alpha, d_alpha, &tint_clr +#define draw_params m_bitmaps, &m_clip, &m_bitmaps->pix(0,0),src_x,src_y, x,y, dimx,dimy, flipy, s_alpha, d_alpha, &tint_clr @@ -295,7 +287,7 @@ epic12_device_blitfunction epic12_device_f1_ti0_tr0_blit_funcs[] = -inline void epic12_device::epic12_device_gfx_draw_shadow_copy(address_space &space, offs_t *addr) +inline void epic12_device::gfx_draw_shadow_copy(address_space &space, offs_t *addr) { COPY_NEXT_WORD(space, addr); COPY_NEXT_WORD(space, addr); @@ -317,7 +309,7 @@ inline void epic12_device::epic12_device_gfx_draw_shadow_copy(address_space &spa -inline void epic12_device::epic12_device_gfx_draw(offs_t *addr) +inline void epic12_device::gfx_draw(offs_t *addr) { int x,y, dimx,dimy, flipx,flipy;//, src_p; int trans,blend, s_mode, d_mode; @@ -533,10 +525,10 @@ inline void epic12_device::epic12_device_gfx_draw(offs_t *addr) } -void epic12_device::epic12_device_gfx_create_shadow_copy(address_space &space) +void epic12_device::gfx_create_shadow_copy(address_space &space) { - offs_t addr = epic12_device_gfx_addr & 0x1fffffff; - epic12_device_clip.set(epic12_device_gfx_scroll_1_x_shadowcopy, epic12_device_clip.min_x + 320-1, epic12_device_gfx_scroll_1_y_shadowcopy, epic12_device_clip.min_y + 240-1); + offs_t addr = m_gfx_addr & 0x1fffffff; + m_clip.set(m_gfx_scroll_1_x_shadowcopy, m_gfx_scroll_1_x_shadowcopy + 320-1, m_gfx_scroll_1_y_shadowcopy, m_gfx_scroll_1_y_shadowcopy + 240-1); while (1) { @@ -550,19 +542,19 @@ void epic12_device::epic12_device_gfx_create_shadow_copy(address_space &space) case 0xc000: if (COPY_NEXT_WORD(space, &addr)) // cliptype - epic12_device_clip.set(epic12_device_gfx_scroll_1_x_shadowcopy, epic12_device_clip.min_x + 320-1, epic12_device_gfx_scroll_1_y_shadowcopy, epic12_device_clip.min_y + 240-1); + m_clip.set(m_gfx_scroll_1_x_shadowcopy, m_gfx_scroll_1_x_shadowcopy + 320-1, m_gfx_scroll_1_y_shadowcopy, m_gfx_scroll_1_y_shadowcopy + 240-1); else - epic12_device_clip.set(0, 0x2000-1, 0, 0x1000-1); + m_clip.set(0, 0x2000-1, 0, 0x1000-1); break; case 0x2000: addr -= 2; - epic12_device_gfx_upload_shadow_copy(space, &addr); + gfx_upload_shadow_copy(space, &addr); break; case 0x1000: addr -= 2; - epic12_device_gfx_draw_shadow_copy(space, &addr); + gfx_draw_shadow_copy(space, &addr); break; default: @@ -573,10 +565,10 @@ void epic12_device::epic12_device_gfx_create_shadow_copy(address_space &space) } -void epic12_device::epic12_device_gfx_exec(void) +void epic12_device::gfx_exec(void) { - offs_t addr = epic12_device_gfx_addr_shadowcopy & 0x1fffffff; - epic12_device_clip.set(epic12_device_gfx_scroll_1_x_shadowcopy, epic12_device_clip.min_x + 320-1, epic12_device_gfx_scroll_1_y_shadowcopy, epic12_device_clip.min_y + 240-1); + offs_t addr = m_gfx_addr_shadowcopy & 0x1fffffff; + m_clip.set(m_gfx_scroll_1_x_shadowcopy, m_gfx_scroll_1_x_shadowcopy + 320-1, m_gfx_scroll_1_y_shadowcopy, m_gfx_scroll_1_y_shadowcopy + 240-1); // logerror("GFX EXEC: %08X\n", addr); @@ -592,19 +584,19 @@ void epic12_device::epic12_device_gfx_exec(void) case 0xc000: if (READ_NEXT_WORD(&addr)) // cliptype - epic12_device_clip.set(epic12_device_gfx_scroll_1_x_shadowcopy, epic12_device_clip.min_x + 320-1, epic12_device_gfx_scroll_1_y_shadowcopy, epic12_device_clip.min_y + 240-1); + m_clip.set(m_gfx_scroll_1_x_shadowcopy, m_gfx_scroll_1_x_shadowcopy + 320-1, m_gfx_scroll_1_y_shadowcopy, m_gfx_scroll_1_y_shadowcopy + 240-1); else - epic12_device_clip.set(0, 0x2000-1, 0, 0x1000-1); + m_clip.set(0, 0x2000-1, 0, 0x1000-1); break; case 0x2000: addr -= 2; - epic12_device_gfx_upload(&addr); + gfx_upload(&addr); break; case 0x1000: addr -= 2; - epic12_device_gfx_draw(&addr); + gfx_draw(&addr); break; default: @@ -615,10 +607,10 @@ void epic12_device::epic12_device_gfx_exec(void) } -void epic12_device::epic12_device_gfx_exec_unsafe(void) +void epic12_device::gfx_exec_unsafe(void) { - offs_t addr = epic12_device_gfx_addr & 0x1fffffff; - epic12_device_clip.set(epic12_device_gfx_scroll_1_x, epic12_device_clip.min_x + 320-1, epic12_device_gfx_scroll_1_y, epic12_device_clip.min_y + 240-1); + offs_t addr = m_gfx_addr & 0x1fffffff; + m_clip.set(m_gfx_scroll_1_x, m_gfx_scroll_1_x + 320-1, m_gfx_scroll_1_y, m_gfx_scroll_1_y + 240-1); // logerror("GFX EXEC: %08X\n", addr); @@ -634,19 +626,19 @@ void epic12_device::epic12_device_gfx_exec_unsafe(void) case 0xc000: if (READ_NEXT_WORD(&addr)) // cliptype - epic12_device_clip.set(epic12_device_gfx_scroll_1_x, epic12_device_clip.min_x + 320-1, epic12_device_gfx_scroll_1_y, epic12_device_clip.min_y + 240-1); + m_clip.set(m_gfx_scroll_1_x, m_gfx_scroll_1_x + 320-1, m_gfx_scroll_1_y, m_gfx_scroll_1_y + 240-1); else - epic12_device_clip.set(0, 0x2000-1, 0, 0x1000-1); + m_clip.set(0, 0x2000-1, 0, 0x1000-1); break; case 0x2000: addr -= 2; - epic12_device_gfx_upload(&addr); + gfx_upload(&addr); break; case 0x1000: addr -= 2; - epic12_device_gfx_draw(&addr); + gfx_draw(&addr); break; default: @@ -662,7 +654,7 @@ void *epic12_device::blit_request_callback(void *param, int threadid) { epic12_device *object = reinterpret_cast<epic12_device *>(param); - object->epic12_device_gfx_exec(); + object->gfx_exec(); return NULL; } @@ -673,19 +665,19 @@ void *epic12_device::blit_request_callback_unsafe(void *param, int threadid) epic12_device *object = reinterpret_cast<epic12_device *>(param); epic12_device_blit_delay = 0; - object->epic12_device_gfx_exec_unsafe(); + object->gfx_exec_unsafe(); return NULL; } -READ32_MEMBER( epic12_device::epic12_device_gfx_ready_r ) +READ32_MEMBER( epic12_device::gfx_ready_r ) { return 0x00000010; } -READ32_MEMBER( epic12_device::epic12_device_gfx_ready_r_unsafe ) +READ32_MEMBER( epic12_device::gfx_ready_r_unsafe ) { - if (blitter_busy) + if (m_blitter_busy) { m_maincpu->spin_until_time(attotime::from_usec(10)); return 0x00000000; @@ -694,7 +686,7 @@ READ32_MEMBER( epic12_device::epic12_device_gfx_ready_r_unsafe ) return 0x00000010; } -WRITE32_MEMBER( epic12_device::epic12_device_gfx_exec_w ) +WRITE32_MEMBER( epic12_device::gfx_exec_w ) { if ( ACCESSING_BITS_0_7 ) { @@ -702,38 +694,38 @@ WRITE32_MEMBER( epic12_device::epic12_device_gfx_exec_w ) { //g_profiler.start(PROFILER_USER1); // make sure we've not already got a request running - if (blitter_request) + if (m_blitter_request) { int result; do { - result = osd_work_item_wait(blitter_request, 1000); + result = osd_work_item_wait(m_blitter_request, 1000); } while (result==0); - osd_work_item_release(blitter_request); + osd_work_item_release(m_blitter_request); } epic12_device_blit_delay = 0; - epic12_device_gfx_create_shadow_copy(space); // create a copy of the blit list so we can safely thread it. + gfx_create_shadow_copy(space); // create a copy of the blit list so we can safely thread it. if (epic12_device_blit_delay) { - blitter_busy = 1; - epic12_device_blitter_delay_timer->adjust(attotime::from_nsec(epic12_device_blit_delay*8)); // NOT accurate timing (currently ignored anyway) + m_blitter_busy = 1; + m_blitter_delay_timer->adjust(attotime::from_nsec(epic12_device_blit_delay*8)); // NOT accurate timing (currently ignored anyway) } - epic12_device_gfx_addr_shadowcopy = epic12_device_gfx_addr; - epic12_device_gfx_scroll_0_x_shadowcopy = epic12_device_gfx_scroll_0_x; - epic12_device_gfx_scroll_0_y_shadowcopy = epic12_device_gfx_scroll_0_y; - epic12_device_gfx_scroll_1_x_shadowcopy = epic12_device_gfx_scroll_1_x; - epic12_device_gfx_scroll_1_y_shadowcopy = epic12_device_gfx_scroll_1_y; - blitter_request = osd_work_item_queue(queue, blit_request_callback, (void*)this, 0); + m_gfx_addr_shadowcopy = m_gfx_addr; + m_gfx_scroll_0_x_shadowcopy = m_gfx_scroll_0_x; + m_gfx_scroll_0_y_shadowcopy = m_gfx_scroll_0_y; + m_gfx_scroll_1_x_shadowcopy = m_gfx_scroll_1_x; + m_gfx_scroll_1_y_shadowcopy = m_gfx_scroll_1_y; + m_blitter_request = osd_work_item_queue(m_work_queue, blit_request_callback, (void*)this, 0); //g_profiler.stop(); } } } -WRITE32_MEMBER( epic12_device::epic12_device_gfx_exec_w_unsafe ) +WRITE32_MEMBER( epic12_device::gfx_exec_w_unsafe ) { if ( ACCESSING_BITS_0_7 ) { @@ -741,29 +733,29 @@ WRITE32_MEMBER( epic12_device::epic12_device_gfx_exec_w_unsafe ) { //g_profiler.start(PROFILER_USER1); // make sure we've not already got a request running - if (blitter_request) + if (m_blitter_request) { int result; do { - result = osd_work_item_wait(blitter_request, 1000); + result = osd_work_item_wait(m_blitter_request, 1000); } while (result==0); - osd_work_item_release(blitter_request); + osd_work_item_release(m_blitter_request); } if (epic12_device_blit_delay) { - blitter_busy = 1; + m_blitter_busy = 1; int delay = epic12_device_blit_delay*(15 * m_delay_scale / 50); //printf("delay %d\n", delay); - epic12_device_blitter_delay_timer->adjust(attotime::from_nsec(delay)); + m_blitter_delay_timer->adjust(attotime::from_nsec(delay)); } else { - blitter_busy = 0; + m_blitter_busy = 0; } - blitter_request = osd_work_item_queue(queue, blit_request_callback_unsafe, (void*)this, 0); + m_blitter_request = osd_work_item_queue(m_work_queue, blit_request_callback_unsafe, (void*)this, 0); //g_profiler.stop(); } } @@ -774,14 +766,14 @@ void epic12_device::draw_screen(bitmap_rgb32 &bitmap, const rectangle &cliprect { if (!m_is_unsafe) { - if (blitter_request) + if (m_blitter_request) { int result; do { - result = osd_work_item_wait(blitter_request, 1000); + result = osd_work_item_wait(m_blitter_request, 1000); } while (result==0); - osd_work_item_release(blitter_request); + osd_work_item_release(m_blitter_request); } } @@ -790,14 +782,14 @@ void epic12_device::draw_screen(bitmap_rgb32 &bitmap, const rectangle &cliprect bitmap.fill(0, cliprect); - scroll_0_x = -epic12_device_gfx_scroll_0_x; - scroll_0_y = -epic12_device_gfx_scroll_0_y; -// scroll_1_x = -epic12_device_gfx_scroll_1_x; -// scroll_1_y = -epic12_device_gfx_scroll_1_y; + scroll_0_x = -m_gfx_scroll_0_x; + scroll_0_y = -m_gfx_scroll_0_y; +// scroll_1_x = -m_gfx_scroll_1_x; +// scroll_1_y = -m_gfx_scroll_1_y; //printf("SCREEN UPDATE\n %d %d %d %d\n", scroll_0_x, scroll_0_y, scroll_1_x, scroll_1_y); - copyscrollbitmap(bitmap, *epic12_device_bitmaps, 1,&scroll_0_x, 1,&scroll_0_y, cliprect); + copyscrollbitmap(bitmap, *m_bitmaps, 1,&scroll_0_x, 1,&scroll_0_y, cliprect); } @@ -805,12 +797,12 @@ void epic12_device::draw_screen(bitmap_rgb32 &bitmap, const rectangle &cliprect -READ32_MEMBER( epic12_device::epic12_device_blitter_r ) +READ32_MEMBER( epic12_device::blitter_r ) { switch (offset*4) { case 0x10: - return epic12_device::epic12_device_gfx_ready_r(space,offset,mem_mask); + return gfx_ready_r(space, offset, mem_mask); case 0x24: return 0xffffffff; @@ -822,19 +814,19 @@ READ32_MEMBER( epic12_device::epic12_device_blitter_r ) return space.machine().root_device().ioport(":DSW")->read(); default: - logerror("unknownepic12_device_blitter_r %08x %08x\n", offset*4, mem_mask); + logerror("unknownblitter_r %08x %08x\n", offset*4, mem_mask); break; } return 0; } -READ32_MEMBER( epic12_device::epic12_device_blitter_r_unsafe ) +READ32_MEMBER( epic12_device::blitter_r_unsafe ) { switch (offset*4) { case 0x10: - return epic12_device::epic12_device_gfx_ready_r_unsafe(space,offset,mem_mask); + return gfx_ready_r_unsafe(space, offset, mem_mask); case 0x24: return 0xffffffff; @@ -846,7 +838,7 @@ READ32_MEMBER( epic12_device::epic12_device_blitter_r_unsafe ) return space.machine().root_device().ioport(":DSW")->read(); default: - logerror("unknownepic12_device_blitter_r %08x %08x\n", offset*4, mem_mask); + logerror("unknownblitter_r %08x %08x\n", offset*4, mem_mask); break; } @@ -854,63 +846,63 @@ READ32_MEMBER( epic12_device::epic12_device_blitter_r_unsafe ) } -WRITE32_MEMBER( epic12_device::epic12_device_blitter_w ) +WRITE32_MEMBER( epic12_device::blitter_w ) { switch (offset*4) { case 0x04: - epic12_device_gfx_exec_w(space,offset,data,mem_mask); + gfx_exec_w(space,offset,data,mem_mask); break; case 0x08: - COMBINE_DATA(&epic12_device_gfx_addr); + COMBINE_DATA(&m_gfx_addr); break; case 0x14: - COMBINE_DATA(&epic12_device_gfx_scroll_0_x); + COMBINE_DATA(&m_gfx_scroll_0_x); break; case 0x18: - COMBINE_DATA(&epic12_device_gfx_scroll_0_y); + COMBINE_DATA(&m_gfx_scroll_0_y); break; case 0x40: - COMBINE_DATA(&epic12_device_gfx_scroll_1_x); + COMBINE_DATA(&m_gfx_scroll_1_x); break; case 0x44: - COMBINE_DATA(&epic12_device_gfx_scroll_1_y); + COMBINE_DATA(&m_gfx_scroll_1_y); break; } } -WRITE32_MEMBER( epic12_device::epic12_device_blitter_w_unsafe ) +WRITE32_MEMBER( epic12_device::blitter_w_unsafe ) { switch (offset*4) { case 0x04: - epic12_device_gfx_exec_w_unsafe(space,offset,data,mem_mask); + gfx_exec_w_unsafe(space,offset,data,mem_mask); break; case 0x08: - COMBINE_DATA(&epic12_device_gfx_addr); + COMBINE_DATA(&m_gfx_addr); break; case 0x14: - COMBINE_DATA(&epic12_device_gfx_scroll_0_x); + COMBINE_DATA(&m_gfx_scroll_0_x); break; case 0x18: - COMBINE_DATA(&epic12_device_gfx_scroll_0_y); + COMBINE_DATA(&m_gfx_scroll_0_y); break; case 0x40: - COMBINE_DATA(&epic12_device_gfx_scroll_1_x); + COMBINE_DATA(&m_gfx_scroll_1_x); break; case 0x44: - COMBINE_DATA(&epic12_device_gfx_scroll_1_y); + COMBINE_DATA(&m_gfx_scroll_1_y); break; } @@ -926,25 +918,25 @@ void epic12_device::install_handlers(int addr1, int addr2) if (m_is_unsafe) { printf("using unsafe blit code!\n"); - read = read32_delegate(FUNC(epic12_device::epic12_device_blitter_r_unsafe), this); - write = write32_delegate(FUNC(epic12_device::epic12_device_blitter_w_unsafe), this); + read = read32_delegate(FUNC(epic12_device::blitter_r_unsafe), this); + write = write32_delegate(FUNC(epic12_device::blitter_w_unsafe), this); } else { - read = read32_delegate(FUNC(epic12_device::epic12_device_blitter_r), this); - write = write32_delegate(FUNC(epic12_device::epic12_device_blitter_w), this); + read = read32_delegate(FUNC(epic12_device::blitter_r), this); + write = write32_delegate(FUNC(epic12_device::blitter_w), this); } space.install_readwrite_handler(addr1, addr2, read , write, U64(0xffffffffffffffff)); } -READ64_MEMBER( epic12_device::epic12_device_fpga_r ) +READ64_MEMBER( epic12_device::fpga_r ) { return 0xff; } // todo, store what's written here and checksum it, different microcode probably leads to slightly different blitter timings -WRITE64_MEMBER( epic12_device::epic12_device_fpga_w ) +WRITE64_MEMBER( epic12_device::fpga_w ) { if (ACCESSING_BITS_24_31) { |