diff options
Diffstat (limited to 'src/mame/drivers/tickee.cpp')
-rw-r--r-- | src/mame/drivers/tickee.cpp | 68 |
1 files changed, 31 insertions, 37 deletions
diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp index 3329389d6a3..48698080c09 100644 --- a/src/mame/drivers/tickee.cpp +++ b/src/mame/drivers/tickee.cpp @@ -454,7 +454,6 @@ void tickee_state::tickee_map(address_map &map) map(0x04200100, 0x0420011f).w("ym2", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x04400000, 0x0440007f).w(FUNC(tickee_state::tickee_control_w)).share("control"); map(0x04400040, 0x0440004f).portr("IN2"); - map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xc0000240, 0xc000025f).nopw(); /* seems to be a bug in their code */ map(0xff000000, 0xffffffff).rom().region("user1", 0); } @@ -472,7 +471,6 @@ void tickee_state::ghoshunt_map(address_map &map) map(0x04300100, 0x0430010f).r("ym2", FUNC(ay8910_device::data_r)).umask16(0x00ff); map(0x04300100, 0x0430011f).w("ym2", FUNC(ay8910_device::address_data_w)).umask16(0x00ff); map(0x04500000, 0x0450007f).w(FUNC(tickee_state::tickee_control_w)).share("control"); - map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xc0000240, 0xc000025f).nopw(); /* seems to be a bug in their code */ map(0xff000000, 0xffffffff).rom().region("user1", 0); } @@ -489,7 +487,6 @@ void tickee_state::mouseatk_map(address_map &map) map(0x04200100, 0x0420010f).rw(m_oki, FUNC(okim6295_device::read), FUNC(okim6295_device::write)).umask16(0x00ff); map(0x04400000, 0x0440007f).w(FUNC(tickee_state::tickee_control_w)).share("control"); map(0x04400040, 0x0440004f).portr("IN2"); // ? - map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xc0000240, 0xc000025f).nopw(); /* seems to be a bug in their code */ map(0xff000000, 0xffffffff).rom().region("user1", 0); } @@ -500,7 +497,6 @@ void tickee_state::rapidfir_map(address_map &map) { map(0x00000000, 0x007fffff).ram().share("vram"); map(0x02000000, 0x027fffff).rw(FUNC(tickee_state::rapidfir_transparent_r), FUNC(tickee_state::rapidfir_transparent_w)); - map(0xc0000000, 0xc00001ff).rw(m_maincpu, FUNC(tms34010_device::io_register_r), FUNC(tms34010_device::io_register_w)); map(0xfc000000, 0xfc00000f).r(FUNC(tickee_state::rapidfir_gun1_r)); map(0xfc000100, 0xfc00010f).r(FUNC(tickee_state::rapidfir_gun2_r)); map(0xfc000400, 0xfc00040f).r(FUNC(tickee_state::ffff_r)); @@ -758,8 +754,8 @@ INPUT_PORTS_END * *************************************/ -MACHINE_CONFIG_START(tickee_state::tickee) - +void tickee_state::tickee(machine_config &config) +{ /* basic machine hardware */ TMS34010(config, m_maincpu, XTAL(40'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &tickee_state::tickee_map); @@ -771,17 +767,17 @@ MACHINE_CONFIG_START(tickee_state::tickee) MCFG_MACHINE_RESET_OVERRIDE(tickee_state,tickee) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - MCFG_TICKET_DISPENSER_ADD("ticket1", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH) - MCFG_TICKET_DISPENSER_ADD("ticket2", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH) + TICKET_DISPENSER(config, m_ticket[0], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket[1], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); /* video hardware */ - MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) + TLC34076(config, m_tlc34076, tlc34076_device::TLC34076_6_BIT); MCFG_VIDEO_START_OVERRIDE(tickee_state,tickee) - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200) - MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_rgb32) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200); + m_screen->set_screen_update("maincpu", FUNC(tms34010_device::tms340x0_rgb32)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -795,20 +791,20 @@ MACHINE_CONFIG_START(tickee_state::tickee) ym2.port_a_read_callback().set_ioport("IN0"); ym2.port_b_read_callback().set_ioport("IN2"); ym2.add_route(ALL_OUTPUTS, "mono", 0.50); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(tickee_state::ghoshunt) +void tickee_state::ghoshunt(machine_config &config) +{ tickee(config); /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(ghoshunt_map) -MACHINE_CONFIG_END - + m_maincpu->set_addrmap(AS_PROGRAM, &tickee_state::ghoshunt_map); +} -MACHINE_CONFIG_START(tickee_state::rapidfir) +void tickee_state::rapidfir(machine_config &config) +{ /* basic machine hardware */ TMS34010(config, m_maincpu, XTAL(50'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &tickee_state::rapidfir_map); @@ -825,24 +821,23 @@ MACHINE_CONFIG_START(tickee_state::rapidfir) WATCHDOG_TIMER(config, "watchdog"); /* video hardware */ - MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) + TLC34076(config, m_tlc34076, tlc34076_device::TLC34076_6_BIT); MCFG_VIDEO_START_OVERRIDE(tickee_state,tickee) - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200) - MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_rgb32) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200); + m_screen->set_screen_update("maincpu", FUNC(tms34010_device::tms340x0_rgb32)); /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("oki", OKIM6295, OKI_CLOCK, okim6295_device::PIN7_HIGH) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) -MACHINE_CONFIG_END - + OKIM6295(config, m_oki, OKI_CLOCK, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.00); +} -MACHINE_CONFIG_START(tickee_state::mouseatk) +void tickee_state::mouseatk(machine_config &config) +{ /* basic machine hardware */ TMS34010(config, m_maincpu, XTAL(40'000'000)); m_maincpu->set_addrmap(AS_PROGRAM, &tickee_state::mouseatk_map); @@ -854,15 +849,15 @@ MACHINE_CONFIG_START(tickee_state::mouseatk) MCFG_MACHINE_RESET_OVERRIDE(tickee_state,tickee) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1); - MCFG_TICKET_DISPENSER_ADD("ticket1", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH) - MCFG_TICKET_DISPENSER_ADD("ticket2", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH) + TICKET_DISPENSER(config, m_ticket[0], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); + TICKET_DISPENSER(config, m_ticket[1], attotime::from_msec(100), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_HIGH); /* video hardware */ - MCFG_TLC34076_ADD("tlc34076", TLC34076_6_BIT) + TLC34076(config, m_tlc34076, tlc34076_device::TLC34076_6_BIT); - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200) - MCFG_SCREEN_UPDATE_DEVICE("maincpu", tms34010_device, tms340x0_rgb32) + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_raw(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200); + m_screen->set_screen_update("maincpu", FUNC(tms34010_device::tms340x0_rgb32)); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -872,9 +867,8 @@ MACHINE_CONFIG_START(tickee_state::mouseatk) ym.port_b_read_callback().set_ioport("IN1"); ym.add_route(ALL_OUTPUTS, "mono", 0.50); - MCFG_DEVICE_ADD("oki", OKIM6295, OKI_CLOCK, okim6295_device::PIN7_HIGH) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) -MACHINE_CONFIG_END + OKIM6295(config, m_oki, OKI_CLOCK, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.00); +} /************************************* |