diff options
Diffstat (limited to 'src/mame/drivers/meritm.c')
-rw-r--r-- | src/mame/drivers/meritm.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index 0d4c661e02e..1d8a28e73f7 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -1038,68 +1038,68 @@ static TIMER_DEVICE_CALLBACK( vblank_end_tick ) } static MACHINE_CONFIG_START( meritm_crt250, driver_device ) - MDRV_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6) - MDRV_CPU_PROGRAM_MAP(meritm_crt250_map) - MDRV_CPU_IO_MAP(meritm_crt250_io_map) - MDRV_CPU_CONFIG(meritm_daisy_chain) - MDRV_CPU_VBLANK_INT_HACK(meritm_interrupt,262) + MCFG_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6) + MCFG_CPU_PROGRAM_MAP(meritm_crt250_map) + MCFG_CPU_IO_MAP(meritm_crt250_io_map) + MCFG_CPU_CONFIG(meritm_daisy_chain) + MCFG_CPU_VBLANK_INT_HACK(meritm_interrupt,262) - MDRV_MACHINE_START(meritm_crt250) + MCFG_MACHINE_START(meritm_crt250) - MDRV_PPI8255_ADD( "ppi8255", crt250_ppi8255_intf ) + MCFG_PPI8255_ADD( "ppi8255", crt250_ppi8255_intf ) - MDRV_Z80PIO_ADD( "z80pio_0", SYSTEM_CLK/6, meritm_audio_pio_intf ) - MDRV_Z80PIO_ADD( "z80pio_1", SYSTEM_CLK/6, meritm_io_pio_intf ) + MCFG_Z80PIO_ADD( "z80pio_0", SYSTEM_CLK/6, meritm_audio_pio_intf ) + MCFG_Z80PIO_ADD( "z80pio_1", SYSTEM_CLK/6, meritm_io_pio_intf ) - MDRV_TIMER_ADD_SCANLINE("vblank_start", vblank_start_tick, "screen", 259, 262) - MDRV_TIMER_ADD_SCANLINE("vblank_end", vblank_end_tick, "screen", 262, 262) + MCFG_TIMER_ADD_SCANLINE("vblank_start", vblank_start_tick, "screen", 259, 262) + MCFG_TIMER_ADD_SCANLINE("vblank_end", vblank_end_tick, "screen", 262, 262) - MDRV_NVRAM_ADD_0FILL("nvram") + MCFG_NVRAM_ADD_0FILL("nvram") - MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) + MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) - MDRV_SCREEN_ADD("screen",RASTER) - MDRV_SCREEN_REFRESH_RATE(60) - MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_ADD("screen",RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) - MDRV_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS) - MDRV_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1) - MDRV_PALETTE_LENGTH(512) + MCFG_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) + MCFG_SCREEN_SIZE(MSX2_TOTAL_XRES_PIXELS, MSX2_TOTAL_YRES_PIXELS) + MCFG_SCREEN_VISIBLE_AREA(MSX2_XBORDER_PIXELS - MSX2_VISIBLE_XBORDER_PIXELS, MSX2_TOTAL_XRES_PIXELS - MSX2_XBORDER_PIXELS + MSX2_VISIBLE_XBORDER_PIXELS - 1, MSX2_YBORDER_PIXELS - MSX2_VISIBLE_YBORDER_PIXELS, MSX2_TOTAL_YRES_PIXELS - MSX2_YBORDER_PIXELS + MSX2_VISIBLE_YBORDER_PIXELS - 1) + MCFG_PALETTE_LENGTH(512) - MDRV_PALETTE_INIT( v9938 ) + MCFG_PALETTE_INIT( v9938 ) - MDRV_VIDEO_START(meritm) - MDRV_VIDEO_UPDATE(meritm) + MCFG_VIDEO_START(meritm) + MCFG_VIDEO_UPDATE(meritm) /* sound hardware */ - MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("aysnd", AY8910, SYSTEM_CLK/12) - MDRV_SOUND_CONFIG(ay8910_config) - MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_SOUND_ADD("aysnd", AY8910, SYSTEM_CLK/12) + MCFG_SOUND_CONFIG(ay8910_config) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( meritm_crt250_questions, meritm_crt250 ) - MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_PROGRAM_MAP(meritm_crt250_questions_map) - MDRV_MACHINE_START(meritm_crt250_questions) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(meritm_crt250_questions_map) + MCFG_MACHINE_START(meritm_crt250_questions) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( meritm_crt250_crt252_crt258, meritm_crt250_questions ) - MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_IO_MAP(meritm_crt250_crt258_io_map) - MDRV_MACHINE_START(meritm_crt250_crt252_crt258) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_IO_MAP(meritm_crt250_crt258_io_map) + MCFG_MACHINE_START(meritm_crt250_crt252_crt258) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( meritm_crt260, meritm_crt250 ) - MDRV_CPU_MODIFY("maincpu") - MDRV_CPU_PROGRAM_MAP(meritm_map) - MDRV_CPU_IO_MAP(meritm_io_map) + MCFG_CPU_MODIFY("maincpu") + MCFG_CPU_PROGRAM_MAP(meritm_map) + MCFG_CPU_IO_MAP(meritm_io_map) - MDRV_PPI8255_RECONFIG( "ppi8255", crt260_ppi8255_intf ) + MCFG_PPI8255_RECONFIG( "ppi8255", crt260_ppi8255_intf ) - MDRV_WATCHDOG_TIME_INIT(MSEC(1200)) // DS1232, TD connected to VCC - MDRV_MACHINE_START(meritm_crt260) + MCFG_WATCHDOG_TIME_INIT(MSEC(1200)) // DS1232, TD connected to VCC + MCFG_MACHINE_START(meritm_crt260) MACHINE_CONFIG_END |