From 4f42cd81dabcf2b25792428c6c023a1cf24d7319 Mon Sep 17 00:00:00 2001 From: Wilbert Pol Date: Thu, 30 Jul 2015 12:17:15 +0200 Subject: [PATCH] v9938: added clock to device configuration. (nw) --- src/emu/bus/a2bus/ezcgi.c | 4 ++-- src/emu/video/v9938.h | 8 ++++---- src/mame/drivers/big10.c | 2 +- src/mame/drivers/csplayh5.c | 2 +- src/mame/drivers/kas89.c | 2 +- src/mame/drivers/kurukuru.c | 2 +- src/mame/drivers/meritm.c | 4 ++-- src/mame/drivers/sangho.c | 4 ++-- src/mame/drivers/sfkick.c | 2 +- src/mame/drivers/sothello.c | 3 ++- src/mame/drivers/tonton.c | 2 +- src/mess/drivers/msx.c | 4 ++-- src/mess/machine/ti99/videowrp.h | 2 +- 13 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/emu/bus/a2bus/ezcgi.c b/src/emu/bus/a2bus/ezcgi.c index c943f3cd979..e85db228ad2 100644 --- a/src/emu/bus/a2bus/ezcgi.c +++ b/src/emu/bus/a2bus/ezcgi.c @@ -45,7 +45,7 @@ MACHINE_CONFIG_END #define MSX2_VISIBLE_YBORDER_PIXELS 14 * 2 MACHINE_CONFIG_FRAGMENT( ezcgi9938 ) - MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000) // 192K of VRAM + MCFG_V9938_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typical 9938 clock, not verified MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9938_device, tms_irq_w)) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) @@ -59,7 +59,7 @@ MACHINE_CONFIG_FRAGMENT( ezcgi9938 ) MACHINE_CONFIG_END MACHINE_CONFIG_FRAGMENT( ezcgi9958 ) - MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000) // 192K of VRAM + MCFG_V9958_ADD(TMS_TAG, SCREEN_TAG, 0x30000, XTAL_21_4772MHz) // 192K of VRAM / typcial 9938/9958 clock, not verified MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(a2bus_ezcgi_9958_device, tms_irq_w)) MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h index 1393765ace3..4430c2ba4d5 100644 --- a/src/emu/video/v9938.h +++ b/src/emu/video/v9938.h @@ -17,12 +17,12 @@ // DEVICE CONFIGURATION MACROS //************************************************************************** -#define MCFG_V9938_ADD(_tag, _screen, _vramsize) \ - MCFG_DEVICE_ADD(_tag, V9938, 0) \ +#define MCFG_V9938_ADD(_tag, _screen, _vramsize, _clock) \ + MCFG_DEVICE_ADD(_tag, V9938, _clock) \ MCFG_VIDEO_SET_SCREEN(_screen) \ v9938_device::static_set_vram_size(*device, _vramsize); -#define MCFG_V9958_ADD(_tag, _screen, _vramsize) \ - MCFG_DEVICE_ADD(_tag, V9958, 0) \ +#define MCFG_V9958_ADD(_tag, _screen, _vramsize, _clock) \ + MCFG_DEVICE_ADD(_tag, V9958, _clock) \ MCFG_VIDEO_SET_SCREEN(_screen) \ v9938_device::static_set_vram_size(*device, _vramsize); diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c index ee763a08b45..e72d2d8eae8 100644 --- a/src/mame/drivers/big10.c +++ b/src/mame/drivers/big10.c @@ -244,7 +244,7 @@ static MACHINE_CONFIG_START( big10, big10_state ) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_V9938_ADD("v9938", "screen", VDP_MEM) + MCFG_V9938_ADD("v9938", "screen", VDP_MEM, MASTER_CLOCK) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(big10_state, big10_vdp_interrupt)) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c index 734fc060e2c..914c0de6bae 100644 --- a/src/mame/drivers/csplayh5.c +++ b/src/mame/drivers/csplayh5.c @@ -484,7 +484,7 @@ static MACHINE_CONFIG_START( csplayh5, csplayh5_state ) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_V9958_ADD("v9958", "screen", 0x20000) + MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL_21_4772MHz) // typical 9958 clock, not verified MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(csplayh5_state, csplayh5_vdp0_interrupt)) MCFG_SCREEN_ADD("screen",RASTER) diff --git a/src/mame/drivers/kas89.c b/src/mame/drivers/kas89.c index e7a2de7eb93..7c7d4bf1919 100644 --- a/src/mame/drivers/kas89.c +++ b/src/mame/drivers/kas89.c @@ -765,7 +765,7 @@ static MACHINE_CONFIG_START( kas89, kas89_state ) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_V9938_ADD("v9938", "screen", VDP_MEM) + MCFG_V9938_ADD("v9938", "screen", VDP_MEM, MASTER_CLOCK) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(kas89_state,kas89_vdp_interrupt)) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/kurukuru.c b/src/mame/drivers/kurukuru.c index 048fe8d335a..346924720b2 100644 --- a/src/mame/drivers/kurukuru.c +++ b/src/mame/drivers/kurukuru.c @@ -554,7 +554,7 @@ static MACHINE_CONFIG_START( kurukuru, kurukuru_state ) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_V9938_ADD("v9938", "screen", VDP_MEM) + MCFG_V9938_ADD("v9938", "screen", VDP_MEM, MAIN_CLOCK) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(kurukuru_state,kurukuru_vdp_interrupt)) MCFG_SCREEN_ADD("screen",RASTER) diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 07070eadf40..dc9037af4d3 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -1122,10 +1122,10 @@ static MACHINE_CONFIG_START( meritm_crt250, meritm_state ) MCFG_DS1204_ADD("ds1204") - MCFG_V9938_ADD("v9938_0", "screen", 0x20000) + MCFG_V9938_ADD("v9938_0", "screen", 0x20000, SYSTEM_CLK) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(meritm_state,meritm_vdp0_interrupt)) - MCFG_V9938_ADD("v9938_1", "screen", 0x20000) + MCFG_V9938_ADD("v9938_1", "screen", 0x20000, SYSTEM_CLK) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(meritm_state,meritm_vdp1_interrupt)) MCFG_SCREEN_ADD("screen",RASTER) diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c index b4f92abb09b..863194c7dc8 100644 --- a/src/mame/drivers/sangho.c +++ b/src/mame/drivers/sangho.c @@ -456,7 +456,7 @@ static MACHINE_CONFIG_START( pzlestar, sangho_state ) MCFG_CPU_IO_MAP(pzlestar_io_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sangho_state, sangho_interrupt, "screen", 0, 1) - MCFG_V9958_ADD("v9958", "screen", 0x20000) + MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL_21_4772MHz) // typical 9958 clock, not verified MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(sangho_state,msx_vdp_interrupt)) MCFG_SCREEN_ADD("screen", RASTER) @@ -484,7 +484,7 @@ static MACHINE_CONFIG_START( sexyboom, sangho_state ) MCFG_CPU_IO_MAP(sexyboom_io_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", sangho_state, sangho_interrupt, "screen", 0, 1) - MCFG_V9958_ADD("v9958", "screen", 0x20000) + MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL_21_4772MHz) // typical 9958 clock, not verified MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(sangho_state,msx_vdp_interrupt)) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index cd6e4bbed66..bb6b52d866e 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -470,7 +470,7 @@ static MACHINE_CONFIG_START( sfkick, sfkick_state ) MCFG_CPU_PROGRAM_MAP(sfkick_sound_map) MCFG_CPU_IO_MAP(sfkick_sound_io_map) - MCFG_V9938_ADD("v9938", "screen", 0x80000) + MCFG_V9938_ADD("v9938", "screen", 0x80000, MASTER_CLOCK) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(sfkick_state,sfkick_vdp_interrupt)) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c index 17d0684ed44..5305fc60ced 100644 --- a/src/mame/drivers/sothello.c +++ b/src/mame/drivers/sothello.c @@ -92,6 +92,7 @@ public: #define VDP_MEM 0x40000 +#define MAIN_CLOCK (XTAL_21_4772MHz) #define MAINCPU_CLOCK (XTAL_21_4772MHz/6) #define SOUNDCPU_CLOCK (XTAL_21_4772MHz/6) #define YM_CLOCK (XTAL_21_4772MHz/12) @@ -369,7 +370,7 @@ static MACHINE_CONFIG_START( sothello, sothello_state ) MCFG_QUANTUM_TIME(attotime::from_hz(600)) /* video hardware */ - MCFG_V9938_ADD("v9938", "screen", VDP_MEM) + MCFG_V9938_ADD("v9938", "screen", VDP_MEM, MAIN_CLOCK) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(sothello_state,sothello_vdp_interrupt)) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/tonton.c b/src/mame/drivers/tonton.c index 204d1bec059..9747e06c20d 100644 --- a/src/mame/drivers/tonton.c +++ b/src/mame/drivers/tonton.c @@ -245,7 +245,7 @@ static MACHINE_CONFIG_START( tonton, tonton_state ) /* video hardware */ - MCFG_V9938_ADD("v9938", "screen", VDP_MEM) + MCFG_V9938_ADD("v9938", "screen", VDP_MEM, MAIN_CLOCK) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(tonton_state,tonton_vdp0_interrupt)) MCFG_SCREEN_ADD("screen",RASTER) diff --git a/src/mess/drivers/msx.c b/src/mess/drivers/msx.c index 5827edb4e6c..1e7688d2af2 100644 --- a/src/mess/drivers/msx.c +++ b/src/mess/drivers/msx.c @@ -1500,7 +1500,7 @@ static MACHINE_CONFIG_START( msx2, msx_state ) MCFG_I8255_OUT_PORTC_CB(WRITE8(msx_state, msx_ppi_port_c_w)) /* video hardware */ - MCFG_V9938_ADD("v9938", "screen", 0x20000) + MCFG_V9938_ADD("v9938", "screen", 0x20000, XTAL_21_4772MHz) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(msx_state,msx_irq_source0)) MCFG_SCREEN_ADD("screen", RASTER) @@ -1565,7 +1565,7 @@ static MACHINE_CONFIG_START( msx2p, msx_state ) MCFG_I8255_OUT_PORTC_CB(WRITE8(msx_state, msx_ppi_port_c_w)) /* video hardware */ - MCFG_V9958_ADD("v9958", "screen", 0x20000) + MCFG_V9958_ADD("v9958", "screen", 0x20000, XTAL_21_4772MHz) MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(msx_state,msx_irq_source0)) MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mess/machine/ti99/videowrp.h b/src/mess/machine/ti99/videowrp.h index 3de151e92ff..c38a8e7f152 100644 --- a/src/mess/machine/ti99/videowrp.h +++ b/src/mess/machine/ti99/videowrp.h @@ -165,7 +165,7 @@ protected: #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) \ + 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) \