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/machine/terminal.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/terminal.cpp')
-rw-r--r-- | src/devices/machine/terminal.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index c2e5c5be205..be9b501c687 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -326,22 +326,21 @@ void generic_terminal_device::kbd_put(u8 data) VIDEO HARDWARE ***************************************************************************/ -void generic_terminal_device::device_add_mconfig(machine_config &config) -{ - screen_device &screen(SCREEN(config, TERMINAL_SCREEN_TAG, SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(50); - screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */ - screen.set_size(generic_terminal_device::TERMINAL_WIDTH*8, generic_terminal_device::TERMINAL_HEIGHT*10); - screen.set_visarea(0, generic_terminal_device::TERMINAL_WIDTH*8-1, 0, generic_terminal_device::TERMINAL_HEIGHT*10-1); - screen.set_screen_update(FUNC(generic_terminal_device::update)); +MACHINE_CONFIG_START(generic_terminal_device::device_add_mconfig) + MCFG_SCREEN_ADD(TERMINAL_SCREEN_TAG, RASTER) + MCFG_SCREEN_REFRESH_RATE(50) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ + MCFG_SCREEN_SIZE(generic_terminal_device::TERMINAL_WIDTH*8, generic_terminal_device::TERMINAL_HEIGHT*10) + MCFG_SCREEN_VISIBLE_AREA(0, generic_terminal_device::TERMINAL_WIDTH*8-1, 0, generic_terminal_device::TERMINAL_HEIGHT*10-1) + MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, generic_terminal_device, update) generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, KEYBOARD_TAG, 0)); keyboard.set_keyboard_callback(FUNC(generic_terminal_device::kbd_put)); SPEAKER(config, "bell").front_center(); - BEEP(config, m_beeper, 2'000); - m_beeper->add_route(ALL_OUTPUTS, "bell", 0.25); -} + MCFG_DEVICE_ADD("beeper", BEEP, 2'000) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 0.25) +MACHINE_CONFIG_END void generic_terminal_device::device_start() { |