From e2d4b33f4cfae04d4069c94c620a0343d2011597 Mon Sep 17 00:00:00 2001 From: Michael Zapf Date: Sat, 23 Jan 2016 19:36:35 +0100 Subject: [PATCH] ti99/geneve: Removed legacy v9938 configuration. --- src/devices/bus/ti99x/videowrp.h | 12 ------------ src/mame/drivers/geneve.cpp | 10 ++++------ src/mame/drivers/ti99_4p.cpp | 10 ++++------ src/mame/drivers/ti99_4x.cpp | 10 ++++------ 4 files changed, 12 insertions(+), 30 deletions(-) diff --git a/src/devices/bus/ti99x/videowrp.h b/src/devices/bus/ti99x/videowrp.h index de08dfb3dce..cb339e9dd60 100644 --- a/src/devices/bus/ti99x/videowrp.h +++ b/src/devices/bus/ti99x/videowrp.h @@ -163,18 +163,6 @@ protected: MCFG_TMS9928A_SCREEN_ADD_PAL( SCREEN_TAG ) \ MCFG_SCREEN_UPDATE_DEVICE( VDP_TAG, tms9928a_device, screen_update ) -#define MCFG_TI_V9938_ADD(_tag, _rate, _screen, _blank, _x, _y, _class, _int) \ - MCFG_DEVICE_ADD(_tag, V9938VIDEO, 0) \ - MCFG_V9938_ADD(VDP_TAG, _screen, 0x20000, XTAL_21_4772MHz) /* typical 9938 clock, not verified */ \ - MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(_class, _int)) \ - MCFG_SCREEN_ADD(_screen, RASTER) \ - MCFG_SCREEN_REFRESH_RATE(_rate) \ - MCFG_SCREEN_UPDATE_DEVICE(VDP_TAG, v9938_device, screen_update) \ - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(_blank)) \ - MCFG_SCREEN_SIZE(_x, _y) \ - MCFG_SCREEN_VISIBLE_AREA(0, _x - 1, 0, _y - 1) \ - MCFG_SCREEN_PALETTE(VDP_TAG ":palette") - #define MCFG_TI_SOUND_94624_ADD(_tag) \ MCFG_DEVICE_ADD(_tag, TISOUND_94624, 0) diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp index 59775a8f130..60641d9da78 100644 --- a/src/mame/drivers/geneve.cpp +++ b/src/mame/drivers/geneve.cpp @@ -691,12 +691,10 @@ static MACHINE_CONFIG_START( geneve_60hz, geneve_state ) MCFG_TMS9995_DBIN_HANDLER( WRITELINE(geneve_state, dbin_line) ) // video hardware - // Although we should have a 60 Hz screen rate, we have to set it to 30 here. - // The reason is that that the number of screen lines is counted twice for the - // interlace mode, but in non-interlace modes only half of the lines are - // painted. Accordingly, the full set of lines is refreshed at 30 Hz, - // not 60 Hz. This should be fixed in the v9938 emulation. - MCFG_TI_V9938_ADD(VIDEO_SYSTEM_TAG, 30, SCREEN_TAG, 2500, 512+32, (212+28)*2, geneve_state, set_tms9901_INT2_from_v9938) + MCFG_DEVICE_ADD(VIDEO_SYSTEM_TAG, V9938VIDEO, 0) + MCFG_V9938_ADD(VDP_TAG, SCREEN_TAG, 0x20000, XTAL_21_4772MHz) /* typical 9938 clock, not verified */ + MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(geneve_state, set_tms9901_INT2_from_v9938)) + MCFG_V99X8_SCREEN_ADD_NTSC(SCREEN_TAG, VDP_TAG, XTAL_21_4772MHz) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", geneve_state, geneve_hblank_interrupt, SCREEN_TAG, 0, 1) /* 262.5 in 60Hz, 312.5 in 50Hz */ // Main board components diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp index f934677565e..0f48e57772b 100644 --- a/src/mame/drivers/ti99_4p.cpp +++ b/src/mame/drivers/ti99_4p.cpp @@ -861,12 +861,10 @@ static MACHINE_CONFIG_START( ti99_4p_60hz, ti99_4p_state ) MCFG_TMS99xx_CLKOUT_HANDLER( WRITELINE(ti99_4p_state, clock_out) ) /* video hardware */ - // Although we should have a 60 Hz screen rate, we have to set it to 30 here. - // The reason is that that the number of screen lines is counted twice for the - // interlace mode, but in non-interlace modes only half of the lines are - // painted. Accordingly, the full set of lines is refreshed at 30 Hz, - // not 60 Hz. This should be fixed in the v9938 emulation. - MCFG_TI_V9938_ADD(VIDEO_SYSTEM_TAG, 30, SCREEN_TAG, 2500, 512+32, (212+28)*2, ti99_4p_state, set_tms9901_INT2_from_v9938) + MCFG_DEVICE_ADD(VIDEO_SYSTEM_TAG, V9938VIDEO, 0) + MCFG_V9938_ADD(VDP_TAG, SCREEN_TAG, 0x20000, XTAL_21_4772MHz) /* typical 9938 clock, not verified */ + MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(ti99_4p_state, set_tms9901_INT2_from_v9938)) + MCFG_V99X8_SCREEN_ADD_NTSC(SCREEN_TAG, VDP_TAG, XTAL_21_4772MHz) // tms9901 MCFG_DEVICE_ADD(TMS9901_TAG, TMS9901, 3000000) diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp index 2d9e11f4dc2..b8fcb75b3cb 100644 --- a/src/mame/drivers/ti99_4x.cpp +++ b/src/mame/drivers/ti99_4x.cpp @@ -1055,12 +1055,10 @@ static MACHINE_CONFIG_START( ti99_4ev_60hz, ti99_4x_state ) MCFG_MACHINE_START_OVERRIDE(ti99_4x_state, ti99_4a ) /* video hardware */ - // Although we should have a 60 Hz screen rate, we have to set it to 30 here. - // The reason is that that the number of screen lines is counted twice for the - // interlace mode, but in non-interlace modes only half of the lines are - // painted. Accordingly, the full set of lines is refreshed at 30 Hz, - // not 60 Hz. This should be fixed in the v9938 emulation. - MCFG_TI_V9938_ADD(VIDEO_SYSTEM_TAG, 30, SCREEN_TAG, 2500, 512+32, (212+28)*2, ti99_4x_state, video_interrupt_in) + MCFG_DEVICE_ADD(VIDEO_SYSTEM_TAG, V9938VIDEO, 0) + MCFG_V9938_ADD(VDP_TAG, SCREEN_TAG, 0x20000, XTAL_21_4772MHz) /* typical 9938 clock, not verified */ + MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(ti99_4x_state, video_interrupt_in)) + MCFG_V99X8_SCREEN_ADD_NTSC(SCREEN_TAG, VDP_TAG, XTAL_21_4772MHz) /* Main board */ MCFG_DEVICE_ADD(TMS9901_TAG, TMS9901, 3000000)