diff options
Diffstat (limited to 'src/mame/drivers/maygay1b.cpp')
-rw-r--r-- | src/mame/drivers/maygay1b.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp index 6be81bbb2d6..cb203d2c0eb 100644 --- a/src/mame/drivers/maygay1b.cpp +++ b/src/mame/drivers/maygay1b.cpp @@ -439,7 +439,7 @@ WRITE_LINE_MEMBER(maygay1b_state::srsel_w) WRITE8_MEMBER(maygay1b_state::latch_ch2_w) { - m_msm6376->write(data&0x7f); + m_msm6376->write(space, 0, data&0x7f); m_msm6376->ch2_w(data&0x80); } @@ -762,10 +762,10 @@ READ8_MEMBER(maygay1b_state::mcu_port2_r) // machine driver for maygay m1 board ///////////////////////////////// -void maygay1b_state::maygay_m1(machine_config &config) -{ - MC6809(config, m_maincpu, M1_MASTER_CLOCK/2); // claimed to be 4 MHz - m_maincpu->set_addrmap(AS_PROGRAM, &maygay1b_state::m1_memmap); +MACHINE_CONFIG_START(maygay1b_state::maygay_m1) + + MCFG_DEVICE_ADD("maincpu", MC6809, M1_MASTER_CLOCK/2) // claimed to be 4 MHz + MCFG_DEVICE_PROGRAM_MAP(m1_memmap) I80C51(config, m_mcu, 2000000); // EP840034.A-P-80C51AVW m_mcu->port_in_cb<0>().set(FUNC(maygay1b_state::mcu_port0_r)); @@ -775,9 +775,9 @@ void maygay1b_state::maygay_m1(machine_config &config) m_mcu->port_out_cb<2>().set(FUNC(maygay1b_state::mcu_port2_w)); m_mcu->port_out_cb<3>().set(FUNC(maygay1b_state::mcu_port3_w)); - MC68681(config, m_duart68681, M1_DUART_CLOCK); - m_duart68681->irq_cb().set(FUNC(maygay1b_state::duart_irq_handler)); - m_duart68681->inport_cb().set(FUNC(maygay1b_state::m1_duart_r));; + MCFG_DEVICE_ADD("duart68681", MC68681, M1_DUART_CLOCK) + MCFG_MC68681_IRQ_CALLBACK(WRITELINE(*this, maygay1b_state, duart_irq_handler)) + MCFG_MC68681_INPORT_CALLBACK(READ8(*this, maygay1b_state, m1_duart_r)) pia6821_device &pia(PIA6821(config, "pia", 0)); pia.writepa_handler().set(FUNC(maygay1b_state::m1_pia_porta_w)); @@ -801,15 +801,15 @@ void maygay1b_state::maygay_m1(machine_config &config) m_ay->add_route(ALL_OUTPUTS, "lspeaker", 1.0); m_ay->add_route(ALL_OUTPUTS, "rspeaker", 1.0); - ym2413_device &ymsnd(YM2413(config, "ymsnd", M1_MASTER_CLOCK/4)); - ymsnd.add_route(ALL_OUTPUTS, "lspeaker", 1.0); - ymsnd.add_route(ALL_OUTPUTS, "rspeaker", 1.0); + MCFG_DEVICE_ADD("ymsnd", YM2413, M1_MASTER_CLOCK/4) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) - OKIM6376(config, m_msm6376, 102400); //? Seems to work well with samples, but unconfirmed - m_msm6376->add_route(ALL_OUTPUTS, "lspeaker", 1.0); - m_msm6376->add_route(ALL_OUTPUTS, "rspeaker", 1.0); + MCFG_DEVICE_ADD("msm6376", OKIM6376, 102400) //? Seems to work well with samples, but unconfirmed + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) - TIMER(config, "nmitimer").configure_periodic(FUNC(maygay1b_state::maygay1b_nmitimer_callback), attotime::from_hz(75)); // freq? + MCFG_TIMER_DRIVER_ADD_PERIODIC("nmitimer", maygay1b_state, maygay1b_nmitimer_callback, attotime::from_hz(75)) // freq? i8279_device &kbdc(I8279(config, "i8279", M1_MASTER_CLOCK/4)); // unknown clock kbdc.out_sl_callback().set(FUNC(maygay1b_state::scanlines_w)); // scan SL lines @@ -836,30 +836,30 @@ void maygay1b_state::maygay_m1(machine_config &config) REEL(config, m_reels[5], STARPOINT_48STEP_REEL, 1, 3, 0x09, 4); m_reels[5]->optic_handler().set(FUNC(maygay1b_state::reel_optic_cb<5>)); - METERS(config, m_meters, 0).set_number(8); + MCFG_DEVICE_ADD("meters", METERS, 0) + MCFG_METERS_NUMBER(8) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); config.set_default_layout(layout_maygay1b); -} +MACHINE_CONFIG_END -void maygay1b_state::maygay_m1_no_oki(machine_config &config) -{ +MACHINE_CONFIG_START(maygay1b_state::maygay_m1_no_oki) maygay_m1(config); - config.device_remove("msm6376"); -} + MCFG_DEVICE_REMOVE("msm6376") +MACHINE_CONFIG_END -void maygay1b_state::maygay_m1_nec(machine_config &config) -{ +MACHINE_CONFIG_START(maygay1b_state::maygay_m1_nec) maygay_m1(config); - m_maincpu->set_addrmap(AS_PROGRAM, &maygay1b_state::m1_nec_memmap); + MCFG_DEVICE_MODIFY("maincpu") + MCFG_DEVICE_PROGRAM_MAP(m1_nec_memmap) - config.device_remove("msm6376"); + MCFG_DEVICE_REMOVE("msm6376") - UPD7759(config, m_upd7759); - m_upd7759->add_route(ALL_OUTPUTS, "lspeaker", 1.0); - m_upd7759->add_route(ALL_OUTPUTS, "rspeaker", 1.0); -} + MCFG_DEVICE_ADD("upd", UPD7759) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) +MACHINE_CONFIG_END WRITE8_MEMBER(maygay1b_state::m1ab_no_oki_w) { |