Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 01:40:16 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

315_5124.c: improved X-Scroll register timing. [Enik Land]

Browse Source
This commit is contained in:
Fabio Priuli 2014-03-23 07:46:55 +00:00
parent 339936b0ae
commit 13c176069f
2 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/emu/video/315_5124.c
View File

@ -8,6 +8,15 @@
**********************************************************************/
/*
To do:
- Display mode 1 (text)
- Display mode 3 (multicolor)
SMS Display Timing
------------------
For more information, please see:
- http://cgfm2.emuviews.com/txt/msvdp.txt
- http://www.smspower.org/forums/viewtopic.php?p=44198
@ -60,10 +69,14 @@ PAL frame timing
#define VCOUNT_CHANGE_HPOS 23
#define SPROVR_HPOS 23
#define SPRCOL_BASEHPOS 59
#define DISPLAY_CB_HPOS 6 /* fix X-Scroll latchtime (Flubba's VDPTest) */
#define X_SCROLL_HPOS 21
#define DRAW_TIME_GG 86 /* 1 + 2 + 14 +8 + 96/2 */
#define DRAW_TIME_SMS 0
/* Display callback delay that fixes a flicker issue at top of screen when
playing 'fantdizzy' (SMS PAL game), due to time when display is disabled. */
#define DISPLAY_CB_HPOS 6
#define DRAW_TIME_GG 86 /* 1 + 2 + 14 + 8 + 96/2 */
#define DRAW_TIME_SMS 25 /* 1 + 2 + 14 + 8 */
#define PRIORITY_BIT 0x1000
#define BACKDROP_COLOR ((m_vdp_mode == 4 ? 0x10 : 0x00) + (m_reg[0x07] & 0x0f))
@ -211,21 +224,24 @@ void sega315_5124_device::set_display_settings()
{
m_vdp_mode = 0;
}
else
// if (M1 && !M2 && !M3)
// {
// m_vdp_mode = 1;
// }
// else
if (!M1 && M2 && !M3)
#if 0
/* Mode 1, not implemented */
else if (M1 && !M2 && !M3)
{
m_vdp_mode = 1;
}
#endif
else if (!M1 && M2 && !M3)
{
m_vdp_mode = 2;
// }
// else
// if (!M1 && !M2 && M3)
// {
// m_vdp_mode = 3;
}
#if 0
/* Mode 3, not implemented */
else if (!M1 && !M2 && M3)
{
m_vdp_mode = 3;
}
#endif
else
{
logerror("Unknown video mode detected (M1 = %c, M2 = %c, M3 = %c, M4 = %c)\n", M1 ? '1' : '0', M2 ? '1' : '0', M3 ? '1' : '0', M4 ? '1' : '0');
@ -279,7 +295,7 @@ void sega315_5124_device::hcount_latch_at_hpos( int hpos )
if (hclock < 0)
hclock += m_screen->width();
/* Calculate and write the new hcount. */
/* Calculate and store the new hcount. */
m_hcounter = ((hclock - 46) >> 1) & 0xff;
}
@ -344,6 +360,8 @@ void sega315_5124_device::process_line_timer()
rec.min_y = rec.max_y = vpos;
m_display_disabled = !(m_reg[0x01] & 0x40);
/* Activate flags that were pending until the end of previous line. */
check_pending_flags(m_screen->width());
@ -425,6 +443,7 @@ void sega315_5124_device::process_line_timer()
{
m_reg9copy = m_reg[0x09];
}
m_reg8copy = m_reg[0x08];
if (m_line_counter == 0x00)
{
@ -514,7 +533,7 @@ READ8_MEMBER( sega315_5124_device::vram_read )
/* Load read buffer */
m_buffer = this->space().read_byte(m_addr & 0x3fff);
/* Bump internal addthis->ress register */
/* Bump internal address register */
m_addr += 1;
}
return temp;
@ -611,8 +630,9 @@ WRITE8_MEMBER( sega315_5124_device::vram_write )
WRITE8_MEMBER( sega315_5124_device::register_write )
{
int reg_num;
int hpos = m_screen->hpos();
check_pending_flags(m_screen->hpos());
check_pending_flags(hpos);
if (m_pending_reg_write == 0)
{
@ -646,6 +666,9 @@ WRITE8_MEMBER( sega315_5124_device::register_write )
if (reg_num == 0 || reg_num == 1)
set_display_settings();
if (reg_num == 8 && hpos <= X_SCROLL_HPOS)
m_reg8copy = m_reg[0x08];
if ( ( reg_num == 0 && (m_status & STATUS_HINT) ) ||
( reg_num == 1 && (m_status & STATUS_VINT) ) )
{
@ -758,8 +781,8 @@ void sega315_5124_device::draw_scanline_mode4( int *line_buffer, int *priority_s
UINT16 name_table_address = get_name_table_address();
/* if top 2 rows of screen not affected by horizontal scrolling, then x_scroll = 0 */
/* else x_scroll = m_reg[0x08] */
x_scroll = (((m_reg[0x00] & 0x40) && (line < 16)) ? 0 : 0x0100 - m_reg[0x08]);
/* else x_scroll = m_reg8copy */
x_scroll = (((m_reg[0x00] & 0x40) && (line < 16)) ? 0 : 0x0100 - m_reg8copy);
x_scroll_start_column = (x_scroll >> 3); /* x starting column tile */
@ -926,7 +949,7 @@ void sega315_5124_device::draw_sprites_mode4( int *line_buffer, int *priority_se
/* Draw sprite layer */
/* Check if display is disabled */
if (!(m_reg[0x01] & 0x40))
if (m_display_disabled)
return;
memset(m_collision_buffer, 0, SEGA315_5124_WIDTH);
@ -1085,7 +1108,7 @@ void sega315_5124_device::draw_sprites_tms9918_mode( int *line_buffer, int line
/* Draw sprite layer */
/* Check if display is disabled */
if (!(m_reg[0x01] & 0x40))
if (m_display_disabled)
return;
memset(m_collision_buffer, 0, SEGA315_5124_WIDTH);
@ -1430,7 +1453,7 @@ void sega315_5124_device::draw_scanline( int pixel_offset_x, int pixel_plot_y, i
UINT8 *p_y1 = &m_y1_bitmap.pix8(pixel_plot_y + line, pixel_offset_x);
/* Check if display is disabled or we're below/above active area */
if (!(m_reg[0x01] & 0x40) || line < 0 || line >= m_frame_timing[ACTIVE_DISPLAY_V])
if (m_display_disabled || line < 0 || line >= m_frame_timing[ACTIVE_DISPLAY_V])
{
for (x = 0; x < 256; x++)
{
@ -1520,7 +1543,7 @@ void sega315_5378_device::draw_scanline( int pixel_offset_x, int pixel_plot_y, i
}
/* Check if display is disabled or we're below/above active area */
if (!(m_reg[0x01] & 0x40) || line < 0 || line >= m_frame_timing[ACTIVE_DISPLAY_V])
if (m_display_disabled || line < 0 || line >= m_frame_timing[ACTIVE_DISPLAY_V])
{
for (x = 0; x < 256; x++)
{
@ -1737,6 +1760,7 @@ void sega315_5124_device::device_start()
save_item(NAME(m_status));
save_item(NAME(m_pending_status));
save_item(NAME(m_pending_sprcol_x));
save_item(NAME(m_reg8copy));
save_item(NAME(m_reg9copy));
save_item(NAME(m_addrmode));
save_item(NAME(m_addr));
@ -1745,6 +1769,7 @@ void sega315_5124_device::device_start()
save_item(NAME(m_pending_reg_write));
save_item(NAME(m_buffer));
save_item(NAME(m_sega315_5124_compatibility_mode));
save_item(NAME(m_display_disabled));
save_item(NAME(m_irq_state));
save_item(NAME(m_vdp_mode));
save_item(NAME(m_y_pixels));
@ -1782,10 +1807,12 @@ void sega315_5124_device::device_reset()
m_pending_status = 0;
m_pending_sprcol_x = 0;
m_pending_reg_write = 0;
m_reg8copy = 0;
m_reg9copy = 0;
m_addrmode = 0;
m_addr = 0;
m_sega315_5124_compatibility_mode = false;
m_display_disabled = false;
m_cram_mask = m_cram_size - 1;
m_cram_dirty = 1;
m_buffer = 0;

4
src/emu/video/315_5124.h
View File

@ -118,7 +118,8 @@ protected:
UINT8 m_reg[16]; /* All the registers */
UINT8 m_status; /* Status register */
UINT8 m_pending_status; /* Pending status flags */
UINT8 m_reg9copy; /* Internal copy of register 9 */
UINT8 m_reg8copy; /* Internal copy of register 8 (X-Scroll) */
UINT8 m_reg9copy; /* Internal copy of register 9 (Y-Scroll) */
UINT8 m_addrmode; /* Type of VDP action */
UINT16 m_addr; /* Contents of internal VDP address register */
UINT8 m_cram_size; /* CRAM size */
@ -141,6 +142,7 @@ protected:
UINT8 m_collision_buffer[SEGA315_5124_WIDTH];
UINT8 m_palette_offset;
bool m_supports_224_240;
bool m_display_disabled;
UINT16 m_sprite_base;
int m_selected_sprite[8];
int m_sprite_count;