diff options
Diffstat (limited to 'src/mame/drivers/nes.cpp')
-rw-r--r-- | src/mame/drivers/nes.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp index 8f3991b97dd..da2ba6a2be3 100644 --- a/src/mame/drivers/nes.cpp +++ b/src/mame/drivers/nes.cpp @@ -96,7 +96,8 @@ MACHINE_CONFIG_START(nes_state::nes) MCFG_SOFTWARE_LIST_ADD("datach_list", "nes_datach") // Bandai Datach Joint ROM System mini-carts MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(nes_state::nespal, nes) +MACHINE_CONFIG_START(nes_state::nespal) + nes(config); /* basic machine hardware */ MCFG_CPU_MODIFY("maincpu") MCFG_CPU_CLOCK(PAL_APU_CLOCK) @@ -115,7 +116,8 @@ MACHINE_CONFIG_DERIVED(nes_state::nespal, nes) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 30*8-1) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(nes_state::famicom, nes) +MACHINE_CONFIG_START(nes_state::famicom) + nes(config); MCFG_DEVICE_REMOVE("ctrl1") MCFG_DEVICE_REMOVE("ctrl2") MCFG_NES_CONTROL_PORT_ADD("ctrl1", fc_control_port1_devices, "joypad") @@ -127,7 +129,8 @@ MACHINE_CONFIG_DERIVED(nes_state::famicom, nes) MCFG_SOFTWARE_LIST_ADD("cass_list", "famicom_cass") MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(nes_state::nespalc, nespal) +MACHINE_CONFIG_START(nes_state::nespalc) + nespal(config); MCFG_CPU_MODIFY( "maincpu" ) MCFG_CPU_CLOCK(PALC_APU_CLOCK) MCFG_CPU_PROGRAM_MAP(nes_map) @@ -144,7 +147,8 @@ MACHINE_CONFIG_DERIVED(nes_state::nespalc, nespal) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC((113.66/(PALC_APU_CLOCK.dvalue()/1000000)) * (ppu2c0x_device::VBLANK_LAST_SCANLINE_PAL-ppu2c0x_device::VBLANK_FIRST_SCANLINE_PALC+1+2))) MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(nes_state::famipalc, nespalc) +MACHINE_CONFIG_START(nes_state::famipalc) + nespalc(config); MCFG_DEVICE_REMOVE("ctrl1") MCFG_DEVICE_REMOVE("ctrl2") MCFG_NES_CONTROL_PORT_ADD("ctrl1", fc_control_port1_devices, "joypad") @@ -155,7 +159,8 @@ MACHINE_CONFIG_DERIVED(nes_state::famipalc, nespalc) MCFG_SOFTWARE_LIST_ADD("cass_list", "famicom_cass") MACHINE_CONFIG_END -MACHINE_CONFIG_DERIVED(nes_state::suborkbd, famipalc) +MACHINE_CONFIG_START(nes_state::suborkbd) + famipalc(config); /* TODO: emulate the parallel port bus! */ MCFG_DEVICE_MODIFY("exp") MCFG_SLOT_DEFAULT_OPTION("subor_keyboard") @@ -211,7 +216,8 @@ MACHINE_RESET_MEMBER( nes_state, fds ) m_maincpu->reset(); } -MACHINE_CONFIG_DERIVED(nes_state::fds, famicom) +MACHINE_CONFIG_START(nes_state::fds) + famicom(config); MCFG_MACHINE_START_OVERRIDE( nes_state, fds ) MCFG_MACHINE_RESET_OVERRIDE( nes_state, fds ) @@ -255,7 +261,8 @@ MACHINE_RESET_MEMBER( nes_state, famitwin ) m_maincpu->reset(); } -MACHINE_CONFIG_DERIVED(nes_state::famitwin, famicom) +MACHINE_CONFIG_START(nes_state::famitwin) + famicom(config); MCFG_MACHINE_START_OVERRIDE( nes_state, famitwin ) MCFG_MACHINE_RESET_OVERRIDE( nes_state, famitwin ) |