diff options
-rw-r--r-- | src/mame/drivers/chihiro.cpp | 11 | ||||
-rw-r--r-- | src/mame/drivers/xbox.cpp | 12 |
2 files changed, 9 insertions, 14 deletions
diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp index 1080ae06f08..751dd6d191d 100644 --- a/src/mame/drivers/chihiro.cpp +++ b/src/mame/drivers/chihiro.cpp @@ -1862,16 +1862,13 @@ void chihiro_state::an2131sc_configuration(device_t *device) MCFG_OHCI_HLEAN2131SC_REGION(":others", 0x2080) } -MACHINE_CONFIG_START(chihiro_state::chihiro_base) +void chihiro_state::chihiro_base(machine_config &config) +{ xbox_base(config); m_maincpu->set_addrmap(AS_PROGRAM, &chihiro_state::chihiro_map); m_maincpu->set_addrmap(AS_IO, &chihiro_state::chihiro_map_io); - //BUS_MASTER_IDE_CONTROLLER(config, "ide").options(ide_baseboard, nullptr, "bb", true); - MCFG_DEVICE_MODIFY(":pci:09.0:ide:0") - MCFG_DEVICE_SLOT_INTERFACE(ide_baseboard, nullptr, true) - MCFG_DEVICE_MODIFY(":pci:09.0:ide:1") - MCFG_DEVICE_SLOT_INTERFACE(ide_baseboard, "bb", true) + subdevice<ide_controller_32_device>(":pci:09.0:ide")->options(ide_baseboard, nullptr, "bb", true); OHCI_USB_CONNECTOR(config, ":pci:02.0:port1", usb_baseboard, "an2131qc", true).set_option_machine_config("an2131qc", an2131qc_configuration); OHCI_USB_CONNECTOR(config, ":pci:02.0:port2", usb_baseboard, "an2131sc", true).set_option_machine_config("an2131sc", an2131sc_configuration); @@ -1892,7 +1889,7 @@ MACHINE_CONFIG_START(chihiro_state::chihiro_base) sega837.set_port_tag<9>("A6"); sega837.set_port_tag<10>("A7"); sega837.set_port_tag<11>("OUTPUT"); -MACHINE_CONFIG_END +} void chihiro_state::chihirogd(machine_config &config) { diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp index 1452d3ce5c3..45f14f4c98d 100644 --- a/src/mame/drivers/xbox.cpp +++ b/src/mame/drivers/xbox.cpp @@ -170,26 +170,24 @@ void xbox_ata_devices(device_slot_interface &device) device.option_add("cdrom", ATAPI_CDROM); } -MACHINE_CONFIG_START(xbox_state::xbox) +void xbox_state::xbox(machine_config &config) +{ xbox_base(config); m_maincpu->set_addrmap(AS_PROGRAM, &xbox_state::xbox_map); m_maincpu->set_addrmap(AS_IO, &xbox_state::xbox_map_io); - MCFG_DEVICE_MODIFY(":pci:09.0:ide:0") - MCFG_DEVICE_SLOT_INTERFACE(xbox_ata_devices, "hdd", true) - MCFG_DEVICE_MODIFY(":pci:09.0:ide:1") - MCFG_DEVICE_SLOT_INTERFACE(xbox_ata_devices, "cdrom", true) + subdevice<ide_controller_32_device>(":pci:09.0:ide")->options(xbox_ata_devices, "hdd", "cdrom", true); OHCI_USB_CONNECTOR(config, ":pci:02.0:port1", usb_xbox, nullptr, false); OHCI_USB_CONNECTOR(config, ":pci:02.0:port2", usb_xbox, nullptr, false); OHCI_USB_CONNECTOR(config, ":pci:02.0:port3", usb_xbox, "xbox_controller", false); OHCI_USB_CONNECTOR(config, ":pci:02.0:port4", usb_xbox, nullptr, false); -/* sound hardware */ + /* sound hardware */ SPEAKER(config, "mono").front_center(); OHCI_GAME_CONTROLLER(config, "ohci_gamepad", 0); -MACHINE_CONFIG_END +} /*************************************************************************** |