diff options
author | Ted Green <tedgreen99@protonmail.com> | 2018-09-09 11:34:27 -0600 |
---|---|---|
committer | Ted Green <tedgreen99@protonmail.com> | 2018-09-09 11:34:27 -0600 |
commit | a68028a3bb1b0bfdd29088427205bc140ea97e77 (patch) | |
tree | 30d08484ed3184fbc5f06884422951633b442f0d /src/mame/drivers/hornet.cpp | |
parent | ea7f1e3bd977d12929e3cf5674f168143d5791bf (diff) |
MCFG removal (nw).
Diffstat (limited to 'src/mame/drivers/hornet.cpp')
-rw-r--r-- | src/mame/drivers/hornet.cpp | 169 |
1 files changed, 77 insertions, 92 deletions
diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp index 1c48d2258d0..caa57272352 100644 --- a/src/mame/drivers/hornet.cpp +++ b/src/mame/drivers/hornet.cpp @@ -1067,145 +1067,130 @@ double hornet_state::adc12138_input_callback(uint8_t input) MACHINE_CONFIG_START(hornet_state::hornet) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", PPC403GA, XTAL(64'000'000)/2) /* PowerPC 403GA 32MHz */ - MCFG_DEVICE_PROGRAM_MAP(hornet_map) + PPC403GA(config, m_maincpu, XTAL(64'000'000) / 2); /* PowerPC 403GA 32MHz */ + m_maincpu->set_addrmap(AS_PROGRAM, &hornet_state::hornet_map); - MCFG_DEVICE_ADD("audiocpu", M68000, XTAL(64'000'000)/4) /* 16MHz */ - MCFG_DEVICE_PROGRAM_MAP(sound_memmap) + M68000(config, m_audiocpu, XTAL(64'000'000) / 4); /* 16MHz */ + m_audiocpu->set_addrmap(AS_PROGRAM, &hornet_state::sound_memmap); - MCFG_DEVICE_ADD("dsp", ADSP21062, XTAL(36'000'000)) - MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM) - MCFG_DEVICE_DATA_MAP(sharc0_map) + ADSP21062(config, m_dsp, XTAL(36'000'000)); + m_dsp->set_boot_mode(adsp21062_device::BOOT_MODE_EPROM); + m_dsp->set_addrmap(AS_DATA, &hornet_state::sharc0_map); - MCFG_QUANTUM_TIME(attotime::from_hz(6000)) + config.m_minimum_quantum = attotime::from_hz(6000); WATCHDOG_TIMER(config, m_watchdog); // PCB description at top doesn't mention any EEPROM on the base board... // EEPROM_93C46_16BIT(config, "eeprom"); - MCFG_DEVICE_ADD("voodoo0", VOODOO_1, STD_VOODOO_1_CLOCK) - MCFG_VOODOO_FBMEM(2) - MCFG_VOODOO_TMUMEM(4,0) - MCFG_VOODOO_SCREEN_TAG("screen") - MCFG_VOODOO_CPU_TAG("dsp") - MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_0)) + VOODOO_1(config, m_voodoo[0], STD_VOODOO_1_CLOCK); + m_voodoo[0]->set_fbmem(2); + m_voodoo[0]->set_tmumem(4, 0); + m_voodoo[0]->set_screen_tag("screen"); + m_voodoo[0]->set_cpu_tag("dsp"); // ?? + m_voodoo[0]->vblank_callback().set(FUNC(hornet_state::voodoo_vblank_0)); K033906(config, "k033906_1", 0, "voodoo0"); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(64*8, 48*8) - MCFG_SCREEN_VISIBLE_AREA(0*8, 64*8-1, 0*8, 48*8-1) - MCFG_SCREEN_UPDATE_DRIVER(hornet_state, screen_update) + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + // Screeen size and timing is re-calculated later in voodoo card + screen.set_refresh_hz(60); + screen.set_size(64 * 8, 48 * 8); + screen.set_screen_update(FUNC(hornet_state::screen_update)); - MCFG_PALETTE_ADD("palette", 65536) + PALETTE(config, "palette", 65536); - MCFG_K037122_ADD("k037122_1", "screen") - MCFG_K037122_PALETTE("palette") + K037122(config, m_k037122_1, 0); + m_k037122_1->set_screen("screen"); + m_k037122_1->set_palette("palette"); - MCFG_K056800_ADD("k056800", XTAL(16'934'400)) - MCFG_K056800_INT_HANDLER(INPUTLINE("audiocpu", M68K_IRQ_2)) + K056800(config, m_k056800, XTAL(16'934'400)); + m_k056800->int_callback().set_inputline(m_audiocpu, M68K_IRQ_2); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - MCFG_DEVICE_ADD("rfsnd", RF5C400, XTAL(16'934'400)) // value from Guru readme, gives 44100 Hz sample rate - MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) + RF5C400(config, "rfsnd", XTAL(16'934'400)) // value from Guru readme, gives 44100 Hz sample rate + .add_route(0, "lspeaker", 1.0) + .add_route(1, "rspeaker", 1.0); - MCFG_DEVICE_ADD("m48t58", M48T58, 0) + M48T58(config, "m48t58", 0); ADC12138(config, m_adc12138, 0); m_adc12138->set_ipt_convert_callback(FUNC(hornet_state::adc12138_input_callback)); - MCFG_DEVICE_ADD("konppc", KONPPC, 0) - MCFG_KONPPC_CGBOARD_NUMBER(1) - MCFG_KONPPC_CGBOARD_TYPE(HORNET) + KONPPC(config, m_konppc, 0); + m_konppc->set_num_boards(1); + m_konppc->set_cbboard_type(konppc_device::CGBOARD_TYPE_HORNET); MACHINE_CONFIG_END MACHINE_CONFIG_START(hornet_state::hornet_2board) hornet(config); - MCFG_DEVICE_ADD("dsp2", ADSP21062, XTAL(36'000'000)) - MCFG_SHARC_BOOT_MODE(BOOT_MODE_EPROM) - MCFG_DEVICE_DATA_MAP(sharc1_map) + ADSP21062(config, m_dsp2, XTAL(36'000'000)); + m_dsp2->set_boot_mode(adsp21062_device::BOOT_MODE_EPROM); + m_dsp2->set_addrmap(AS_DATA, &hornet_state::sharc1_map); + m_k037122_1->set_screen("lscreen"); + m_k037122_1->set_palette("palette"); - MCFG_DEVICE_REMOVE("k037122_1") - MCFG_K037122_ADD("k037122_1", "lscreen") - MCFG_K037122_PALETTE("palette") + K037122(config, m_k037122_2, 0); + m_k037122_2->set_screen("rscreen"); + m_k037122_2->set_palette("palette"); - MCFG_K037122_ADD("k037122_2", "rscreen") - MCFG_K037122_PALETTE("palette") + m_voodoo[0]->set_screen_tag("lscreen"); - MCFG_DEVICE_REMOVE("voodoo0") - - MCFG_DEVICE_ADD("voodoo0", VOODOO_1, STD_VOODOO_1_CLOCK) - MCFG_VOODOO_FBMEM(2) - MCFG_VOODOO_TMUMEM(4,0) - MCFG_VOODOO_SCREEN_TAG("lscreen") - MCFG_VOODOO_CPU_TAG("dsp") - MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_0)) - - MCFG_DEVICE_ADD("voodoo1", VOODOO_1, STD_VOODOO_1_CLOCK) - MCFG_VOODOO_FBMEM(2) - MCFG_VOODOO_TMUMEM(4,0) - MCFG_VOODOO_SCREEN_TAG("rscreen") - MCFG_VOODOO_CPU_TAG("dsp2") - MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_1)) + VOODOO_1(config, m_voodoo[1], STD_VOODOO_1_CLOCK); + m_voodoo[1]->set_fbmem(2); + m_voodoo[1]->set_tmumem(4, 0); + m_voodoo[1]->set_screen_tag("rscreen"); + m_voodoo[1]->set_cpu_tag("dsp2"); // ?? + m_voodoo[1]->vblank_callback().set(FUNC(hornet_state::voodoo_vblank_1)); K033906(config, "k033906_2", 0, "voodoo1"); /* video hardware */ - MCFG_PALETTE_MODIFY("palette") - MCFG_PALETTE_ENTRIES(65536) - - MCFG_DEVICE_REMOVE("screen") - - MCFG_SCREEN_ADD("lscreen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(512, 384) - MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) - MCFG_SCREEN_UPDATE_DRIVER(hornet_state, screen_update) - - MCFG_SCREEN_ADD("rscreen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_SIZE(512, 384) - MCFG_SCREEN_VISIBLE_AREA(0, 511, 0, 383) - MCFG_SCREEN_UPDATE_DRIVER(hornet_state, screen_update_rscreen) - - MCFG_DEVICE_REMOVE("konppc") - MCFG_DEVICE_ADD("konppc", KONPPC, 0) - MCFG_KONPPC_CGBOARD_NUMBER(2) - MCFG_KONPPC_CGBOARD_TYPE(HORNET) + config.device_remove("screen"); + + screen_device &lscreen(SCREEN(config, "lscreen", SCREEN_TYPE_RASTER)); + // Screeen size and timing is re-calculated later in voodoo card + lscreen.set_refresh_hz(60); + lscreen.set_size(512, 384); + lscreen.set_screen_update(FUNC(hornet_state::screen_update)); + + screen_device &rscreen(SCREEN(config, "rscreen", SCREEN_TYPE_RASTER)); + // Screeen size and timing is re-calculated later in voodoo card + rscreen.set_refresh_hz(60); + rscreen.set_size(512, 384); + rscreen.set_screen_update(FUNC(hornet_state::screen_update_rscreen)); + + m_konppc->set_num_boards(2); MACHINE_CONFIG_END MACHINE_CONFIG_START(hornet_state::terabrst) hornet(config); - MCFG_DEVICE_ADD("gn680", M68000, XTAL(32'000'000)/2) /* 16MHz */ - MCFG_DEVICE_PROGRAM_MAP(gn680_memmap) + M68000(config, m_gn680, XTAL(32'000'000) / 2); /* 16MHz */ + m_gn680->set_addrmap(AS_PROGRAM, &hornet_state::gn680_memmap); MACHINE_CONFIG_END MACHINE_CONFIG_START(hornet_state::hornet_2board_v2) hornet_2board(config); - MCFG_DEVICE_REMOVE("voodoo0") - MCFG_DEVICE_ADD("voodoo0", VOODOO_2, STD_VOODOO_2_CLOCK) - MCFG_VOODOO_FBMEM(2) - MCFG_VOODOO_TMUMEM(4,0) - MCFG_VOODOO_SCREEN_TAG("lscreen") - MCFG_VOODOO_CPU_TAG("dsp") - MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_0)) - - MCFG_DEVICE_REMOVE("voodoo1") - MCFG_DEVICE_ADD("voodoo1", VOODOO_2, STD_VOODOO_2_CLOCK) - MCFG_VOODOO_FBMEM(2) - MCFG_VOODOO_TMUMEM(4,0) - MCFG_VOODOO_SCREEN_TAG("rscreen") - MCFG_VOODOO_CPU_TAG("dsp2") - MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, hornet_state,voodoo_vblank_1)) + VOODOO_2(config.replace(), m_voodoo[0], STD_VOODOO_2_CLOCK); + m_voodoo[0]->set_fbmem(2); + m_voodoo[0]->set_tmumem(4, 0); + m_voodoo[0]->set_screen_tag("lscreen"); + m_voodoo[0]->set_cpu_tag("dsp"); // ?? + m_voodoo[0]->vblank_callback().set(FUNC(hornet_state::voodoo_vblank_0)); + + VOODOO_2(config.replace(), m_voodoo[1], STD_VOODOO_2_CLOCK); + m_voodoo[1]->set_fbmem(2); + m_voodoo[1]->set_tmumem(4, 0); + m_voodoo[1]->set_screen_tag("rscreen"); + m_voodoo[1]->set_cpu_tag("dsp2"); // ?? + m_voodoo[1]->vblank_callback().set(FUNC(hornet_state::voodoo_vblank_1)); MACHINE_CONFIG_END void hornet_state::sscope2(machine_config &config) |