Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 02:33:13 +03:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

fmtowns: implemented hsync read from cff86, later 4th Unit games now boot (#3002)

Browse Source 
* fmtowns: implemented hsync read from cff86, later 4th Unit games now boot

Similar to PR #2999, the later games in the 4th Unit series (zero, dagain, merrygor, wyatt) were getting stuck waiting for the HSYNC flag from 0xcff86 (bit 7). With this change they run past the initial menu.

(this is largely copied from Barry's implementation for port 0xfda0, so credit goes to him)

* fmtowns: replaced machine().first_screen() with m_screen
This commit is contained in:
r09 2018-01-02 21:42:00 +01:00 committed by R. Belmont
parent 40d0246919
commit d250c6c07c
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mame/video/fmtowns.cpp
View File

@ -127,7 +127,7 @@ void towns_state::towns_crtc_refresh_mode()
if(scr.max_x <= scr.min_x || scr.max_y <= scr.min_y) if(scr.max_x <= scr.min_x || scr.max_y <= scr.min_y)
return; return;
machine().first_screen()->configure(scr.max_x+1,scr.max_y+1,scr,HZ_TO_ATTOSECONDS(60)); m_screen->configure(scr.max_x+1,scr.max_y+1,scr,HZ_TO_ATTOSECONDS(60));
} }
READ8_MEMBER( towns_state::towns_gfx_high_r ) READ8_MEMBER( towns_state::towns_gfx_high_r )
@ -252,6 +252,8 @@ void towns_state::towns_update_kanji_offset()
READ8_MEMBER( towns_state::towns_video_cff80_r ) READ8_MEMBER( towns_state::towns_video_cff80_r )
{ {
uint8_t* ROM = m_user->base(); uint8_t* ROM = m_user->base();
uint8_t ret = 0;
uint16_t xpos;
switch(offset) switch(offset)
{ {
@ -267,10 +269,13 @@ READ8_MEMBER( towns_state::towns_video_cff80_r )
else else
return 0x00; return 0x00;
case 0x06: case 0x06:
ret |= 0x10;
xpos = m_screen->hpos();
if(xpos < m_video.towns_crtc_layerscr[0].max_x && xpos > m_video.towns_crtc_layerscr[0].min_x)
ret |= 0x80;
if(m_video.towns_vblank_flag != 0) if(m_video.towns_vblank_flag != 0)
return 0x14; ret |= 0x04;
else return ret;
return 0x10;
case 0x16: // Kanji character data case 0x16: // Kanji character data
return ROM[(m_video.towns_kanji_offset << 1) + 0x180000]; return ROM[(m_video.towns_kanji_offset << 1) + 0x180000];
case 0x17: // Kanji character data case 0x17: // Kanji character data
@ -371,8 +376,8 @@ READ8_MEMBER(towns_state::towns_video_440_r)
if(m_video.towns_crtc_sel == 30) if(m_video.towns_crtc_sel == 30)
{ {
// check video position // check video position
xpos = machine().first_screen()->hpos(); xpos = m_screen->hpos();
ypos = machine().first_screen()->vpos(); ypos = m_screen->vpos();
if(xpos < (m_video.towns_crtc_reg[0] & 0xfe)) if(xpos < (m_video.towns_crtc_reg[0] & 0xfe))
ret |= 0x02; ret |= 0x02;
@ -549,7 +554,7 @@ READ8_MEMBER(towns_state::towns_video_fd90_r)
return m_video.towns_degipal[offset-0x08]; return m_video.towns_degipal[offset-0x08];
case 0x10: // "sub status register" case 0x10: // "sub status register"
// check video position // check video position
xpos = machine().first_screen()->hpos(); xpos = m_screen->hpos();
if(xpos < m_video.towns_crtc_layerscr[0].max_x && xpos > m_video.towns_crtc_layerscr[0].min_x) if(xpos < m_video.towns_crtc_layerscr[0].max_x && xpos > m_video.towns_crtc_layerscr[0].min_x)
ret |= 0x02; ret |= 0x02;
@ -1498,7 +1503,7 @@ INTERRUPT_GEN_MEMBER(towns_state::towns_vsync_irq)
dev->ir3_w(1); // IRQ11 = VSync dev->ir3_w(1); // IRQ11 = VSync
if(IRQ_LOG) logerror("PIC: IRQ11 (VSync) set high\n"); if(IRQ_LOG) logerror("PIC: IRQ11 (VSync) set high\n");
m_video.towns_vblank_flag = 1; m_video.towns_vblank_flag = 1;
machine().scheduler().timer_set(machine().first_screen()->time_until_vblank_end(), timer_expired_delegate(FUNC(towns_state::towns_vblank_end),this), 0, (void*)dev); machine().scheduler().timer_set(m_screen->time_until_vblank_end(), timer_expired_delegate(FUNC(towns_state::towns_vblank_end),this), 0, (void*)dev);
if(m_video.towns_tvram_enable) if(m_video.towns_tvram_enable)
draw_text_layer(); draw_text_layer();
if(m_video.towns_sprite_reg[1] & 0x80) if(m_video.towns_sprite_reg[1] & 0x80)