diff options
Diffstat (limited to 'src/mame/drivers/igs017.cpp')
-rw-r--r-- | src/mame/drivers/igs017.cpp | 297 |
1 files changed, 150 insertions, 147 deletions
diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp index 55f846f3e4b..94d3949100b 100644 --- a/src/mame/drivers/igs017.cpp +++ b/src/mame/drivers/igs017.cpp @@ -596,12 +596,12 @@ private: void decrypted_opcodes_map(address_map &map); void iqblocka_io(address_map &map); void iqblocka_map(address_map &map); - void lhzb2_map(address_map &map); - void lhzb2a_map(address_map &map); - void mgcs_map(address_map &map); + void lhzb2(address_map &map); + void lhzb2a(address_map &map); + void mgcs(address_map &map); void mgdha_map(address_map &map); - void sdmg2_map(address_map &map); - void slqz2_map(address_map &map); + void sdmg2(address_map &map); + void slqz2(address_map &map); void spkrform_io(address_map &map); void spkrform_map(address_map &map); void tjsb_io(address_map &map); @@ -1812,7 +1812,7 @@ READ8_MEMBER(igs017_state::mgcs_keys_r) return 0xff; } -void igs017_state::mgcs_map(address_map &map) +void igs017_state::mgcs(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x300000, 0x303fff).ram(); @@ -1895,7 +1895,7 @@ READ16_MEMBER(igs017_state::sdmg2_magic_r) return 0xffff; } -void igs017_state::sdmg2_map(address_map &map) +void igs017_state::sdmg2(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x1f0000, 0x1fffff).ram(); @@ -2202,7 +2202,7 @@ READ16_MEMBER(igs017_state::lhzb2_magic_r) return 0xffff; } -void igs017_state::lhzb2_map(address_map &map) +void igs017_state::lhzb2(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x500000, 0x503fff).ram(); @@ -2297,7 +2297,7 @@ WRITE16_MEMBER(igs017_state::lhzb2a_input_select_w) } } -void igs017_state::lhzb2a_map(address_map &map) +void igs017_state::lhzb2a(address_map &map) { map(0x000000, 0x07ffff).rom(); @@ -2368,7 +2368,7 @@ READ16_MEMBER(igs017_state::slqz2_magic_r) return 0xffff; } -void igs017_state::slqz2_map(address_map &map) +void igs017_state::slqz2(address_map &map) { map(0x000000, 0x07ffff).rom(); map(0x100000, 0x103fff).ram(); @@ -3516,12 +3516,11 @@ MACHINE_RESET_MEMBER(igs017_state,iqblocka) m_input_select = 0; } -void igs017_state::iqblocka(machine_config &config) -{ - Z180(config, m_maincpu, XTAL(16'000'000) / 2); - m_maincpu->set_addrmap(AS_PROGRAM, &igs017_state::iqblocka_map); - m_maincpu->set_addrmap(AS_IO, &igs017_state::iqblocka_io); - TIMER(config, "scantimer").configure_scanline(FUNC(igs017_state::iqblocka_interrupt), "screen", 0, 1); +MACHINE_CONFIG_START(igs017_state::iqblocka) + MCFG_DEVICE_ADD("maincpu", Z180, XTAL(16'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(iqblocka_map) + MCFG_DEVICE_IO_MAP(iqblocka_io) + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1) MCFG_MACHINE_RESET_OVERRIDE(igs017_state,iqblocka) @@ -3547,13 +3546,13 @@ void igs017_state::iqblocka(machine_config &config) IGS_INCDEC(config, m_igs_incdec, 0); // video - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(512, 256); - m_screen->set_visarea(0, 512-1, 0, 240-1); - m_screen->set_screen_update(FUNC(igs017_state::screen_update_igs017)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) + MCFG_SCREEN_UPDATE_DRIVER(igs017_state, screen_update_igs017) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 0x100*2); @@ -3562,10 +3561,12 @@ void igs017_state::iqblocka(machine_config &config) // sound SPEAKER(config, "mono").front_center(); - YM2413(config, "ymsnd", XTAL(3'579'545)).add_route(ALL_OUTPUTS, "mono", 0.5); + MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545)) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) - OKIM6295(config, m_oki, XTAL(16'000'000) / 16, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.5); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(16'000'000) / 16, okim6295_device::PIN7_HIGH) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) +MACHINE_CONFIG_END void igs017_state::iqblockf(machine_config &config) { @@ -3586,11 +3587,11 @@ void igs017_state::genius6(machine_config &config) m_igs_bitswap->set_m3_bits(3, 3, ~5, ~6, ~15); } -void igs017_state::starzan(machine_config &config) -{ +MACHINE_CONFIG_START(igs017_state::starzan) iqblocka(config); - m_maincpu->set_addrmap(AS_OPCODES, &igs017_state::decrypted_opcodes_map); -} + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_OPCODES_MAP(decrypted_opcodes_map) +MACHINE_CONFIG_END // mgcs @@ -3614,11 +3615,10 @@ MACHINE_RESET_MEMBER(igs017_state,mgcs) memset(m_igs_magic, 0, sizeof(m_igs_magic)); } -void igs017_state::mgcs(machine_config &config) -{ - M68000(config, m_maincpu, XTAL(22'000'000) / 2); - m_maincpu->set_addrmap(AS_PROGRAM, &igs017_state::mgcs_map); - TIMER(config, "scantimer").configure_scanline(FUNC(igs017_state::mgcs_interrupt), "screen", 0, 1); +MACHINE_CONFIG_START(igs017_state::mgcs) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(mgcs) + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) @@ -3627,16 +3627,16 @@ void igs017_state::mgcs(machine_config &config) ppi.in_pa_callback().set_ioport("COINS"); ppi.in_pb_callback().set(FUNC(igs017_state::mgcs_keys_r)); - TICKET_DISPENSER(config, m_hopperdev, attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ); + MCFG_TICKET_DISPENSER_ADD("hopper", attotime::from_msec(50), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW ) // video - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(512, 256); - m_screen->set_visarea(0, 512-1, 0, 240-1); - m_screen->set_screen_update(FUNC(igs017_state::screen_update_igs017)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) + MCFG_SCREEN_UPDATE_DRIVER(igs017_state, screen_update_igs017) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 0x100*2); @@ -3646,17 +3646,17 @@ void igs017_state::mgcs(machine_config &config) // sound SPEAKER(config, "mono").front_center(); - OKIM6295(config, m_oki, XTAL(8'000'000) / 8, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.5); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(8'000'000) / 8, okim6295_device::PIN7_HIGH) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) +MACHINE_CONFIG_END // lhzb2 -void igs017_state::lhzb2(machine_config &config) -{ - M68000(config, m_maincpu, XTAL(22'000'000) / 2); - m_maincpu->set_addrmap(AS_PROGRAM, &igs017_state::lhzb2_map); - TIMER(config, "scantimer").configure_scanline(FUNC(igs017_state::mgcs_interrupt), "screen", 0, 1); +MACHINE_CONFIG_START(igs017_state::lhzb2) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(lhzb2) + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) @@ -3673,13 +3673,13 @@ void igs017_state::lhzb2(machine_config &config) IGS022(config, m_igs022, 0); // video - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(512, 256); - m_screen->set_visarea(0, 512-1, 0, 240-1); - m_screen->set_screen_update(FUNC(igs017_state::screen_update_igs017)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) + MCFG_SCREEN_UPDATE_DRIVER(igs017_state, screen_update_igs017) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 0x100*2); @@ -3689,8 +3689,9 @@ void igs017_state::lhzb2(machine_config &config) // sound SPEAKER(config, "mono").front_center(); - OKIM6295(config, m_oki, XTAL(8'000'000) / 8, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.5); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(8'000'000) / 8, okim6295_device::PIN7_HIGH) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) +MACHINE_CONFIG_END // lhzb2a @@ -3701,11 +3702,10 @@ MACHINE_RESET_MEMBER(igs017_state,lhzb2a) lhzb2a_remap_addr_w(m_maincpu->space(AS_PROGRAM), 0, 0xf0); } -void igs017_state::lhzb2a(machine_config &config) -{ - M68000(config, m_maincpu, XTAL(22'000'000) / 2); - m_maincpu->set_addrmap(AS_PROGRAM, &igs017_state::lhzb2a_map); - TIMER(config, "scantimer").configure_scanline(FUNC(igs017_state::mgcs_interrupt), "screen", 0, 1); +MACHINE_CONFIG_START(igs017_state::lhzb2a) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000)/2) + MCFG_DEVICE_PROGRAM_MAP(lhzb2a) + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) MCFG_MACHINE_RESET_OVERRIDE(igs017_state,lhzb2a) @@ -3724,13 +3724,13 @@ void igs017_state::lhzb2a(machine_config &config) IGS_INCDEC(config, m_igs_incdec, 0); // video - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); // VSync 60Hz, HSync 15.3kHz - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(512, 256); - m_screen->set_visarea(0, 512-1, 0, 256-16-1); - m_screen->set_screen_update(FUNC(igs017_state::screen_update_igs017)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) // VSync 60Hz, HSync 15.3kHz + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-1) + MCFG_SCREEN_UPDATE_DRIVER(igs017_state, screen_update_igs017) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 0x100*2); @@ -3740,17 +3740,17 @@ void igs017_state::lhzb2a(machine_config &config) // sound SPEAKER(config, "mono").front_center(); - OKIM6295(config, m_oki, XTAL(22'000'000) / 22, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.5); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(22'000'000) / 22, okim6295_device::PIN7_HIGH) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) +MACHINE_CONFIG_END // slqz2 -void igs017_state::slqz2(machine_config &config) -{ - M68000(config, m_maincpu, XTAL(22'000'000) / 2); - m_maincpu->set_addrmap(AS_PROGRAM, &igs017_state::slqz2_map); - TIMER(config, "scantimer").configure_scanline(FUNC(igs017_state::mgcs_interrupt), "screen", 0, 1); +MACHINE_CONFIG_START(igs017_state::slqz2) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(slqz2) + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) @@ -3767,13 +3767,13 @@ void igs017_state::slqz2(machine_config &config) IGS022(config, m_igs022, 0); // video - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(512, 256); - m_screen->set_visarea(0, 512-1, 0, 240-1); - m_screen->set_screen_update(FUNC(igs017_state::screen_update_igs017)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) + MCFG_SCREEN_UPDATE_DRIVER(igs017_state, screen_update_igs017) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 0x100*2); @@ -3783,17 +3783,17 @@ void igs017_state::slqz2(machine_config &config) // sound SPEAKER(config, "mono").front_center(); - OKIM6295(config, m_oki, XTAL(8'000'000) / 8, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.5); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(8'000'000) / 8, okim6295_device::PIN7_HIGH) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) +MACHINE_CONFIG_END // sdmg2 -void igs017_state::sdmg2(machine_config &config) -{ - M68000(config, m_maincpu, XTAL(22'000'000) / 2); - m_maincpu->set_addrmap(AS_PROGRAM, &igs017_state::sdmg2_map); - TIMER(config, "scantimer").configure_scanline(FUNC(igs017_state::mgcs_interrupt), "screen", 0, 1); +MACHINE_CONFIG_START(igs017_state::sdmg2) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000)/2) + MCFG_DEVICE_PROGRAM_MAP(sdmg2) + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgcs_interrupt, "screen", 0, 1) MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) @@ -3803,13 +3803,13 @@ void igs017_state::sdmg2(machine_config &config) ppi.in_pb_callback().set_ioport("DSW2"); // video - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); // VSync 60Hz, HSync 15.3kHz - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(512, 256); - m_screen->set_visarea(0, 512-1, 0, 256-16-1); - m_screen->set_screen_update(FUNC(igs017_state::screen_update_igs017)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) // VSync 60Hz, HSync 15.3kHz + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-1) + MCFG_SCREEN_UPDATE_DRIVER(igs017_state, screen_update_igs017) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 0x100*2); @@ -3818,8 +3818,9 @@ void igs017_state::sdmg2(machine_config &config) // sound SPEAKER(config, "mono").front_center(); - OKIM6295(config, m_oki, XTAL(22'000'000) / 22, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.5); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(22'000'000) / 22, okim6295_device::PIN7_HIGH) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) +MACHINE_CONFIG_END // mgdh @@ -3835,11 +3836,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(igs017_state::mgdh_interrupt) m_maincpu->set_input_line(3, HOLD_LINE); // lev 3 instead of 2 } -void igs017_state::mgdha(machine_config &config) -{ - M68000(config, m_maincpu, XTAL(22'000'000) / 2); - m_maincpu->set_addrmap(AS_PROGRAM, &igs017_state::mgdha_map); - TIMER(config, "scantimer").configure_scanline(FUNC(igs017_state::mgdh_interrupt), "screen", 0, 1); +MACHINE_CONFIG_START(igs017_state::mgdha) + MCFG_DEVICE_ADD("maincpu", M68000, XTAL(22'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(mgdha_map) + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, mgdh_interrupt, "screen", 0, 1) MCFG_MACHINE_RESET_OVERRIDE(igs017_state,mgcs) @@ -3848,13 +3848,13 @@ void igs017_state::mgdha(machine_config &config) ppi.in_pa_callback().set_ioport("DSW1"); // video - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(512, 256); - m_screen->set_visarea(0, 512-1, 0, 256-16-1); - m_screen->set_screen_update(FUNC(igs017_state::screen_update_igs017)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 256-16-1) + MCFG_SCREEN_UPDATE_DRIVER(igs017_state, screen_update_igs017) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 0x100*2); @@ -3863,18 +3863,18 @@ void igs017_state::mgdha(machine_config &config) // sound SPEAKER(config, "mono").front_center(); - OKIM6295(config, m_oki, XTAL(22'000'000) / 22, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.5); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(22'000'000) / 22, okim6295_device::PIN7_HIGH) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) +MACHINE_CONFIG_END // tjsb -void igs017_state::tjsb(machine_config &config) -{ - Z180(config, m_maincpu, XTAL(16'000'000) / 2); - m_maincpu->set_addrmap(AS_PROGRAM, &igs017_state::tjsb_map); - m_maincpu->set_addrmap(AS_IO, &igs017_state::tjsb_io); - TIMER(config, "scantimer").configure_scanline(FUNC(igs017_state::iqblocka_interrupt), "screen", 0, 1); +MACHINE_CONFIG_START(igs017_state::tjsb) + MCFG_DEVICE_ADD("maincpu", Z180, XTAL(16'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(tjsb_map) + MCFG_DEVICE_IO_MAP(tjsb_io) + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1) MCFG_MACHINE_RESET_OVERRIDE(igs017_state,iqblocka) @@ -3885,13 +3885,13 @@ void igs017_state::tjsb(machine_config &config) ppi.in_pc_callback().set_ioport("DSW3"); // video - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(512, 256); - m_screen->set_visarea(0, 512-1, 0, 240-1); - m_screen->set_screen_update(FUNC(igs017_state::screen_update_igs017)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) + MCFG_SCREEN_UPDATE_DRIVER(igs017_state, screen_update_igs017) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette).set_format(palette_device::xRGB_555, 0x100*2); @@ -3901,20 +3901,21 @@ void igs017_state::tjsb(machine_config &config) // sound SPEAKER(config, "mono").front_center(); - YM2413(config, "ymsnd", XTAL(3'579'545)).add_route(ALL_OUTPUTS, "mono", 0.5); + MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545)) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) - OKIM6295(config, m_oki, XTAL(16'000'000) / 16, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.5); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(16'000'000) / 16, okim6295_device::PIN7_HIGH) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) +MACHINE_CONFIG_END // spkrform -void igs017_state::spkrform(machine_config &config) -{ - Z180(config, m_maincpu, XTAL(16'000'000) / 2); - m_maincpu->set_addrmap(AS_PROGRAM, &igs017_state::spkrform_map); - m_maincpu->set_addrmap(AS_IO, &igs017_state::spkrform_io); - TIMER(config, "scantimer").configure_scanline(FUNC(igs017_state::iqblocka_interrupt), "screen", 0, 1); +MACHINE_CONFIG_START(igs017_state::spkrform) + MCFG_DEVICE_ADD("maincpu", Z180, XTAL(16'000'000) / 2) + MCFG_DEVICE_PROGRAM_MAP(spkrform_map) + MCFG_DEVICE_IO_MAP(spkrform_io) + MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", igs017_state, iqblocka_interrupt, "screen", 0, 1) MCFG_MACHINE_RESET_OVERRIDE(igs017_state,iqblocka) @@ -3925,13 +3926,13 @@ void igs017_state::spkrform(machine_config &config) ppi.in_pc_callback().set_ioport("DSW3"); // video - SCREEN(config, m_screen, SCREEN_TYPE_RASTER); - m_screen->set_refresh_hz(60); - m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0)); - m_screen->set_size(512, 256); - m_screen->set_visarea(0, 512-1, 0, 240-1); - m_screen->set_screen_update(FUNC(igs017_state::screen_update_igs017)); - m_screen->set_palette(m_palette); + MCFG_SCREEN_ADD("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(60) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) + MCFG_SCREEN_SIZE(512, 256) + MCFG_SCREEN_VISIBLE_AREA(0, 512-1, 0, 240-1) + MCFG_SCREEN_UPDATE_DRIVER(igs017_state, screen_update_igs017) + MCFG_SCREEN_PALETTE(m_palette) PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x100*2); @@ -3940,10 +3941,12 @@ void igs017_state::spkrform(machine_config &config) // sound SPEAKER(config, "mono").front_center(); - YM2413(config, "ymsnd", XTAL(3'579'545)).add_route(ALL_OUTPUTS, "mono", 0.5); + MCFG_DEVICE_ADD("ymsnd", YM2413, XTAL(3'579'545)) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) - OKIM6295(config, m_oki, XTAL(16'000'000) / 16, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.5); -} + MCFG_DEVICE_ADD("oki", OKIM6295, XTAL(16'000'000) / 16, okim6295_device::PIN7_HIGH) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) +MACHINE_CONFIG_END /*************************************************************************** |