diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/machine/keyboard.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/machine/keyboard.cpp')
-rw-r--r-- | src/devices/machine/keyboard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp index 03e73f3ac05..52502597227 100644 --- a/src/devices/machine/keyboard.cpp +++ b/src/devices/machine/keyboard.cpp @@ -9,10 +9,10 @@ or for the case of a computer with an inbuilt (not serial) ascii keyboard. Example of usage in a driver. -In MACHINE_CONFIG +In the machine config function: - MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0) - MCFG_GENERIC_KEYBOARD_CB(WRITE8(*this, xxx_state, kbd_put)) + generic_keyboard_device &kbd(GENERIC_KEYBOARD(config, KEYBOARD_TAG, 0)); + kbd.set_keyboard_callback(FUNC(xxx_state::kbd_put)); In the code: |