diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/cbmiec/serialbox.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/cbmiec/serialbox.cpp')
-rw-r--r-- | src/devices/bus/cbmiec/serialbox.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp index ab8326528d0..b14eca1f389 100644 --- a/src/devices/bus/cbmiec/serialbox.cpp +++ b/src/devices/bus/cbmiec/serialbox.cpp @@ -69,11 +69,10 @@ void serial_box_device::serial_box_mem(address_map &map) // device_add_mconfig - add device configuration //------------------------------------------------- -void serial_box_device::device_add_mconfig(machine_config &config) -{ - M65C02(config, m_maincpu, XTAL(4'000'000)/4); - m_maincpu->set_addrmap(AS_PROGRAM, &serial_box_device::serial_box_mem); -} +MACHINE_CONFIG_START(serial_box_device::device_add_mconfig) + MCFG_DEVICE_ADD(M6502_TAG, M65C02, XTAL(4'000'000)/4) + MCFG_DEVICE_PROGRAM_MAP(serial_box_mem) +MACHINE_CONFIG_END |