diff options
author | mooglyguy <therealmogminer@gmail.com> | 2019-01-04 04:42:47 +0100 |
---|---|---|
committer | mooglyguy <therealmogminer@gmail.com> | 2019-01-04 04:46:31 +0100 |
commit | 76effa7a281ade788a8ba0ed858035062d08801a (patch) | |
tree | eebed9a2f19355f8ffdd60bd062b74a1031829cd /src/mame/drivers/ojankohs.cpp | |
parent | 6327ec1330c644da5c251aa86d143e3379c1a391 (diff) |
-sound/msm5205: Removed MCFG macros, nw
-drivers/jantotsu, joctronic, jp, kchamp, klax, kungfur, kurukuru, lucky74, lwings, mermaid, mgavegas, mitchell, mjkjidai, ojankohs, opwolf, pachifev, pcktgal, rastan, rmhaihai, sf, sothello, srmp2, suprgolf, system16, taito_log, tehkanwc, topspeed, trackfld, tubep, wacky_gator, wc90b, yunsung8: Removed MACHINE_CONFIG macros, nw
-machine/pce_cd: Removed MACHINE_CONFIG macro, nw
Diffstat (limited to 'src/mame/drivers/ojankohs.cpp')
-rw-r--r-- | src/mame/drivers/ojankohs.cpp | 148 |
1 files changed, 76 insertions, 72 deletions
diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp index 07afdc92e42..4b7dcf5c11f 100644 --- a/src/mame/drivers/ojankohs.cpp +++ b/src/mame/drivers/ojankohs.cpp @@ -712,25 +712,26 @@ void ojankohs_state::machine_reset() m_screen_refresh = 0; } -MACHINE_CONFIG_START(ojankohs_state::ojankohs) - +void ojankohs_state::ojankohs(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */ - MCFG_DEVICE_PROGRAM_MAP(ojankohs_map) - MCFG_DEVICE_IO_MAP(ojankohs_io_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold) + Z80(config, m_maincpu, 12000000/2); /* 6.00 MHz ? */ + m_maincpu->set_addrmap(AS_PROGRAM, &ojankohs_state::ojankohs_map); + m_maincpu->set_addrmap(AS_IO, &ojankohs_state::ojankohs_io_map); + m_maincpu->set_vblank_int("screen", FUNC(ojankohs_state::irq0_line_hold)); MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankohs) + NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(512, 512) - MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-1) - MCFG_SCREEN_UPDATE_DRIVER(ojankohs_state, screen_update_ojankohs) - MCFG_SCREEN_PALETTE(m_palette) + 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, 512); + m_screen->set_visarea(0, 288-1, 0, 224-1); + m_screen->set_screen_update(FUNC(ojankohs_state::screen_update_ojankohs)); + m_screen->set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_ojankohs); PALETTE(config, m_palette).set_entries(1024); @@ -747,31 +748,32 @@ MACHINE_CONFIG_START(ojankohs_state::ojankohs) aysnd.port_b_read_callback().set(FUNC(ojankohs_state::ojankohs_dipsw2_r)); aysnd.add_route(ALL_OUTPUTS, "mono", 0.15); - MCFG_DEVICE_ADD("msm", MSM5205, 384000) - MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */ - MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(ojankohs_state::ojankoy) + MSM5205(config, m_msm, 384000); + m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); +} +void ojankohs_state::ojankoy(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */ - MCFG_DEVICE_PROGRAM_MAP(ojankoy_map) - MCFG_DEVICE_IO_MAP(ojankoy_io_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold) + Z80(config, m_maincpu, 12000000/2); /* 6.00 MHz ? */ + m_maincpu->set_addrmap(AS_PROGRAM, &ojankohs_state::ojankoy_map); + m_maincpu->set_addrmap(AS_IO, &ojankohs_state::ojankoy_io_map); + m_maincpu->set_vblank_int("screen", FUNC(ojankohs_state::irq0_line_hold)); MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankoy) + NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(512, 512) - MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-1) - MCFG_SCREEN_UPDATE_DRIVER(ojankohs_state, screen_update_ojankohs) - MCFG_SCREEN_PALETTE(m_palette) + 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, 512); + m_screen->set_visarea(0, 288-1, 0, 224-1); + m_screen->set_screen_update(FUNC(ojankohs_state::screen_update_ojankohs)); + m_screen->set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_ojankohs); PALETTE(config, m_palette, FUNC(ojankohs_state::ojankoy_palette), 1024); @@ -786,31 +788,32 @@ MACHINE_CONFIG_START(ojankohs_state::ojankoy) aysnd.port_b_read_callback().set_ioport("dsw2"); aysnd.add_route(ALL_OUTPUTS, "mono", 0.15); - MCFG_DEVICE_ADD("msm", MSM5205, 384000) - MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */ - MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(ojankohs_state::ccasino) + MSM5205(config, m_msm, 384000); + m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); +} +void ojankohs_state::ccasino(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80,12000000/2) /* 6.00 MHz ? */ - MCFG_DEVICE_PROGRAM_MAP(ojankoy_map) - MCFG_DEVICE_IO_MAP(ccasino_io_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold) + Z80(config, m_maincpu, 12000000/2); /* 6.00 MHz ? */ + m_maincpu->set_addrmap(AS_PROGRAM, &ojankohs_state::ojankoy_map); + m_maincpu->set_addrmap(AS_IO, &ojankohs_state::ccasino_io_map); + m_maincpu->set_vblank_int("screen", FUNC(ojankohs_state::irq0_line_hold)); MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankohs) + NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(512, 512) - MCFG_SCREEN_VISIBLE_AREA(0, 288-1, 0, 224-1) - MCFG_SCREEN_UPDATE_DRIVER(ojankohs_state, screen_update_ojankohs) - MCFG_SCREEN_PALETTE(m_palette) + 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, 512); + m_screen->set_visarea(0, 288-1, 0, 224-1); + m_screen->set_screen_update(FUNC(ojankohs_state::screen_update_ojankohs)); + m_screen->set_palette(m_palette); GFXDECODE(config, m_gfxdecode, m_palette, gfx_ojankohs); PALETTE(config, m_palette).set_entries(1024); @@ -827,31 +830,32 @@ MACHINE_CONFIG_START(ojankohs_state::ccasino) aysnd.port_b_read_callback().set_ioport("dsw2"); aysnd.add_route(ALL_OUTPUTS, "mono", 0.15); - MCFG_DEVICE_ADD("msm", MSM5205, 384000) - MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */ - MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -MACHINE_CONFIG_END - -MACHINE_CONFIG_START(ojankohs_state::ojankoc) + MSM5205(config, m_msm, 384000); + m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); +} +void ojankohs_state::ojankoc(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80,8000000/2) /* 4.00 MHz */ - MCFG_DEVICE_PROGRAM_MAP(ojankoc_map) - MCFG_DEVICE_IO_MAP(ojankoc_io_map) - MCFG_DEVICE_VBLANK_INT_DRIVER("screen", ojankohs_state, irq0_line_hold) + Z80(config, m_maincpu, 8000000/2); /* 4.00 MHz */ + m_maincpu->set_addrmap(AS_PROGRAM, &ojankohs_state::ojankoc_map); + m_maincpu->set_addrmap(AS_IO, &ojankohs_state::ojankoc_io_map); + m_maincpu->set_vblank_int("screen", FUNC(ojankohs_state::irq0_line_hold)); MCFG_MACHINE_START_OVERRIDE(ojankohs_state,ojankoc) + NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_SCREEN_SIZE(32*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 8, 248-1) - MCFG_SCREEN_UPDATE_DRIVER(ojankohs_state, screen_update_ojankoc) - MCFG_SCREEN_PALETTE(m_palette) + 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(32*8, 32*8); + m_screen->set_visarea(0, 256-1, 8, 248-1); + m_screen->set_screen_update(FUNC(ojankohs_state::screen_update_ojankoc)); + m_screen->set_palette(m_palette); PALETTE(config, m_palette).set_entries(16); @@ -865,11 +869,11 @@ MACHINE_CONFIG_START(ojankohs_state::ojankoc) aysnd.port_b_read_callback().set_ioport("dsw2"); aysnd.add_route(ALL_OUTPUTS, "mono", 0.15); - MCFG_DEVICE_ADD("msm", MSM5205, 8000000/22) - MCFG_MSM5205_VCLK_CB(WRITELINE(*this, ojankohs_state, ojankohs_adpcm_int)) /* IRQ handler */ - MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 KHz */ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -MACHINE_CONFIG_END + MSM5205(config, m_msm, 8000000/22); + m_msm->vck_legacy_callback().set(FUNC(ojankohs_state::ojankohs_adpcm_int)); /* IRQ handler */ + m_msm->set_prescaler_selector(msm5205_device::S48_4B); /* 8 KHz */ + m_msm->add_route(ALL_OUTPUTS, "mono", 0.50); +} ROM_START( ojankohs ) |