diff options
Diffstat (limited to 'src/mame/drivers/sapi1.cpp')
-rw-r--r-- | src/mame/drivers/sapi1.cpp | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp index a1d57466d0c..f1bee7576da 100644 --- a/src/mame/drivers/sapi1.cpp +++ b/src/mame/drivers/sapi1.cpp @@ -626,26 +626,27 @@ void sapi1_state::init_sapizps3b() /* Machine driver */ -MACHINE_CONFIG_START(sapi1_state::sapi1) +void sapi1_state::sapi1(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD(m_maincpu, I8080A, 18_MHz_XTAL / 9) // Tesla MHB8080A + MHB8224 + MHB8228 - MCFG_DEVICE_PROGRAM_MAP(sapi1_mem) + I8080A(config, m_maincpu, 18_MHz_XTAL / 9); // Tesla MHB8080A + MHB8224 + MHB8228 + m_maincpu->set_addrmap(AS_PROGRAM, &sapi1_state::sapi1_mem); MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapi1) /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(50) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ - MCFG_SCREEN_SIZE(40*6, 24*9) - MCFG_SCREEN_VISIBLE_AREA(0, 40*6-1, 0, 24*9-1) - MCFG_SCREEN_UPDATE_DRIVER(sapi1_state, screen_update_sapi1) - MCFG_SCREEN_PALETTE(m_palette) + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(50); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ + screen.set_size(40*6, 24*9); + screen.set_visarea(0, 40*6-1, 0, 24*9-1); + screen.set_screen_update(FUNC(sapi1_state::screen_update_sapi1)); + screen.set_palette(m_palette); PALETTE(config, m_palette, palette_device::MONOCHROME); /* internal ram */ RAM(config, RAM_TAG).set_default_size("64K"); -MACHINE_CONFIG_END +} void sapi1_state::sapi2(machine_config &config) { @@ -657,25 +658,26 @@ void sapi1_state::sapi2(machine_config &config) keyboard.set_keyboard_callback(FUNC(sapi1_state::kbd_put)); } -MACHINE_CONFIG_START(sapi1_state::sapi3) +void sapi1_state::sapi3(machine_config &config) +{ sapi2(config); /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(sapi3_mem) - MCFG_DEVICE_IO_MAP(sapi3_io) + m_maincpu->set_addrmap(AS_PROGRAM, &sapi1_state::sapi3_mem); + m_maincpu->set_addrmap(AS_IO, &sapi1_state::sapi3_io); MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapizps3 ) - MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_SIZE(40*6, 20*9) - MCFG_SCREEN_VISIBLE_AREA(0, 40*6-1, 0, 20*9-1) - MCFG_SCREEN_UPDATE_DRIVER(sapi1_state, screen_update_sapi3) -MACHINE_CONFIG_END -MACHINE_CONFIG_START(sapi1_state::sapi3b) + screen_device &screen(*subdevice<screen_device>("screen")); + screen.set_size(40*6, 20*9); + screen.set_visarea(0, 40*6-1, 0, 20*9-1); + screen.set_screen_update(FUNC(sapi1_state::screen_update_sapi3)); +} + +void sapi1_state::sapi3b(machine_config &config) +{ sapi3(config); /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(sapi3b_mem) - MCFG_DEVICE_IO_MAP(sapi3b_io) + m_maincpu->set_addrmap(AS_PROGRAM, &sapi1_state::sapi3b_mem); + m_maincpu->set_addrmap(AS_IO, &sapi1_state::sapi3b_io); mc6845_device &crtc(MC6845(config, "crtc", 1008000)); // guess crtc.set_screen("screen"); @@ -683,10 +685,9 @@ MACHINE_CONFIG_START(sapi1_state::sapi3b) crtc.set_char_width(6); crtc.set_update_row_callback(FUNC(sapi1_state::crtc_update_row), this); - MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) - MCFG_SCREEN_NO_PALETTE -MACHINE_CONFIG_END + subdevice<screen_device>("screen")->set_screen_update("crtc", FUNC(mc6845_device::screen_update)); + subdevice<screen_device>("screen")->set_palette(finder_base::DUMMY_TAG); +} static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 ) @@ -697,11 +698,12 @@ static DEVICE_INPUT_DEFAULTS_START( terminal ) DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 ) DEVICE_INPUT_DEFAULTS_END -MACHINE_CONFIG_START(sapi1_state::sapi3a) +void sapi1_state::sapi3a(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", I8080A, 18_MHz_XTAL / 9) // Tesla MHB8080A + MHB8224 + MHB8228 - MCFG_DEVICE_PROGRAM_MAP(sapi3a_mem) - MCFG_DEVICE_IO_MAP(sapi3a_io) + I8080A(config, m_maincpu, 18_MHz_XTAL / 9); // Tesla MHB8080A + MHB8224 + MHB8228 + m_maincpu->set_addrmap(AS_PROGRAM, &sapi1_state::sapi3a_mem); + m_maincpu->set_addrmap(AS_IO, &sapi1_state::sapi3a_io); MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapizps3 ) /* video hardware */ @@ -718,9 +720,7 @@ MACHINE_CONFIG_START(sapi1_state::sapi3a) /* internal ram */ RAM(config, RAM_TAG).set_default_size("64K"); -MACHINE_CONFIG_END - - +} /************************************** |